feat(employee): Now showing utförande verksamheter/adresser and tjänster correctly. (TV-554)

Squashed commit of the following:

commit 3d1d4a33905f41028f97e7f86131e6e284aebba9
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Sep 8 11:51:06 2021 +0200

    Fixed some tests and linting

commit 651300f244f8ef3ca71f290de421033c05f4a1ca
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Sep 8 11:43:34 2021 +0200

    Some style changes

commit bc0762ba3fa36dc3b85ac3316d87a8a942fe30ee
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Sep 8 09:13:57 2021 +0200

    Fixed issue with edit employee after api changes

commit 757f69ddcdf3913fcbc967df3fdcf8cbb6ed3eb5
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Sep 8 08:48:44 2021 +0200

    Added tjänst and utforandeverksamheter/adresser to employee card

apps/mina-sidor-fa/src/app/shared/models/api/employee-adress.response.model.ts

@@ -0,0 +1,4 @@
+export interface EmployeeAdressResponse {
+  id: number;
+  namn: string;
+}

apps/mina-sidor-fa/src/app/shared/models/api/employee-tjanst.response.model.ts

@@ -0,0 +1,4 @@
+export interface EmployeeTjanstResponse {
+  namn: string;
+  tjansteKod: string;
+}

apps/mina-sidor-fa/src/app/shared/models/api/employee-utforande-verksamhet.response.model.ts

@@ -0,0 +1,8 @@
+import { EmployeeAdressResponse } from './employee-adress.response.model';
+
+export interface EmployeeUtforandeVerksamhetResponse {
+  id: number;
+  namn: string;
+  allaAdresser: boolean;
+  adresser: EmployeeAdressResponse[];
+}

apps/mina-sidor-fa/src/app/shared/models/api/employee.response.model.ts

@@ -1,18 +1,7 @@
 import { RoleEnum } from '@msfa-enums/role.enum';
 import { PaginationMeta } from '@msfa-models/pagination-meta.model';
