Revize 84a8db02

Re#7493 Modified and tested Users service

webapp/src/app/days-off-approval/days-off-approval.component.ts

@@ -1 +1 @@
 import { Component, EventEmitter, Output, Input } from '@angular/core';
-import {Requests} from '../models/requests.model';
+import {Requests} from '../models/requests.model'; // TODO
 import {VacationType} from '../enums/common.enum';
 
 @Component({

webapp/src/app/employees/employees-list.component.html

@@ -13 +13 @@
     </tr>
     </thead>
     <tbody>
-    <tr *ngFor="let user of users">
+    <tr *ngFor="let user of _users">
       <th scope="row">
         <img
           alt="photo"

webapp/src/app/employees/employees-list.component.sass

@@ -14 +14 @@
 .sickday
   background: #ffc0c0
   border-radius: 40%
+  justify-content: center
 
 .vacation
   background-color: #68b040
   border-radius: 40%
-  width: 40px
+  justify-content: center

webapp/src/app/employees/employees-list.component.ts

@@ -5 +5 @@
 import {MatDialog} from '@angular/material';
 import {EditEmployeeDialogComponent} from './edit-employee-dialog/edit-employee-dialog.component';
 import {DayInfo, User} from './user.model';
+import {AuthorizationRequest} from '../models/requests.model';
 
 const daysOfWeek: string[] = [
   'po',
@@ -71 +72 @@
 
     for (const info of this._employeesBasicInformation) {
       user = new User();
-      user.name = info.name.first + ' ' + info.name.last;
+      user.name = info.firstName + ' ' + info.lastName;
       user.id = info.id;
       user.imageLink = info.photo;
       user.dates = this.mapDays(info);
@@ -110 +111 @@
         this.mapUsers();
         console.log(this._users);
       });
+
+
+    let authorization: AuthorizationRequest[];
+    this.usersService.getAuthorizationRequests()
+      .subscribe((data: AuthorizationRequest[]) => {
+        authorization = { ...data};
+
+        console.log(authorization);
+      });
   }
 
 }

webapp/src/app/enums/common.enum.ts

@@ -32 +32 @@
   EMPLOYEE = 'EMPLOYEE',
   EMPLOYER = 'EMPLOYER',
 }
+
+export enum Languages {
+  ENGLISH = 'EN',
+  CZECH = 'CZ',
+}

webapp/src/app/models/requests.model.ts

@@ -1 @@
-import {Time} from '@angular/common';
 import {RequestStatus, VacationType} from '../enums/common.enum';
+import {Time} from '@angular/common';
+
+export interface VacationRequest {
+  id: number;
+  firstName: string;
+  lastName: string;
+  date: Date;
+  from: Time;
+  to: Time;
+  type: VacationType;
+  timestamp: Date;
+}
+
+
+export interface AuthorizationRequest {
+  id: number;
+  firstName: string;
+  lastName: string;
+  timestamp: Date;
+}
 
