Country inputs.

Author: gnllucena

src/app/domain/Jwt.ts

@@ -1,4 +1,8 @@
 export class Jwt {
+  public constructor(init?:Partial<Jwt>) {
+    Object.assign(this, init);
+  }
+
   Token: String;
   Timeout: Date;
   Username: String;

src/app/domain/User.ts

@@ -1,4 +1,8 @@
 export class User {
+  public constructor(init?:Partial<User>) {
+    Object.assign(this, init);
+  }
+
   Id: Number;
   Name: String;
   Email: String;

src/app/domain/card.ts

@@ -1,4 +1,8 @@
 export class Card {
+  public constructor(init?:Partial<Card>) {
+    Object.assign(this, init);
+  }
+
   Title: String;
   Description: String;
   Link: String;

src/app/domain/country.ts

@@ -0,0 +1,9 @@
+export class Country {
+  public constructor(init?:Partial<Country>) {
+    Object.assign(this, init);
+  }
+
+  Id: Number;
+  Name: String;    
+}
+  

src/app/domain/pagination.ts

@@ -1,4 +1,8 @@
 export class Pagination<T>  {
+  public constructor(init?:Partial<Pagination<T>>) {
+    Object.assign(this, init);
+  }
+
   Items: Array<T>;
   Offset: Number;
   Limit: Number;

src/app/modules/core/http-backend.interceptor.ts

@@ -6,6 +6,7 @@ import { Jwt } from '../../domain/jwt';
 import { Card } from './../../domain/card';
 import { User } from '../../domain/user';
 import { Pagination } from 'src/app/domain/pagination';
+import { Country } from 'src/app/domain/country';
 
 @Injectable()
 export class HttpBackendInterceptor implements HttpInterceptor {
@@ -17,28 +18,26 @@ export class HttpBackendInterceptor implements HttpInterceptor {
         var data = new Date();
         data.setDate(data.getDate() + 1);
 
-        let jwt: Jwt = {
+        let jwt = new Jwt({
           Token: "eaea23424asdfaefwr52asdfasdf32s",
           Timeout: data,
           Username: req.body.Email.split("@")[0],
           Name: req.body.Email.split("@")[0],
           Email: req.body.Email
-        };
+        });
 
         return of(new HttpResponse({ status: 200, body: jwt }));
       }
 
       if (req.url.includes('cards') && req.method === 'GET') {
         let cards: Card[] = [];
 
-        var card: Card = {
-          Title: 'Card title',
-          Description: 'Some quick example text to build on the card title and make up the bulk of the card\'s content.',
-          Link: 'Dapibus ac facilisis in'
-        }
-
         for (let i = 0; i < 9; i++) {
-          cards.push(card);
+          cards.push(new Card({
+            Title: 'Card title',
+            Description: 'Some quick example text to build on the card title and make up the bulk of the card\'s content.',
+            Link: 'Dapibus ac facilisis in'
+          }));
         }
 
         return of(new HttpResponse({ status: 200, body: cards }));
@@ -48,20 +47,18 @@ export class HttpBackendInterceptor implements HttpInterceptor {
         let users: User[] = [];
 
         var data = new Date();
-
-        var user: User = {
-          Id: 1,
-          Name: 'Gabriel Lucena',
-          Email: '[email protected]',
-          Document: '023.437.673-27',
-          Birthdate:  new Date('1991-04-28T12:00:00'),
-          Country: 'Brasil',
-          Profile: 'Administrator',
-          Active: true
-        }
-
+        
         for (let i = 0; i < 10; i++) {
-          users.push(user);
+          users.push(new User({
+            Id: 1,
+            Name: 'Gabriel Lucena',
+            Email: '[email protected]',
+            Document: '023.437.673-27',
+            Birthdate:  new Date('1991-04-28T12:00:00'),
+            Country: 'Brasil',
+            Profile: 'Administrator',
+            Active: true
+          }));
         }
 
         let pagination: Pagination<User> = {
@@ -89,6 +86,17 @@ export class HttpBackendInterceptor implements HttpInterceptor {
         return of(new HttpResponse({ status: 200, body: user }));
       }
 
+      if (req.url.includes('countries') && req.method === 'GET') {
+        let countries: Country[] = [];
+
+        countries.push(new Country({ Id: 1, Name: 'Brazil' }));
+        countries.push(new Country({ Id: 1, Name: 'United States of America' }));
+        countries.push(new Country({ Id: 1, Name: 'Thailand' }));
+        countries.push(new Country({ Id: 1, Name: 'Greece' }));
+
+        return of(new HttpResponse({ status: 200, body: countries }));
+      }
+
       if (req.url.includes('error') && req.method === 'GET') {
         return throwError({ error: { message: 'Error thrown.' } });
       }

src/app/routes/users/users-list/users-list.component.ts

@@ -23,7 +23,7 @@ export class UsersListComponent {
   public faEdit: IconDefinition = faEdit;
   public pagination: Observable<Pagination<User>>;
 
-  constructor(public httpService: HttpService<User>) { }
+  constructor(public userService: HttpService<User>) { }
 
   edit(user: User): void {
     this.editEvent.emit(user);
@@ -34,7 +34,7 @@ export class UsersListComponent {
   }
 
   list(offset: Number, limit: Number, filters: FormGroup): Observable<Pagination<User>> {
-    this.pagination = this.httpService.list('users', offset, limit, filters);
+    this.pagination = this.userService.paginate('users', offset, limit, filters);
 
     return this.pagination;
   }

src/app/routes/users/users-page/users-page.component.ts

@@ -9,6 +9,7 @@ import { ConfirmationModalComponent } from 'src/app/modules/modals/confirmation-
 import { Router } from '@angular/router';
 import { HttpService } from 'src/app/services/http.service';
 import { forkJoin } from 'rxjs';
+import { Country } from 'src/app/domain/country';
 
 @Component({
   selector: 'users-page',
@@ -25,20 +26,23 @@ export class UsersPageComponent implements OnInit {
 
   constructor(
     private router: Router,
-    private httpService: HttpService<User>) { }
+    private userService: HttpService<User>,
+    private countryService: HttpService<Country>,) { }
 
   ngOnInit(): void {
-    if (this.router.url.includes('new')) {
-      this.userAdd.user.next(new User());
-    } else if (this.router.url.includes('users/')) {
-      let get = this.httpService.get('users', 1);
-      let list = this.userList.list(0, 10, null);
+    let list = this.userList.list(0, 10, null);
+    let countries = this.countryService.list('countries');
 
-      forkJoin([get, list]).subscribe(results => {
-        this.userEdit.user.next(results[0]);
+    if (this.router.url.includes('new')) {  
+      forkJoin([list, countries]).subscribe(results => {
+        this.userAdd.user.next(new User());
+      });
+    } else if (this.router.url.includes('users/')) {
+      let get = this.userService.get('users', 1);
+      
+      forkJoin([list, countries, get]).subscribe(results => {
+        this.userEdit.user.next(results[2]);
       });
-    } else {
-      this.userList.list(0, 10, null);
     }
   }
 

src/app/services/http.service.ts

@@ -21,7 +21,11 @@ export class HttpService<T> {
     return this.http.get<T>(environment.server + '/' + route + '/' + id);
   }
 
-  list(route: String, offset: Number, limit: Number, filters: FormGroup): Observable<Pagination<T>> {
+  list(route: String): Observable<T[]>{
+    return this.http.get<T[]>(environment.server + '/' + route);
+  }
+
+  paginate(route: String, offset: Number, limit: Number, filters: FormGroup): Observable<Pagination<T>> {
     let query = '';
 
     if (filters) {