From 7dd5599c29d8c3aa1506eed8160195682653ec49 Mon Sep 17 00:00:00 2001 From: Nicolas Fuentes Maturana Date: Wed, 25 Aug 2021 10:01:07 +0200 Subject: [PATCH] Merge pull request #64 in TEA/dafa-web-monorepo from bugfix/TV-410 to develop Squashed commit of the following: commit 8ce45d3a600ae3577f1e0764a6d65f6f087446d1 Author: fueno Date: Wed Aug 25 09:59:34 2021 +0200 TV-410 review fix commit 175bbc005bd383880999472b28a7b1c373911e4a Merge: a65ba47 50a83f7 Author: fueno Date: Tue Aug 24 13:50:50 2021 +0200 Merge branch 'develop' into bugfix/TV-410 commit a65ba47364e5043feecf2634a143573ebb63ad0b Merge: 6f574c8 59ce393 Author: fueno Date: Tue Aug 24 13:46:11 2021 +0200 Merge branch 'develop' into bugfix/TV-410 commit 6f574c8264f0372147c32a6aa297bba2deb54775 Author: fueno Date: Mon Aug 23 16:12:18 2021 +0200 TV-410 updated api request for invite employee --- .../employee-invite.component.ts | 1 + .../models/employee-invite-mock-data.model.ts | 3 --- .../src/app/shared/models/employee.model.ts | 4 ++++ .../shared/services/api/employee.service.ts | 18 ++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 apps/mina-sidor-fa/src/app/shared/models/employee-invite-mock-data.model.ts diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.ts index 8231d19..c4d413f 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.ts @@ -45,6 +45,7 @@ export class EmployeeInviteComponent implements OnInit { complete: () => { post.unsubscribe(); }, + error: (err) => console.log(err) }); } diff --git a/apps/mina-sidor-fa/src/app/shared/models/employee-invite-mock-data.model.ts b/apps/mina-sidor-fa/src/app/shared/models/employee-invite-mock-data.model.ts deleted file mode 100644 index 9c7a505..0000000 --- a/apps/mina-sidor-fa/src/app/shared/models/employee-invite-mock-data.model.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface EmployeeInviteMockaData { - id: number -} diff --git a/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts b/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts index 122f5da..6039c3a 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts @@ -42,6 +42,10 @@ export interface EmployeeRequestData { adressIds: number[]; } +export interface EmployeeInviteRequestData { + emails: string[]; +} + export function mapEmployeeToRequestData(data: Employee): EmployeeRequestData { const { email, roles, tjanstCodes, allaUtforandeVerksamheter, utforandeVerksamhet, utforandeVerksamhetIds, utforandeAdressIds } = data; diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/employee.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/employee.service.ts index 16856c4..e53d087 100644 --- a/apps/mina-sidor-fa/src/app/shared/services/api/employee.service.ts +++ b/apps/mina-sidor-fa/src/app/shared/services/api/employee.service.ts @@ -5,19 +5,15 @@ import { ErrorType } from '@msfa-enums/error-type.enum'; import { SortOrder } from '@msfa-enums/sort-order.enum'; import { environment } from '@msfa-environment'; import { DeleteEmployeeMockApiResponse } from '@msfa-models/api/delete-employee.response.model'; -import { EmployeeInviteMockApiResponse } from '@msfa-models/api/employee-invite.response.model'; import { EmployeeCompactResponse, EmployeeResponse, - EmployeesApiResponse, + EmployeesApiResponse } from '@msfa-models/api/employee.response.model'; -import { EmployeeInviteMockaData } from '@msfa-models/employee-invite-mock-data.model'; import { - Employee, - EmployeesData, - mapEmployeeToRequestData, + Employee, EmployeeInviteRequestData, EmployeesData, mapEmployeeToRequestData, mapResponseToEmployee, - mapResponseToEmployeeCompact, + mapResponseToEmployeeCompact } from '@msfa-models/employee.model'; import { errorToCustomError } from '@msfa-models/error/custom-error'; import { Sort } from '@msfa-models/sort.model'; @@ -176,12 +172,14 @@ export class EmployeeService extends UnsubscribeDirective { ); } - public postEmployeeInvitation(email: string): Observable { + public postEmployeeInvitation(email: string): Observable { return this.httpClient - .post<{ data: EmployeeInviteMockApiResponse }>(`${this._apiBaseUrl}/invite`, { email }) + .post<{ data: EmployeeInviteRequestData }>(`${this._apiBaseUrl}/invite`, { + emails: Object.values(email) + }) .pipe( take(1), - map(res => res.data), + map(res => res.data.emails), catchError(error => throwError({ message: error as string, type: ErrorType.API })) ); }