+/**
+ * bude se mazat
+ */
 export interface Requests {
   vacation: [
     {

webapp/src/app/models/user-basic-information.model.ts

@@ -3 +3 @@
 
 export interface UserBasicInformation {
   id: number;
-  name: {
-    first: string;
-    last: string;
-  };
+  firstName: string;
+  lastName: string;
   photo: string;
   calendar: [
     {
+      id: number,
       date: Date,
       from: Time,
       to: Time,

webapp/src/app/services/users.service.spec.ts

@@ +1 @@
+import {TestBed} from '@angular/core/testing';
+
+import {UsersService} from './users.service';
+import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
+import {VacationRequest} from '../models/requests.model';
+import {RequestStatus, VacationType} from '../enums/common.enum';
+import {environment} from '../../environments/environment';
+
+describe('UsersService', () => {
+  let service: UsersService;
+  let httpMock: HttpTestingController;
+  const baseUrl: string = environment.apiUrl;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [UsersService]
+    });
+
+    service = TestBed.get(UsersService);
+    httpMock = TestBed.get(HttpTestingController);
+  });
+  afterEach(() => httpMock.verify());
+
+
+  it('getAuthorizationRequests', () => {
+    const dummyRequests = [
+      { id: 1, firstName: 'Tomas', lastName: 'Novak', timestamp: '2019/05/24 21:55:11' },
+      { id: 2, firstName: 'Tomas', lastName: 'Novak', timestamp: '2019/05/24 21:55:11' },
+      { id: 3, firstName: 'Tomas', lastName: 'Novak', timestamp: '2019/05/24 21:55:11' },
+      { id: 4, firstName: 'Tomas', lastName: 'Novak', timestamp: '2019/05/24 21:55:11' },
+      { id: 5, firstName: 'Tomas', lastName: 'Novak', timestamp: '2019/05/24 21:55:11' }
+    ];
+
+    service.getAuthorizationRequests().subscribe((data: any) => {
+      expect(data.length).toBe(5);
+      expect(data[4].lastName).toBe('Novak');
+      expect(data[4].firstName).toBe('Tomas');
+      expect(data[4].id).toBe(5);
+      expect(data[4].timestamp).toBeDefined();
+    });
+
+    const req = httpMock.expectOne(baseUrl + '/api/users/requests/authorization?');
+    expect(req.request.method).toBe('GET');
+    req.flush(dummyRequests);
+  });
+
+  it('getVacationRequests', () => {
+    const dummyRequests = [
+        {id: 1, firstName: 'Tomas', lastName: 'Novak', date: '2019/05/24', type: 'SICKDAY', timestamp: '2019/05/24 21:59:32'},
+        { id: 2, firstName: 'Tomas', lastName: 'Novak', date: '2019/05/24', from: '09:30', to: '18:30', type: 'VACATION', timestamp: '2019/05/24 21:59:32' },
+        {id: 3, firstName: 'Tomas', lastName: 'Novak', date: '2019/05/24', type: 'SICKDAY', timestamp: '2019/05/24 21:59:32'},
+        { id: 4, firstName: 'Tomas', lastName: 'Novak', date: '2019/05/24', from: '09:30', to: '18:30', type: 'VACATION', timestamp: '2019/05/24 21:59:32' },
+        {id: 5, firstName: 'Tomas', lastName: 'Novak', date: '2019/05/24', type: 'SICKDAY', timestamp: '2019/05/24 21:59:32'}
+      ];
+    service.getVacationRequests().subscribe((data: any) => {
+      expect(data.length).toBe(5);
+
+      expect(data[0].firstName).toBeDefined();
+      expect(data[0].lastName).toBeDefined();
+
+      expect(data[0].type).toBe(VacationType.SICKDAY);
+      expect(data[0].to).toBeUndefined();
+      expect(data[0].from).toBeUndefined();
+
+      expect(data[1].type).toBe(VacationType.VACATION);
+      expect(data[1].to).toBeDefined();
+      expect(data[1].from).toBeDefined();
+    });
+
+    const req = httpMock.expectOne(baseUrl + '/api/users/requests/vacation?');
+    expect(req.request.method).toBe('GET');
+    req.flush(dummyRequests);
+  });
+
+
+  it('getAllUsers', () => {
+    const dummyRequests = [
+      {
+        id: 1,
+        firstName: 'Tomas',
+        lastName: 'unknown',
+        photo: 'https://st2.depositphotos.com/9223672/12056/v/950/depositphotos_120568236-stock-illustration-male-face-avatar-logo-template.jpg',
+        calendar: [
+          {
+            id: 1,
+            date: '2019/05/24',
+            from: '09:00',
+            to: '13:00',
+            type: 'VACATION',
+            status: 'ACCEPTED'
+          },
+          {
+            id: 2,
+            date: '2019/05/25',
+            from: '09:00',
+            to: '13:00',
+            type: 'VACATION',
+            status: 'ACCEPTED'
+          }
+        ]
+      },
+      {
+        id: 2,
+        firstName: 'Tomas',
+        lastName: 'unknown',
+        photo: 'https://st2.depositphotos.com/9223672/12056/v/950/depositphotos_120568236-stock-illustration-male-face-avatar-logo-template.jpg',
+        calendar: [
+          {
+            id: 1,
+            date: '2019/05/24',
+            from: '09:00',
+            to: '13:00',
+            type: 'VACATION',
+            status: 'ACCEPTED'
+          },
+          {
+            id: 2,
+            date: '2019/05/25',
+            from: '09:00',
+            to: '13:00',
+            type: 'VACATION',
+            status: 'ACCEPTED'
+          }
+        ]
+      },
+      {
+        id: 3,
+        firstName: 'Tomas',
+        lastName: 'unknown',
+        photo: 'https://st2.depositphotos.com/9223672/12056/v/950/depositphotos_120568236-stock-illustration-male-face-avatar-logo-template.jpg',
+        calendar: [
+          {
+            id: 1,
+            date: '2019/05/24',
+            from: '09:00',
+            to: '13:00',
+            type: 'VACATION',
+            status: 'ACCEPTED'
+          },
+          {
+            id: 2,
+            date: '2019/05/25',
+            from: '09:00',
+            to: '13:00',
+            type: 'VACATION',
+            status: 'ACCEPTED'
+          }
+        ]
+      },
+      {
+        id: 4,
+        firstName: 'Tomas',
+        lastName: 'unknown',
+        photo: 'https://st2.depositphotos.com/9223672/12056/v/950/depositphotos_120568236-stock-illustration-male-face-avatar-logo-template.jpg',
+        calendar: [
+          {
+            id: 1,
+            date: '2019/05/24',
+            from: '09:00',
+            to: '13:00',
+            type: 'VACATION',
+            status: 'ACCEPTED'
+          },
+          {
+            id: 2,
+            date: '2019/05/25',
+            from: '09:00',
+            to: '13:00',
+            type: 'VACATION',
+            status: 'ACCEPTED'
+          }
+        ]
+      },
+      {
+        id: 5,
+        firstName: 'Tomas',
+        lastName: 'unknown',
+        photo: 'https://st2.depositphotos.com/9223672/12056/v/950/depositphotos_120568236-stock-illustration-male-face-avatar-logo-template.jpg',
+        calendar: [
+          {
+            id: 1,
+            date: '2019/05/24',
+            from: '09:00',
+            to: '13:00',
+            type: 'VACATION',
+            status: 'ACCEPTED'
+          },
+          {
+            id: 2,
+            date: '2019/05/25',
+            from: '09:00',
+            to: '13:00',
+            type: 'VACATION',
+            status: 'ACCEPTED'
+          }
+        ]
+      }
+    ];
+    service.getUsers().subscribe((data: any) => {
+      expect(data.length).toBe(5);
+      expect(data[0].id).toBe(1);
+      expect(data[0].firstName).toBeDefined();
+      expect(data[0].lastName).toBeDefined();
+      expect(data[0].photo).toBeDefined();
+      expect(data[0].calendar[0].type).toBe(VacationType.VACATION);
+      expect(data[0].calendar[0].status).toBe(RequestStatus.ACCEPTED);
+      expect(data[0].calendar[0].id).toBe(1);
+      expect(data[0].calendar[1].id).toBe(2);
+    });
+
+    const req = httpMock.expectOne(baseUrl + '/api/users?');
+    expect(req.request.method).toBe('GET');
+    req.flush(dummyRequests);
+  });
+
+});

webapp/src/app/services/users.service.ts

@@ -1 @@
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { BasicService } from './basic.service';
+import {Injectable} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
+import {BasicService} from './basic.service';
 import {catchError} from 'rxjs/operators';
 
 import {UserBasicInformation} from '../models/user-basic-information.model';
-import { Requests } from '../models/requests.model';
-import {ProfileStatus, RequestTypes} from '../enums/common.enum';
+import {AuthorizationRequest, VacationRequest} from '../models/requests.model';
+import {Languages, ProfileStatus} from '../enums/common.enum';
 import {Observable} from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
 })
 export class UsersService extends BasicService {
-  private _usersUrl = this.baseUrl + '/users?status=';
-  private _requestsUrl = this.baseUrl + '/users/requests?type=';
+  private _usersUrl = this.baseUrl + '/api/users?';
+  private _statusPrefix = 'status=';
+  private _languagePrefix = 'language=';
+  private _vacationRequestsUrl = this.baseUrl + '/api/users/requests/vacation?';
+  private _authorizationRequestsUrl = this.baseUrl + '/api/users/requests/authorization?';
 
+  /**
+   * Returns all authorized users
+   */
   getAuthorizedUsers() {
-    return this.getUsersWithStatus(ProfileStatus.AUTHORIZED);
+    return this.makeUsersApiCall(ProfileStatus.AUTHORIZED, '');
   }
 
+  /**
+   * Returns all authorized users with specified language
+   * overloaded version of getAuthorizedUsers
+   * @param language filter users based on language
+   */
+  getAuthorizedUsersWithLanguage(language: Languages) {
+    return this.makeUsersApiCall(ProfileStatus.AUTHORIZED, language);
+  }
+
+  /**
+   * Returns all pending users
+   */
   getPendingUsers() {
-    return this.getUsersWithStatus(ProfileStatus.PENDING);
+    return this.makeUsersApiCall(ProfileStatus.PENDING, '');
+  }
+
+  /**
+   * Returns all pending users with specified language
+   * overloaded version of getPendingUsers
+   * @param language filter users based on language
+   */
+  getPendingUsersWithLanguage(language: Languages) {
+    return this.makeUsersApiCall(ProfileStatus.PENDING, language);
   }
 
+  /**
+   * Return all rejected users
+   */
   getRejectedUsers() {
-    return this.getUsersWithStatus(ProfileStatus.REJECTED);
+    return this.makeUsersApiCall(ProfileStatus.REJECTED, '');
   }
 
-  private getUsersWithStatus(status: string): Observable<UserBasicInformation[]> {
-    console.log(this._usersUrl + status);
-    return this.http.get<UserBasicInformation[]>(this._usersUrl + status)
-      .pipe(
-        catchError(err => this.handleError(err))
-      );
+  /**
+   * Returns all rejected users with specified language
+   * overloaded version of getRejectedUsers
+   * @param language filter users based on language
+   */
+  getRejectedUsersWithLanguage(language: Languages) {
+    return this.makeUsersApiCall(ProfileStatus.REJECTED, language);
+  }
+
+ /**
+  * Default api call which returns all users in the database
+  * regardless of language and status
+  */
+  getUsers() {
+    return this.makeUsersApiCall('', '');
   }
 
+  /**
+   * Returns all vacation requests
+   */
   getVacationRequests() {
-    return this.getRequestsWithType(RequestTypes.VACATION);
+    return this.makeVacationRequestsApiCall('');
+  }
+
+  /**
+   * Returns vacations filtered by language
+   * @param language filter by passed language
+   */
+  getVacationRequestsWithLanguage(language: Languages) {
+    return this.makeVacationRequestsApiCall(language);
   }
 
+
+  /**
+   * Returns all authorization requests
+   */
   getAuthorizationRequests() {
-    return this.getRequestsWithType(RequestTypes.AUTHORIZATION);
+    return this.makeAuthorizationRequestsApiCall('');
+  }
+
+
+  /**
+   * Returns authorization requests filtered by language
+   * @param language filter by passed language
+   */
+  getAuthorizationRequestsWithLanguage(language: Languages) {
+    return this.makeAuthorizationRequestsApiCall(language);
+  }
+
+  private makeAuthorizationRequestsApiCall(language: string) {
+    const apiUrl: string = this.createApiUrl(this._authorizationRequestsUrl, '', language);
+
+    return this.http.get<AuthorizationRequest[]>(apiUrl)
+      .pipe(
+        catchError(err => this.handleError(err))
+      );
+  }
+
+  private makeVacationRequestsApiCall(language: string) {
+    const apiUrl: string = this.createApiUrl(this._vacationRequestsUrl, '', language);
+
+    return this.http.get<VacationRequest[]>(apiUrl)
+      .pipe(
+        catchError(err => this.handleError(err))
+      );
   }
 
-  private getRequestsWithType(type: string) {
-    return this.http.get<Requests>(this._requestsUrl + type)
+  private makeUsersApiCall(status: string, language: string): Observable<UserBasicInformation[]> {
+    const apiUrl: string = this.createApiUrl(this._usersUrl, status, language);
+
+    return this.http.get<UserBasicInformation[]>(apiUrl)
       .pipe(
         catchError(err => this.handleError(err))
       );
   }
 
+  private createApiUrl(base: string, status: string, language: string): string {
+    let apiUrl = base;
+
+    if (status.length > 0) {
+      apiUrl += this._statusPrefix + status + '&';
+    }
+    if (language.length > 0) {
+      apiUrl += this._languagePrefix + language;
+    }
+
+    return apiUrl;
+  }
+
   constructor(protected http: HttpClient) {
     super(http);
   }