feat(services): refactor services to classes

ismaelramosmeta · ismaelramosmeta · commit 2ef91334c6e5 · 2023-07-04T23:32:06.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -93,7 +93,7 @@
     "standard-version": "9.5.0",
     "stylelint": "14.16.1",
     "stylelint-config-prettier": "9.0.4",
-    "stylelint-config-recess-order": "4.0.0",
+    "stylelint-config-recess-order": "3.1.0",
     "stylelint-config-standard": "30.0.1",
     "stylelint-order": "6.0.2",
     "stylelint-selector-bem-pattern": "^2.1.1",
diff --git a/src/app/modules/auth/pages/log-in-page/log-in-page.component.ts b/src/app/modules/auth/pages/log-in-page/log-in-page.component.ts
@@ -18,11 +18,10 @@ import { AuthService } from '~modules/auth/shared/auth.service';
 import { ApolloError } from '@apollo/client/errors';
 import { Subject, takeUntil } from 'rxjs';
 import { APP_CONFIG, AppConfig } from '../../../../configs/app.config';
-import { UtilService } from '~modules/shared/services/util.service';
+import { NetworkHelperService } from '~modules/shared/services/network-helper.service';
 import { ApiError } from '~modules/shared/interfaces/api-error.interface';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { userRoutes } from '~modules/user/shared/user-routes';
-import { ValidationService } from '~modules/shared/services/validation.service';
 import { AlertId, AlertService } from '~modules/shared/services/alert.service';
 import { CustomError } from '~modules/auth/shared/interfaces/custom-errors.enum';
 import { AuthUserData } from '~modules/auth/shared/interfaces/register-data.interface';
@@ -36,6 +35,7 @@ import { LowercaseDirective } from '~modules/shared/directives/lowercase.directi
 import { TrimDirective } from '~modules/shared/directives/trim.directive';
 import { HttpClientModule } from '@angular/common/http';
 import { IAppConfig } from '../../../../configs/app-config.interface';
