Services done and clean code

Author: RubenCata

backend/src/main/java/es/webapp6/padelante/ExamplesGenerator.java

@@ -81,16 +81,21 @@ public void init() throws IOException,URISyntaxException{
 		User user18 = new User("Almudena", passwordEncoder.encode("pass"), "[email protected]", "Almudena Arias", "USER");
 
 		ArrayList<Integer> array = user1.getHistoricalKarma();
-		array.add(600);
-		array.add(400);
-		array.add(525);
-		array.add(369);
+		array.add(550);
+		array.add(450);
+		array.add(500);
+		array.add(375);
 		array.add(400);
 		array.add(450);
 		array.add(500);
-		array.add(523);
-		array.add(560);
+		array.add(525);
+		array.add(540);
 		user1.setHistoricalKarma(array);
+		user1.setNumMatchesPlayed(9);
+		user1.setNumWins(7);
+		user1.setNumLoses(2);
+		user1.setLocation("Madrid");
+		user1.setCountry("España");
 
 		userRepository.save(userNone);
 		userRepository.save(user1);

frontend/src/app/components/header/header.component.ts

@@ -18,12 +18,7 @@ export class HeaderComponent {
 
   getUserMatches(){
     this.userService.getUserMatches().subscribe(
-      listMatches => this.userMatches = listMatches,
-      error => {
-        if (error.status != 403) {
-            console.error('Unexpected Error on getUserMatches')
-        }
-      }
+      listMatches => this.userMatches = listMatches
     )
   }
 

frontend/src/app/components/match/match.component.ts

@@ -26,9 +26,7 @@ export class MatchComponent {
     this.matchService.getMatch(id).subscribe(
       response => this.match = response,
       error => {
-        if (error.status != 404) {
-          console.error('Unexpected Error on getMatch')
-        } else {
+        if (error){
           this.router.navigate(['/error404'])
         }
       }

frontend/src/app/components/register/register.component.html

@@ -67,7 +67,7 @@ <h5 class="upper-text text-center pb-0 fw-bold">Crea un cuenta nueva</h5>
                     </div>
                   </div>
                    <div class="col-12 mt-4">
-                    <button class="btn btn-login upper-text w-100" (click)="register($event,name.value,realName.value,email.value,password.value)" type="submit">Registrarse</button>
+                    <button class="btn btn-login upper-text w-100" (click)="register(name.value,realName.value,email.value,password.value)" type="submit">Registrarse</button>
                   </div>
 
                     <!-- <input type="hidden" name="_csrf" value="{{token}}"/> -->

frontend/src/app/components/register/register.component.ts

@@ -1,5 +1,5 @@
 import { User } from './../../models/user.model';
-import { Component, ViewChild } from '@angular/core';
+import { Component } from '@angular/core';
 import { UserService } from 'src/app/services/user.service';
 
 
@@ -11,43 +11,21 @@ import { UserService } from 'src/app/services/user.service';
 export class RegisterComponent {
   newUser: boolean | undefined;
   User: User | undefined;
-  // @ViewChild("file")
-  // file: any;
 
   removeImage:boolean | undefined;
 
-  constructor(private service: UserService)
-  {
-    // const id = activatedRoute.snapshot.params['id'];
-    // if (id) {
-    //   service.getUser(id).subscribe(
-    //     User => this.User = User,
-    //     error => console.error(error)
-    //   );
-    //   this.newUser = false;
-    // } else {
-    //   this.User = { name: '', realName: '',email:'', location:'',country:'', phone:'', numWins:0,numLoses:0,numMatchesPlayed:0,
-    //   historicalKarma:[],status:false,encodedPassword:'',roles:[], image: false };
-    //   this.newUser = true;
-    // }
-  }
+  constructor(private service: UserService){}
 
-  register(event: any, name: string,realName:string,email:string,password:string){
+  register(name: string,realName:string,email:string,password:string){
     if(!this.User){
 
       this.User = { name: name, realName: realName,email:email, location:'',country:'', phone:'', numWins:0,numLoses:0,numMatchesPlayed:0,
       historicalKarma:[500],status:false,encodedPassword:password,roles:[], image: false };
 
-
-    // if(this.User.image && this.removeImage){
-    //   this.User.image = false;
-    // }
     this.service.registerUser(this.User)
-  }else{
+    }
+    else {
       throw Error();
     }
   }
-
-
-
 }

frontend/src/app/components/userProfile/userProfile.component.html

@@ -22,7 +22,7 @@
               <h2>{{loginService.currentUser().realName}}</h2>
               <h3 class="mt-1 color-green"><span class="fw-bold">@{{loginService.currentUser().name}}</span></h3>
               <h3 class="my-2">Karma: <span
-                  class="color-green fw-bold">{{calculatedKarma(loginService.currentUser().historicalKarma)}}
+                  class="color-green fw-bold">{{getKarma(loginService.currentUser().historicalKarma)}}
                   puntos</span></h3>
               <h3 class="mb-3">{{loginService.currentUser().location}} {{loginService.currentUser().country}}</h3>
             </div>
@@ -89,7 +89,7 @@ <h2 class="mb-1">Tus parejas</h2>
                       <h5 class="card-title pb-0 mb-0">Victorias - Derrotas</h5>
 
                       <!-- Donut Chart -->
-                      <div id="donutChart" style="min-height: 300px;"
+                      <div id="donutChart" style="min-height: 100px;"
                         class="echart d-flex align-items-center justify-content-center">
                         <doughnutChart> </doughnutChart>
                       </div>
@@ -241,7 +241,7 @@ <h6 class="pt-1"><em>{{userTournament.startDate}}</em></h6>
 
                     <!-- <input type="hidden" name="_csrf" value="{{token}}" /> -->
                     <div class="text-center">
-                      <button class="btn btn-green fw-bold" (click)="updateUserForm($event,fullName.value,location.value, country.value,
+                      <button class="btn btn-green fw-bold" (click)="updateUserForm(fullName.value,location.value, country.value,
                       phone.value)" type="submit">Guardar cambios</button>
                     </div>
 

frontend/src/app/components/userProfile/userProfile.component.ts

@@ -2,7 +2,6 @@ import { User } from '../../models/user.model';
 import { Component, ViewChild } from '@angular/core';
 import { UserService } from 'src/app/services/user.service';
 import { LoginService } from 'src/app/services/login.service';
-import { Router } from '@angular/router';
 import { Tournament } from 'src/app/models/tournament.model';
 
 
@@ -28,18 +27,14 @@ export class UserProfileComponent{
   removeImage:boolean;
   auxURL: number = 1;
 
-  constructor(private router: Router,public loginService: LoginService, public userService: UserService) {
+  constructor(public loginService: LoginService, public userService: UserService) {
 
     this.getUserTournaments();
     this.getUserPairs();
   }
 
-  calculatedKarma( array : number[]){
-    let j = 0;
-      for(let i = 0; i < array.length;i++){
-          j+=array[i];
-      }
-    return Math.round(j/array.length);
+  getKarma(array : number[]){
+    return array[array.length-1];
   }
 
   getUserPairs() {
@@ -62,20 +57,15 @@ export class UserProfileComponent{
     )
   }
 
-  updateUserForm(event:any,fullName:string,location:string, country:string, phone:string){
+  updateUserForm(fullName:string,location:string, country:string, phone:string){
       let user = this.loginService.currentUser();
       user.realName=fullName;
       user.location = location;
       user.country=country;
       user.phone = phone;
 
       this.userService.updateUser(user).subscribe(
-        response => this.uploadImage(),
-        error => {
-          if (error.status != 400) {
-            console.error('Unexpected Error on deleteUser')
-          }
-        }
+        _ => this.uploadImage()
       )
     }
 
@@ -88,12 +78,7 @@ export class UserProfileComponent{
     const image = this.file.nativeElement.files[0];
     if (this.removeImage) {
       this.userService.deleteUserImage().subscribe(
-        _ => this.afterUploadImage(),
-        error => {
-          if (error.status != 400) {
-            console.error('Error deleting user image')
-          }
-        }
+        _ => this.afterUploadImage()
       );
     } else if(image){
       let formData = new FormData();
@@ -102,11 +87,9 @@ export class UserProfileComponent{
         _ => {
           this.afterUploadImage()
           this.auxURL = this.auxURL +1
-        },
-        error => alert('Error uploading user image')
+        }
       );
     } else {
-      console.log("Entramos en else")
       this.afterUploadImage();
     }
   }

frontend/src/app/services/match.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs';
+import { map } from 'rxjs';
 
 import { Match } from '../models/match.model';
 import { UserService } from './user.service';
@@ -18,7 +18,17 @@ export class MatchService {
   // THIS FUNCTIONS MAY NO WORK, TEST THEM WHEN DOING THE PAGES OF MATCH
 
   getMatch(id: number | string) {
-    return this.http.get(BASE_URL + id, { withCredentials: true }) as Observable<Match>;
+    return this.http.get(BASE_URL + id, { withCredentials: true }).pipe(map(
+      response => response as Match,
+      error => {
+        if (error.status != 404) {
+          console.error('Unexpected Error on getMatch')
+          return false
+        } else {
+          return true
+        }
+      }
+    ))
   }
 
   resultMatch(id: number | string, result: number[]) {

frontend/src/app/services/user.service.ts

@@ -1,9 +1,9 @@
 import { User } from './../models/user.model';
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { Observable, throwError, map } from 'rxjs';
-import { catchError } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { Match } from '../models/match.model';
+import { Router } from '@angular/router';
 
 const BASE_URL = '/api/users/';
 
@@ -13,34 +13,33 @@ const BASE_URL = '/api/users/';
 export class UserService {
 
 
-constructor(private http: HttpClient) { }
+constructor(private http: HttpClient, private router: Router) { }
 
   //getuser by id
-  getUser(id: number | string): Observable<User> {
-    return this.http.get(BASE_URL + id) as Observable<User>;
+  getUser(id: number | string) {
+    return this.http.get(BASE_URL + id).pipe(map(
+      response => response as User
+    ))
   }
 
   registerUser(User: User) {
-
-
-      return this.http.post(BASE_URL, User,{ withCredentials: true }).subscribe((resp: any) => {
-        console.log("Register new User: Successfully");
-
-    });
+      return this.http.post(BASE_URL, User,{ withCredentials: true }).subscribe(
+        _ => this.router.navigate(['login'])
+      );
   }
 
   setUserImage(formData: FormData) {
-    return this.http.post(BASE_URL + 'image', formData)
-      .pipe(
-        catchError(error => this.handleError(error))
-      );
+    return this.http.post(BASE_URL + 'image', formData).pipe(map(
+      response => response,
+      _error => console.error('Unexpected Error on setUserImage')
+    ))
   }
 
   deleteUserImage(){
-    return this.http.delete(BASE_URL + 'image')
-      .pipe(
-        catchError(error => this.handleError(error))
-      );
+    return this.http.delete(BASE_URL + 'image').pipe(map(
+      response => response,
+      error => errorIgnore(error, 400, "deleteUserImage")
+    ))
   }
 
   deleteUser(id: number | string) {
@@ -51,7 +50,10 @@ constructor(private http: HttpClient) { }
   }
 
   updateUser(user: User) {
-    return this.http.put(BASE_URL , user,{ withCredentials: true })
+    return this.http.put(BASE_URL , user,{ withCredentials: true }).pipe(map(
+      response => response,
+      error => errorIgnore(error, 400, "updateUser")
+    ));
   }
 
   getAllUsers(page: number | string) {
@@ -69,8 +71,10 @@ constructor(private http: HttpClient) { }
   }
 
   getUserMatches() {
-    return this.http.get(BASE_URL + 'me/matches', { withCredentials: true }) as Observable<Match[]>;
-    // return this.http.get(BASE_URL + id, { withCredentials: true }).pipe(catchError(error => this.router.navigate(['/error_404'])));
+    return this.http.get(BASE_URL + 'me/matches', { withCredentials: true }).pipe(map(
+      response => response as Match[],
+      error => errorIgnore(error, 403, "getUserMatches")
+    ));
   }
 
   getUserTournaments(page: number | string) {
@@ -79,13 +83,9 @@ constructor(private http: HttpClient) { }
       error => errorIgnore(error, 403, "getUserTournaments")
     ));
   }
-
-  private handleError(error: any) {
-    console.log("ERROR:");
-    console.error(error);
-    return throwError("Server error (" + error.status + "): ");
-  }
 }
+
+
 function getInfoPageable(response: any): [any[], boolean] {
   if (response.content != undefined) {
     return [response.content,!response.last]