Skip to content

Commit

Permalink
Fix bugs and delete coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
SebSanUwU committed May 16, 2024
1 parent b59bfef commit c1a24d0
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 64 deletions.
28 changes: 8 additions & 20 deletions sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,26 @@ sonar.projectKey=SebSanUwU_Cenizas_FRONT_I_DEV
sonar.organization=sebsanuwu
sonar.projectName=Cenizas_FRONT_I_DEV

#Directory of your code source files
# Directorio de los archivos fuente de tu código
sonar.sources=src
# Files to include in the analysis
# Archivos para incluir en el análisis
sonar.inclusions=**/*.ts, **/*.html
# Files to exclude from the analysis
# Archivos para excluir del análisis
sonar.exclusions=**/node_modules/**,**/*.spec.ts
# Directory of your code source test files
# Directorio de los archivos de prueba de tu código
sonar.tests=src
# Files to include as tests
# Archivos para incluir como pruebas
sonar.test.inclusions=**/*.spec.ts
# TypeScript config file
# Archivo de configuración TypeScript
sonar.typescript.tsconfigPath=tsconfig.json

# report path for code coverage
sonar.javascript.lcov.reportPaths=coverage/lcov.info

# Configuración del plugin de duplicación de código (CPD)
sonar.cpd.enabled=true
sonar.cpd.language=ts
sonar.cpd.exclusions=**/*copiedCode*
sonar.cpd.cross_project=false
sonar.cpd.minimumTokens=100

sonar.javascript.lcov.reportPaths=./coverage/lcov.info

# Umbral para el código duplicado
sonar.cpd.minimumDuplicatedBlocksThreshold=30

Expand All @@ -35,14 +30,7 @@ sonar.qualitygate.conditions=\
"bugs"=0, \
"code_smells"=0

# Configuración de la cobertura
sonar.coverage.exclusions=**/*coverage*.xml
sonar.coverage.jacoco.xmlReportPaths=coverage.xml
sonar.coverage.jacoco.reportsPath=coverage
sonar.coverage.jacoco.reportPaths=**/jacoco.xml
sonar.coverage.minimumProjectCoverage=30

# wait for the SonarQube quality gate status in the CI pipeline
# it breaks your pipeline if it fails quality checks
# Esperar el estado de la puerta de calidad de SonarQube en el pipeline de CI
# rompe tu pipeline si fallan las comprobaciones de calidad
sonar.qualitygate.wait=true

1 change: 0 additions & 1 deletion src/app/components/friends/friends.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { UserService } from 'src/app/services/user/user.service';
import { ProfileType } from 'src/app/schemas/ProfileTypeJson';
import { UserJson } from 'src/app/schemas/UserJson';
import { io } from 'socket.io-client';
import { environment } from 'src/environments/environment';
import { FriendRequest } from 'src/app/schemas/FriendRequest';
Expand Down
3 changes: 0 additions & 3 deletions src/app/components/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<div class="div_boton my-2">
<a class="btn btn-primary" routerLink="/amigos">Amigos</a>
</div>
<div class="div_boton my-2">
<a class="btn btn-primary" routerLink="#">Salir</a>
</div>
</div>
</div>
</div>
91 changes: 51 additions & 40 deletions src/app/components/search/search.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import { UserJson } from 'src/app/schemas/UserJson';
import { UserService } from 'src/app/services/user/user.service';
import { RoomWithFriend } from 'src/app/schemas/RoomWithFriend';


@Component({
selector: 'app-search',
templateUrl: './search.component.html',
styleUrls: ['./search.component.css', '../../../assets/style/main.css']
styleUrls: ['./search.component.css', '../../../assets/style/main.css'],
})
export class SearchComponent {
codigoSala: string = '';
Expand All @@ -26,73 +25,85 @@ export class SearchComponent {
friends: string[] = [];
showError: boolean = false;

constructor(private roomService: RoomsService, private router: Router, private http: HttpClient, private userService: UserService) { }
constructor(
private roomService: RoomsService,
private router: Router,
private http: HttpClient,
private userService: UserService
) {}

ngOnInit(): void {
this.http.get('https://graph.microsoft.com/v1.0/me')
.subscribe(profile => {
this.http
.get('https://graph.microsoft.com/v1.0/me')
.subscribe((profile) => {
this.profile = profile;
this.mail = this.profile.mail;
if (this.profile?.mail ) {
this.userService.getUser(this.profile.mail).subscribe((user: UserJson) => {
this.user = user;
this.friends = this.user.friends;
this.loadFriendRoom()
});
if (this.profile?.mail) {
this.userService
.getUser(this.profile.mail)
.subscribe((user: UserJson) => {
this.user = user;
this.friends = this.user.friends;
this.loadFriendRoom();
});
}
});
this.listRooms()
this.listRooms();
}

joinRoom(codigoSala: string) {
this.roomService.getRoom(codigoSala).subscribe((room: RoomJson) => {
this.room = room;
this.mail = this.profile?.mail
if(this.room.online){
this.roomService.addUserToRoom(this.mail, codigoSala).subscribe(() => { })
this.router.navigate(['/lobby'], { queryParams: { code: codigoSala } })
}else{
this.showError=true
this.mail = this.profile?.mail;
if (this.room.online) {
this.roomService
.addUserToRoom(this.mail, codigoSala)
.subscribe(() => {});
this.router.navigate(['/lobby'], { queryParams: { code: codigoSala } });
} else {
this.showError = true;
}
}
);
});
}

listRooms() {
this.roomService.getRooms().subscribe({
next: (response) => {
this.roomsPublic = response
this.roomsPublic = response;
},
error: (error) => {
console.error('Error al listar salas publicas:', error);
},
complete: () => console.info('Listar salas publica completo')
complete: () => console.info('Listar salas publica completo'),
});

}

loadFriendRoom() {
this.friends.forEach(friend => {
this.friends.forEach((friend) => {
this.userService.getUserRooms(friend).subscribe({
next: (response) => {
response.forEach(room=>{
this.roomService.getRoom(room).subscribe({
next:(response)=>{
if (response.online) {
const roomWithFriendInfo = { ...response, friend: friend };
this.roomsFriends.push(roomWithFriendInfo);
}
}
})
})
},
next: (response) => this.roomsFriend(response,friend),
error: (error) => {
console.error('Error al traer salas de amigos:', error);
},
complete: () => console.info('Listar salas de amigos publicas completo')
})
})
complete: () =>
console.info('Listar salas de amigos publicas completo'),
});
});
}
}


roomsFriend(list:[string],friend:string){
list.forEach((room) => {
this.roomService.getRoom(room).subscribe({
next: (response) => {
if (response.online) {
const roomWithFriendInfo = { ...response, friend: friend };
this.roomsFriends.push(roomWithFriendInfo);
}
},error: (error) => {
console.error('Error al traer salas de amigo:', error);
}
});
});
}
}

0 comments on commit c1a24d0

Please sign in to comment.