-import { TjanstResponse } from './tjanst.response.model';
-
-interface UtforandeVerksamhetResponse {
-  id: number;
-  name: string;
-  allaAdresser: boolean;
-  adresser?: AdressResponse[];
-}
-
-interface AdressResponse {
-  id: number;
-  name: string;
-}
+import { EmployeeTjanstResponse } from './employee-tjanst.response.model';
+import { EmployeeUtforandeVerksamhetResponse } from './employee-utforande-verksamhet.response.model';
 
 export interface EmployeeCompactResponse {
   ciamUserId: string;
@@ -29,14 +18,9 @@ export interface EmployeeResponse {
   email: string;
   ssn: string;
   roles: RoleEnum[];
-  tjanster: TjanstResponse[];
+  tjanster: EmployeeTjanstResponse[];
   allaUtforandeVerksamheter: boolean;
-  utforandeVerksamheter: UtforandeVerksamhetResponse[];
-
-  // Will be removed
-  tjansteKoder: string[];
-  utforandeVerksamhetIds: number[];
-  adressIds: number[];
+  utforandeVerksamheter: EmployeeUtforandeVerksamhetResponse[];
 }
 
 export interface EmployeesDataResponse {

apps/mina-sidor-fa/src/app/shared/models/api/utforande-adress.response.model.ts

@@ -0,0 +1,4 @@
+export interface UtforandeAdressResponse {
+  id: number;
+  namn: string;
+}

apps/mina-sidor-fa/src/app/shared/models/api/utforande-verksamhet.response.model.ts

@@ -0,0 +1,7 @@
+import { UtforandeAdressResponse } from './utforande-adress.response.model';
+
+export interface UtforandeVerksamhetResponse {
+  id: number;
+  name: string;
+  adresser: UtforandeAdressResponse[];
+}

apps/mina-sidor-fa/src/app/shared/models/employee-adress.model.ts

@@ -0,0 +1,15 @@
+import { EmployeeAdressResponse } from './api/employee-adress.response.model';
+
+export interface EmployeeAdress {
+  id: number;
+  name: string;
+}
+
+export function mapResponseToEmployeeAdress(data: EmployeeAdressResponse): EmployeeAdress {
+  const { id, namn } = data;
+
+  return {
+    id,
+    name: namn,
+  };
+}

apps/mina-sidor-fa/src/app/shared/models/employee-tjanst.model.ts

@@ -0,0 +1,15 @@
+import { EmployeeTjanstResponse } from './api/employee-tjanst.response.model';
+
+export interface EmployeeTjanst {
+  name: string;
+  tjansteKod: string;
+}
+
+export function mapResponseToEmployeeTjanst(data: EmployeeTjanstResponse): EmployeeTjanst {
+  const { namn, tjansteKod } = data;
+
+  return {
+    name: namn,
+    tjansteKod,
+  };
+}

apps/mina-sidor-fa/src/app/shared/models/employee-utforande-verksamhet.model.ts

@@ -0,0 +1,22 @@
+import { EmployeeUtforandeVerksamhetResponse } from './api/employee-utforande-verksamhet.response.model';
+import { EmployeeAdress, mapResponseToEmployeeAdress } from './employee-adress.model';
+
+export interface EmployeeUtforandeVerksamhet {
+  id: number;
+  name: string;
+  allaAdresser: boolean;
+  adresser: EmployeeAdress[];
+}
+
+export function mapResponseToEmployeeUtforandeVerksamhet(
+  data: EmployeeUtforandeVerksamhetResponse
+): EmployeeUtforandeVerksamhet {
+  const { id, namn, allaAdresser, adresser } = data;
+
+  return {
+    id,
+    name: namn,
+    allaAdresser,
+    adresser: adresser.map(adress => mapResponseToEmployeeAdress(adress)),
+  };
+}

apps/mina-sidor-fa/src/app/shared/models/employee.model.ts

@@ -1,22 +1,14 @@
 import { RoleEnum } from '@msfa-enums/role.enum';
 import { EmployeeCompactResponse, EmployeeResponse } from './api/employee.response.model';
+import { EmployeeTjanst, mapResponseToEmployeeTjanst } from './employee-tjanst.model';
+import {
+  EmployeeUtforandeVerksamhet,
+  mapResponseToEmployeeUtforandeVerksamhet,
+} from './employee-utforande-verksamhet.model';
 import { PaginationMeta } from './pagination-meta.model';
-import { mapResponseToTjanst, Tjanst } from './tjanst.model';
 
 const CURRENT_YEAR = new Date().getFullYear().toString().slice(2, 4);
 
-interface UtforandeVerksamhet {
-  id: number;
-  name: string;
-  allaAdresser: boolean;
-  adresser?: Adress[];
-}
-
-interface Adress {
-  id: number;
-  name: string;
-}
-
 export interface EmployeeCompact {
   id: string;
   fullName: string;
@@ -33,13 +25,9 @@ export interface Employee {
   email: string;
   ssn: string;
   roles: RoleEnum[];
-  tjanster: Tjanst[];
+  tjanster: EmployeeTjanst[];
   allaUtforandeVerksamheter: boolean;
-  utforandeVerksamheter: UtforandeVerksamhet[];
-
-  tjanstCodes: string[];
-  utforandeVerksamhetIds: number[];
-  utforandeAdressIds: number[];
+  utforandeVerksamheter: EmployeeUtforandeVerksamhet[];
 }
 
 export interface EmployeesData {
@@ -81,9 +69,6 @@ export function mapResponseToEmployee(data: EmployeeResponse): Employee {
     tjanster,
     allaUtforandeVerksamheter,
     utforandeVerksamheter,
-    tjansteKoder,
-    utforandeVerksamhetIds,
-    adressIds,
   } = data;
   return {
     id: ciamUserId,
@@ -93,11 +78,10 @@ export function mapResponseToEmployee(data: EmployeeResponse): Employee {
     email,
     ssn: ssn ? mapResponseToSsn(ssn) : null,
     roles: roles || [],
-    tjanster: tjanster?.map(tjanst => mapResponseToTjanst(tjanst)),
+    tjanster: tjanster?.map(tjanst => mapResponseToEmployeeTjanst(tjanst)),
     allaUtforandeVerksamheter,
-    utforandeVerksamheter,
-    tjanstCodes: tjansteKoder || [],
-    utforandeVerksamhetIds: utforandeVerksamhetIds || [],
-    utforandeAdressIds: adressIds || [],
+    utforandeVerksamheter: utforandeVerksamheter.map(utforandeVerksamhet =>
+      mapResponseToEmployeeUtforandeVerksamhet(utforandeVerksamhet)
+    ),
   };
 }

apps/mina-sidor-fa/src/app/shared/models/form-tag.model.ts

@@ -1,12 +1,11 @@
-import { Tjanst } from "./tjanst.model";
+import { Tjanst } from './tjanst.model';
 
 export interface FormTagData {
-    tjanstekod: string,
-    name: string;
+  tjanstekod: string;
+  name: string;
 }
 
-
 export function mapTjanstToFormTag(tjanstData: Tjanst): FormTagData {
-    const { name, code } = tjanstData;
-    return { tjanstekod: code, name}
-}
+  const { name, code } = tjanstData;
+  return { tjanstekod: code, name };
+}

apps/mina-sidor-fa/src/app/shared/models/utforande-adress.model.ts

@@ -0,0 +1,15 @@
+import { UtforandeAdressResponse } from './api/utforande-adress.response.model';
+
+export interface UtforandeAdress {
+  id: number;
+  name: string;
+}
+
+export function mapResponseToUtforandeAdress(data: UtforandeAdressResponse): UtforandeAdress {
+  const { id, namn } = data;
+
+  return {
+    id,
+    name: namn,
+  };
+}

apps/mina-sidor-fa/src/app/shared/models/utforande-verksamhet.model.ts

@@ -0,0 +1,18 @@
+import { UtforandeVerksamhetResponse } from './api/utforande-verksamhet.response.model';
+import { mapResponseToUtforandeAdress, UtforandeAdress } from './utforande-adress.model';
+
+export interface UtforandeVerksamhet {
+  id: number;
+  name: string;
+  adresser: UtforandeAdress[];
+}
+
+export function mapResponseToUtforandeVerksamhet(data: UtforandeVerksamhetResponse): UtforandeVerksamhet {
+  const { id, name, adresser } = data;
+
+  return {
+    id,
+    name,
+    adresser: adresser.map(adress => mapResponseToUtforandeAdress(adress)),
+  };
+}