[BUGFIX] [ENHANCEMENT] [FEATURE]

joaossmacedo · joaossmacedo · commit 33c4f811283a · 2020-04-01T20:02:15.000-03:00
- Corrige hasError()
- Remodela estrutura de hasError() e prepare2send()
- Add validação/mask do nivel da linguagem
diff --git a/angular/src/app/core/models/form-models/base/base-form.model.ts b/angular/src/app/core/models/form-models/base/base-form.model.ts
@@ -25,11 +25,6 @@ export abstract class BaseFormModel {
     }
 
     private static isFieldValid(field): boolean {
-        // console.log(field);
-        // console.log('type checker');
-        // console.log('isInput: ' + (field.constructor === InputFieldModel));
-        // console.log('isForm: ' + (field instanceof BaseFormModel));
-        // console.log('isArray: ' + (field instanceof Array));
         if (field instanceof InputFieldModel ||
             field instanceof BaseFormModel ||
             field instanceof Array) {
@@ -39,22 +34,19 @@ export abstract class BaseFormModel {
         return false;
     }
 
-    // checks if one of the object's fields has an error
-    // if so returns true
-    // otherwise returns false
-    hasError(nonRequiredParam: Array<string> = []): boolean {
-        const keys = (Object.keys(this));
+    private static modelHasError(model: BaseFormModel, nonRequiredParam: Array<string> = []): boolean {
+        const keys = (Object.keys(model));
 
         for (const key of keys) {
-            const field = this[key];
+            const field = model[key];
 
             if (!BaseFormModel.isFieldValid(field)) {
                 throw new Error(INVALID_FORM_MODEL);
             }
 
             let hasError = false;
             if (field instanceof BaseFormModel) {
-                hasError = field.hasError(nonRequiredParam);
+                hasError = this.modelHasError(field, nonRequiredParam);
             } else if (field instanceof Array) {
                 hasError = this.arrayHasError(field, nonRequiredParam);
             } else if (field.errors.length > 0 ||
@@ -70,13 +62,12 @@ export abstract class BaseFormModel {
         return false;
     }
 
-    private arrayHasError(fields: Array<any>, nonRequiredParam: Array<string> = []): boolean {
-        console.log('checking if array has error');
+    private static arrayHasError(fields: Array<any>, nonRequiredParam: Array<string> = []): boolean {
         for (const field of fields) {
             let hasError = false;
+
             if (field instanceof BaseFormModel) {
-                console.log('BaseFormModel');
-                hasError = field.arrayHasError(nonRequiredParam);
+                hasError = this.modelHasError(field, nonRequiredParam);
             } else if (field instanceof Array) {
                 hasError = this.arrayHasError(field, nonRequiredParam);
             } else if (field.hasOwnProperty('value') && field.hasOwnProperty('errors')) {
@@ -91,16 +82,8 @@ export abstract class BaseFormModel {
         return false;
     }
 
-    // returns an object ready to be sent to the backend
-    // Ex:
-    // {
-    //      'property1': value1,
-    //      'property2': value2,
-    //      'property3': value3,
-    //      'property4': value4
-    // }
-    prepare2send(flat = false, propertiesIgnored: Array<string> = []): PREPARE_TO_SEND_RETURN {
-        const keys = (Object.keys(this));
+    private static prepareModel2send(model: BaseFormModel, flat = false, propertiesIgnored: Array<string> = []): PREPARE_TO_SEND_RETURN {
+        const keys = (Object.keys(model));
 
         let ret = {};
 
@@ -109,14 +92,14 @@ export abstract class BaseFormModel {
                 continue;
             }
 
-            const field = this[key];
+            const field = model[key];
 
             if (!BaseFormModel.isFieldValid(field)) {
                 throw new Error(INVALID_FORM_MODEL);
             }
 
             if (field instanceof BaseFormModel) {
-                const returnedValue = field.prepare2send(flat, propertiesIgnored);
+                const returnedValue = this.prepareModel2send(field, flat, propertiesIgnored);
 
                 if (flat) {
                     // merge the objects
@@ -138,14 +121,14 @@ export abstract class BaseFormModel {
         return ret;
     }
 
-    private prepareArray2send(fields: Array<VALID_TYPES>,
-                              flat: boolean, propertiesIgnored: Array<string>):
-                              Array<VALID_TYPES> | null {
+    private static prepareArray2send(fields: Array<VALID_TYPES>,
+                                     flat: boolean, propertiesIgnored: Array<string>):
+                                     Array<VALID_TYPES> | null {
         const array = [];
 
         for (const field of fields) {
             if (field instanceof BaseFormModel) {
-                const returnedValue = field.prepare2send(flat, propertiesIgnored);
+                const returnedValue = this.prepareModel2send(field, flat, propertiesIgnored);
                 array.push(returnedValue);
             } else if (field instanceof Array) {
                 const returnedValue = this.prepareArray2send(field, flat, propertiesIgnored);
@@ -162,6 +145,26 @@ export abstract class BaseFormModel {
         return array;
     }
 
+    // checks if one of the object's fields has an error
+    // if so returns true
+    // otherwise returns false
+    hasError(nonRequiredParam: Array<string> = []): boolean {
+        return BaseFormModel.modelHasError(this, nonRequiredParam);
+    }
+
+
+    // returns an object ready to be sent to the backend
+    // Ex:
+    // {
+    //      'property1': value1,
+    //      'property2': value2,
+    //      'property3': value3,
+    //      'property4': value4
+    // }
+    prepare2send(flat = false, propertiesIgnored: Array<string> = []) {
+        return BaseFormModel.prepareModel2send(this, flat, propertiesIgnored)
+    }
+
     // returns a list of the name of all properties that have input === ''
     //
     // this function returns a list instead of a boolean because it might be useful
diff --git a/angular/src/app/core/services/mask.service.ts b/angular/src/app/core/services/mask.service.ts
@@ -97,4 +97,20 @@ export class MaskService {
 
     return value;
   }
+
+  maskLanguageLevel(value: string): string {
+    value = value.replace(/[^0-9]/g, '');
+
+    const numericalValue = Number(value);
+
+    if (numericalValue < 1 || numericalValue > 5) {
+      if (value.length > 1) {
+        value = value.substr(0, 1);
+      } else {
+        value = '';
+      }
+    }
+
+    return value;
+  }
 }
diff --git a/angular/src/app/core/services/validation.service.ts b/angular/src/app/core/services/validation.service.ts
@@ -122,4 +122,23 @@ export class ValidationService {
       return invalidPassword ? { invalidPasswordConfirmation: { value: control.value } } : null;
     };
   }
+
+  validateLanguageLevel(): ValidatorFn {
+    return (control: AbstractControl): RETURN_TYPE | null => {
+      let invalidLanguageLevel = false;
+
+      const validLanguageLevelRegex = /^(\d){1}$/;
+      invalidLanguageLevel = !validLanguageLevelRegex.test(control.value);
+
+      const value = Number(control.value);
+
+      if (value < 1 || value > 5) {
+        invalidLanguageLevel = true;
+      }
+
+      return invalidLanguageLevel
+        ? { invalidLanguageLevel: { value: control.value } }
+        : null;
+    };
+  }
 }
diff --git a/angular/src/app/home/pages/register/register.component.html b/angular/src/app/home/pages/register/register.component.html
@@ -1,18 +1,23 @@
 <div class="body">
     <h2>Personal Info</h2>
     <app-input type='email' label='E-mail' placeholder='Ex: email@email.com'
+               [initialValue]='form.email.value'
                (emitter)="inputReturn($event, 'email')">
     </app-input>
     <app-input type='phone' label='Phone' placeholder='Ex: (123) 456-7890'
+               [initialValue]='form.phone.value'
                (emitter)="inputReturn($event, 'phone')">
     </app-input>
     <app-input type='city' label='City' placeholder='Ex: San Francisco'
+               [initialValue]='form.city.value'
                (emitter)="inputReturn($event, 'city')">
     </app-input>
     <app-input type='password' label='Password' placeholder='Ex: Passw0rd!'
+               [initialValue]='form.password.value'
                (emitter)="inputReturn($event, 'password')">
     </app-input>
     <app-input type='password' label='Password confirmation' placeholder='Ex: Passw0rd!'
+               [initialValue]='form.passwordConfirmation.value'
                (emitter)="inputReturn($event, 'passwordConfirmation')"
                [confirmValue]="form ? form.password.value : ''">
     </app-input>
@@ -32,7 +37,7 @@ <h2>Languages</h2>
     <div class="languages-input-container" *ngFor='let languages of form?.languages; let i = index;'>
         <div class="language-input-container">
             <app-input type='language' label='Language' placeholder='Ex: English'
-                    (emitter)="inputReturn($event, 'languages', i, 'name')">
+                       (emitter)="inputReturn($event, 'languages', i, 'name')">
             </app-input>
             <div class="remove-button" (click)="removeLanguages(i)">
                 Remove
diff --git a/angular/src/app/home/pages/register/register.component.ts b/angular/src/app/home/pages/register/register.component.ts
@@ -1,5 +1,5 @@
 import { InputFieldModel } from './../../../../../../ionic/src/app/models/input-field-model';
-import { Component, OnInit, AfterViewInit } from '@angular/core';
+import { Component, OnInit, AfterContentInit } from '@angular/core';
 import { RegisterFormModel } from '../../models/register-form.model';
 import { LanguageFormModel } from '../../models/language-form.model';
 
@@ -8,15 +8,15 @@ import { LanguageFormModel } from '../../models/language-form.model';
   templateUrl: './register.component.html',
   styleUrls: ['./register.component.scss']
 })
-export class RegisterComponent implements OnInit, AfterViewInit {
+export class RegisterComponent implements OnInit, AfterContentInit {
   form: RegisterFormModel;
 
   constructor() { }
 
   ngOnInit(): void {
   }
 
-  ngAfterViewInit(): void {
+  ngAfterContentInit(): void {
     this.form = new RegisterFormModel();
   }
 
@@ -35,6 +35,7 @@ export class RegisterComponent implements OnInit, AfterViewInit {
 
   submit() {
     console.log(this.form.prepare2send());
+    console.log(this.form.getPropertiesByForm());
   }
 
   addNewSkill() {
diff --git a/angular/src/app/shared/components/input/input.component.ts b/angular/src/app/shared/components/input/input.component.ts
@@ -59,6 +59,9 @@ export class InputComponent implements OnInit, OnChanges {
       case 'cnpj':
         validators.push(this.validation.validateCNPJFormat());
         break;
+      case 'language-level':
+        validators.push(this.validation.validateLanguageLevel());
+        break;
       default:
         break;
     }
@@ -104,6 +107,9 @@ export class InputComponent implements OnInit, OnChanges {
       case 'cnpj':
         value = this.mask.maskCNPJ(value);
         break;
+      case 'language-level':
+        value = this.mask.maskLanguageLevel(value);
+        break;
       default:
         break;
     }
@@ -170,7 +176,8 @@ export class InputComponent implements OnInit, OnChanges {
                              ' 1 uppercase letter , 1 lowercase letter, 1 number and 1 special character ',
       invalidPasswordConfirmation: 'Passwords don\'t match',
       invalidCPFFormat: 'Invalid CPF format',
-      invalidCNPJFormat: 'Invalid CNPJ format'
+      invalidCNPJFormat: 'Invalid CNPJ format',
+      invalidLanguageSkill: 'Language level must be between 1 and 5'
     };
 
     const error = this.errors[0];
diff --git a/tsconfig.app.json b/tsconfig.app.json