+import { EmailValidators } from '~modules/shared/validators/email.validators';
 
 @Component({
   selector: 'app-log-in-page',
@@ -72,7 +72,7 @@ export class LogInPageComponent implements OnDestroy, AfterViewInit {
     private router: Router,
     private changeDetectorRef: ChangeDetectorRef,
     private alertService: AlertService,
-    private utilService: UtilService,
+    private utilService: NetworkHelperService,
     private authRepository: AuthRepository,
     private activatedRoute: ActivatedRoute,
     @Inject(APP_CONFIG) public appConfig: IAppConfig,
@@ -83,7 +83,7 @@ export class LogInPageComponent implements OnDestroy, AfterViewInit {
     this.isButtonLogInLoading = false;
     this.email = new FormControl<string | null>('', [
       Validators.required,
-      ValidationService.isEmailValidator(),
+      EmailValidators.isEmail(),
     ]);
     this.password = new FormControl<string | null>('', [Validators.required]);
     this.logInForm = this.formBuilder.group({
diff --git a/src/app/modules/auth/pages/register-page/register-page.component.ts b/src/app/modules/auth/pages/register-page/register-page.component.ts
@@ -18,10 +18,9 @@ import { AuthService } from '~modules/auth/shared/auth.service';
 import { ApolloError } from '@apollo/client/errors';
 import { Subject, takeUntil } from 'rxjs';
 import { APP_CONFIG } from '../../../../configs/app.config';
-import { UtilService } from '~modules/shared/services/util.service';
+import { NetworkHelperService } from '~modules/shared/services/network-helper.service';
 import { ApiError } from '~modules/shared/interfaces/api-error.interface';
 import { Router, RouterLink } from '@angular/router';
-import { ValidationService } from '~modules/shared/services/validation.service';
 import { AlertId, AlertService } from '~modules/shared/services/alert.service';
 import { CustomError } from '~modules/auth/shared/interfaces/custom-errors.enum';
 import { AuthUserData } from '~modules/auth/shared/interfaces/register-data.interface';
@@ -35,6 +34,7 @@ import { LanguageSelectorComponent } from '~modules/auth/shared/components/langu
 import { TrimDirective } from '~modules/shared/directives/trim.directive';
 import { LowercaseDirective } from '~modules/shared/directives/lowercase.directive';
 import { IAppConfig } from '../../../../configs/app-config.interface';
+import { EmailValidators } from '~modules/shared/validators/email.validators';
 
 @Component({
   selector: 'app-register-page',
@@ -74,7 +74,7 @@ export class RegisterPageComponent implements OnDestroy {
     private router: Router,
     private changeDetectorRef: ChangeDetectorRef,
     private alertService: AlertService,
-    private utilService: UtilService,
+    private utilService: NetworkHelperService,
     @Inject(APP_CONFIG) public appConfig: IAppConfig,
     private document: Document
   ) {
@@ -88,7 +88,7 @@ export class RegisterPageComponent implements OnDestroy {
     ]);
     this.email = new FormControl<string | null>('', [
       Validators.required,
-      ValidationService.isEmailValidator(),
+      EmailValidators.isEmail(),
     ]);
     this.password = new FormControl<string | null>('', {
       validators: [
diff --git a/src/app/modules/shared/classes/track-by.ts b/src/app/modules/shared/classes/track-by.ts
@@ -1,11 +1,7 @@
-import { Injectable } from '@angular/core';
 import { Alert } from '~modules/shared/services/alert.service';
 import { Hero } from '~modules/hero/shared/hero.model';
 
-@Injectable({
-  providedIn: 'root',
-})
-export class TrackByService {
+export class TrackBy {
   static trackAlert(index: number, alert: Alert) {
     return alert.id;
   }
diff --git a/src/app/modules/shared/components/alert/alert.component.ts b/src/app/modules/shared/components/alert/alert.component.ts
@@ -20,7 +20,7 @@ import { Subject, takeUntil } from 'rxjs';
 import { AppConfig } from '../../../../configs/app.config';
 import { EventBusService } from '~modules/shared/services/event-bus.service';
 import { getAlertConfigById } from '~modules/shared/components/alert/alerts.config';
-import { TrackByService } from '~modules/shared/services/track-by.service';
+import { TrackBy } from '~modules/shared/classes/track-by';
 
 @Component({
   selector: 'app-alert',
@@ -43,7 +43,7 @@ export class AlertComponent implements OnInit, OnDestroy {
     private changeDetectorRef: ChangeDetectorRef,
     private eventBusService: EventBusService
   ) {
-    this.trackAlert = TrackByService.trackAlert;
+    this.trackAlert = TrackBy.trackAlert;
     this.alerts = [];
   }
 
diff --git a/src/app/modules/shared/services/network-helper.service.ts b/src/app/modules/shared/services/network-helper.service.ts
@@ -6,7 +6,7 @@ import { CustomError } from '~modules/auth/shared/interfaces/custom-errors.enum'
 @Injectable({
   providedIn: 'root',
 })
-export class UtilService {
+export class NetworkHelperService {
   constructor(private alertService: AlertService) {}
 
   checkNetworkError(error: ApolloError): boolean {
diff --git a/src/app/modules/shared/services/validation.service.ts b/src/app/modules/shared/services/validation.service.ts
diff --git a/src/app/modules/shared/validators/email.validators.ts b/src/app/modules/shared/validators/email.validators.ts
@@ -0,0 +1,10 @@
+import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
+import { isEmail as isEmailValidator } from 'class-validator';
+
+export class EmailValidators {
+  static isEmail(): ValidatorFn {
+    return (control: AbstractControl): ValidationErrors | null => {
+      return !isEmailValidator(control.value) ? { email: true } : null;
+    };
+  }
+}
diff --git a/src/app/modules/user/components/change-language/change-language.component.ts b/src/app/modules/user/components/change-language/change-language.component.ts
@@ -4,7 +4,7 @@ import { Subject, takeUntil } from 'rxjs';
 import { ApolloError } from '@apollo/client/errors';
 import { AuthService } from '~modules/auth/shared/auth.service';
 import { AlertId, AlertService } from '~modules/shared/services/alert.service';
-import { UtilService } from '~modules/shared/services/util.service';
+import { NetworkHelperService } from '~modules/shared/services/network-helper.service';
 import { AuthRepository } from '~modules/auth/store/auth.repository';
 import { NgIf } from '@angular/common';
 import { User } from '~modules/user/shared/user.model';
@@ -34,7 +34,7 @@ export class ChangeLanguageComponent implements OnInit, OnDestroy {
     private authService: AuthService,
     private alertService: AlertService,
     private authRepository: AuthRepository,
-    private utilService: UtilService,
+    private utilService: NetworkHelperService,
     private document: Document
   ) {
     this.window = this.document.defaultView as Window;
diff --git a/src/app/modules/user/components/change-password/change-password.component.ts b/src/app/modules/user/components/change-password/change-password.component.ts
@@ -23,7 +23,7 @@ import { Subject, takeUntil } from 'rxjs';
 import { ApolloError } from '@apollo/client/errors';
 import { AuthService } from '~modules/auth/shared/auth.service';
 import { AlertId, AlertService } from '~modules/shared/services/alert.service';
-import { UtilService } from '~modules/shared/services/util.service';
+import { NetworkHelperService } from '~modules/shared/services/network-helper.service';
 import { AuthRepository } from '~modules/auth/store/auth.repository';
 import { ApiError } from '~modules/shared/interfaces/api-error.interface';
 import { CustomError } from '~modules/auth/shared/interfaces/custom-errors.enum';
@@ -53,7 +53,7 @@ export class ChangePasswordComponent implements OnDestroy {
     private authService: AuthService,
     private authRepository: AuthRepository,
     private alertService: AlertService,
-    private utilService: UtilService
+    private utilService: NetworkHelperService
   ) {
     this.isButtonChangePasswordLoading = false;
     this.showPassword = false;
diff --git a/src/app/modules/user/components/delete-account/delete-account.component.ts b/src/app/modules/user/components/delete-account/delete-account.component.ts
@@ -23,7 +23,7 @@ import { Subject, takeUntil } from 'rxjs';
 import { ApolloError } from '@apollo/client/errors';
 import { AuthService } from '~modules/auth/shared/auth.service';
 import { AlertId, AlertService } from '~modules/shared/services/alert.service';
-import { UtilService } from '~modules/shared/services/util.service';
+import { NetworkHelperService } from '~modules/shared/services/network-helper.service';
 import { AuthRepository } from '~modules/auth/store/auth.repository';
 import { CustomError } from '~modules/auth/shared/interfaces/custom-errors.enum';
 import { authRoutes } from '~modules/auth/shared/auth-routes';
@@ -62,7 +62,7 @@ export class DeleteAccountComponent implements OnDestroy {
     private authRepository: AuthRepository,
     private alertService: AlertService,
     private router: Router,
-    private utilService: UtilService,
+    private utilService: NetworkHelperService,
     private document: Document
   ) {
     this.window = this.document.defaultView as Window;
diff --git a/src/app/modules/user/components/edit-profile/edit-profile.component.ts b/src/app/modules/user/components/edit-profile/edit-profile.component.ts
@@ -22,7 +22,7 @@ import { Subject, takeUntil } from 'rxjs';
 import { ApolloError } from '@apollo/client/errors';
 import { AuthService } from '~modules/auth/shared/auth.service';
 import { AlertId, AlertService } from '~modules/shared/services/alert.service';
-import { UtilService } from '~modules/shared/services/util.service';
+import { NetworkHelperService } from '~modules/shared/services/network-helper.service';
 
 @Component({
   selector: 'app-edit-profile',
@@ -47,7 +47,7 @@ export class EditProfileComponent implements OnInit, OnDestroy {
     private changeDetectorRef: ChangeDetectorRef,
     private authService: AuthService,
     private alertService: AlertService,
-    private utilService: UtilService
+    private utilService: NetworkHelperService
   ) {
     this.isButtonProfileLoading = false;
   }
diff --git a/src/app/modules/user/pages/dashboard/dashboard-page.component.ts b/src/app/modules/user/pages/dashboard/dashboard-page.component.ts
@@ -18,14 +18,14 @@ import { userRoutes } from '~modules/user/shared/user-routes';
 import { RouterLink } from '@angular/router';
 import { HeroOrderField, HeroService, OrderDirection } from '~modules/hero/shared/hero.service';
 import { Hero } from '~modules/hero/shared/hero.model';
-import { TrackByService } from '~modules/shared/services/track-by.service';
 import { ApolloError } from '@apollo/client/errors';
 import { ApiError } from '~modules/shared/interfaces/api-error.interface';
 import { CustomError } from '~modules/auth/shared/interfaces/custom-errors.enum';
 import { AlertId, AlertService } from '~modules/shared/services/alert.service';
-import { UtilService } from '~modules/shared/services/util.service';
+import { NetworkHelperService } from '~modules/shared/services/network-helper.service';
 import { UserService } from '~modules/user/shared/user.service';
 import { HeroModalComponent } from '~modules/user/components/hero-modal/hero-modal.component';
+import { TrackBy } from '~modules/shared/classes/track-by';
 
 @Component({
   selector: 'app-dashboard-page',
@@ -48,13 +48,13 @@ export class DashboardPageComponent implements OnInit, OnDestroy {
     private authRepository: AuthRepository,
     private heroService: HeroService,
     private userService: UserService,
-    private utilService: UtilService,
+    private utilService: NetworkHelperService,
     private alertService: AlertService,
     private changeDetectorRef: ChangeDetectorRef,
     @Inject(LOCALE_ID) public locale: string,
     private document: Document
   ) {
-    this.trackHero = TrackByService.trackHero;
+    this.trackHero = TrackBy.trackHero;
     this.window = this.document.defaultView as Window;
     this.publicHeroes = [];
   }
diff --git a/src/app/modules/user/pages/my-heroes/my-heroes-page.component.ts b/src/app/modules/user/pages/my-heroes/my-heroes-page.component.ts
@@ -16,12 +16,12 @@ import { NgForOf, NgIf, NgOptimizedImage } from '@angular/common';
 import { RouterLink } from '@angular/router';
 import { HeroService } from '~modules/hero/shared/hero.service';
 import { Hero } from '~modules/hero/shared/hero.model';
-import { TrackByService } from '~modules/shared/services/track-by.service';
 import { AlertId, AlertService } from '~modules/shared/services/alert.service';
-import { UtilService } from '~modules/shared/services/util.service';
+import { NetworkHelperService } from '~modules/shared/services/network-helper.service';
 import { UserService } from '~modules/user/shared/user.service';
 import { Modal } from 'bootstrap';
 import { HeroModalComponent } from '~modules/user/components/hero-modal/hero-modal.component';
+import { TrackBy } from '~modules/shared/classes/track-by';
 
 @Component({
   selector: 'app-my-heroes-page',
@@ -46,13 +46,13 @@ export class MyHeroesPageComponent implements OnInit, OnDestroy {
     private authRepository: AuthRepository,
     private heroService: HeroService,
     private userService: UserService,
-    private utilService: UtilService,
+    private utilService: NetworkHelperService,
     private alertService: AlertService,
     private changeDetectorRef: ChangeDetectorRef,
     @Inject(LOCALE_ID) public locale: string,
     private document: Document
   ) {
-    this.trackHero = TrackByService.trackHero;
+    this.trackHero = TrackBy.trackHero;
     this.window = this.document.defaultView as Window;
     this.userHeroes = [];
   }
