From 218e3d6b36694e44b51c6419a0a031edb4aaa9de Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Wed, 18 Aug 2021 08:21:29 +0200
Subject: [PATCH] Fixed models and services to match deltagare response from
 api

---
 .../models/api/deltagare.response.model.ts    |  9 +++++---
 .../src/app/shared/models/deltagare.model.ts  | 21 +++++++++++--------
 .../shared/services/api/deltagare.service.ts  |  1 +
 mock-api/mina-sidor-fa/scripts/avrop.js       |  2 ++
 mock-api/mina-sidor-fa/server.js              | 11 ++++++++++
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/deltagare.response.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/deltagare.response.model.ts
index 68c318f..a06db41 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/api/deltagare.response.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/api/deltagare.response.model.ts
@@ -11,8 +11,11 @@ import { WorkLanguagesResponse } from './work-languages.response.model';
 
 export interface DeltagareCompactResponse {
   sokandeId: string;
-  deltagare: string;
-  kommun: string;
+  fornamn: string;
+  efternamn: string;
+  tjanst: string;
+  utforandeVerksamhet: string;
+  utforandeAdress: string;
 }
 
 export interface DeltagareResponse {
@@ -29,6 +32,6 @@ export interface DeltagareResponse {
 }
 
 export interface DeltagareCompactApiResponse {
-  data: AvropResponse[];
+  data: DeltagareCompactResponse[];
   meta: PaginationMeta;
 }
diff --git a/apps/mina-sidor-fa/src/app/shared/models/deltagare.model.ts b/apps/mina-sidor-fa/src/app/shared/models/deltagare.model.ts
index e677ef6..4c6cba9 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/deltagare.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/deltagare.model.ts
@@ -1,6 +1,5 @@
 import { Address } from './address.model';
-import { AvropResponse } from './api/avrop.response.model';
-import { DeltagareResponse } from './api/deltagare.response.model';
+import { DeltagareCompactResponse, DeltagareResponse } from './api/deltagare.response.model';
 import { Avrop, mapAvropResponseToAvrop } from './avrop.model';
 import { mapResponseToContactInformation } from './contact-information.model';
 import { Disability, mapResponseToDisability } from './disability.model';
@@ -13,10 +12,12 @@ import { mapResponseToWorkExperience, WorkExperience } from './work-experience.m
 
 export interface DeltagareCompact {
   id: string;
+  firstName: string;
+  lastName: string;
   fullName: string;
+  tjanst: string;
   utforandeVerksamhet: string;
   utforandeAdress: string;
-  tjanst: string;
 }
 
 export interface Deltagare {
@@ -43,14 +44,16 @@ export interface DeltagareCompactData {
   meta: PaginationMeta;
 }
 
-export function mapResponseToDeltagareCompact(data: AvropResponse): DeltagareCompact {
-  const { sokandeId, deltagare, adress, utforandeverksamhet, tjansteNamn } = data;
+export function mapResponseToDeltagareCompact(data: DeltagareCompactResponse): DeltagareCompact {
+  const { sokandeId, fornamn, efternamn, tjanst, utforandeVerksamhet, utforandeAdress } = data;
   return {
     id: sokandeId.toString(),
-    fullName: deltagare,
-    utforandeVerksamhet: utforandeverksamhet,
-    utforandeAdress: adress,
-    tjanst: tjansteNamn,
+    firstName: fornamn,
+    lastName: efternamn,
+    fullName: `${fornamn} ${efternamn}`,
+    tjanst,
+    utforandeVerksamhet,
+    utforandeAdress,
   };
 }
 
diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.service.ts
index 684600d..5f84957 100644
--- a/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.service.ts
+++ b/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.service.ts
@@ -93,6 +93,7 @@ export class DeltagareService extends UnsubscribeDirective {
       page: page.toString(),
     };
 
+    console.log(params);
     return this.httpClient
       .get<DeltagareCompactApiResponse>(this._apiBaseUrl, {
         ...API_HEADERS,
diff --git a/mock-api/mina-sidor-fa/scripts/avrop.js b/mock-api/mina-sidor-fa/scripts/avrop.js
index f65d988..1d48e8d 100644
--- a/mock-api/mina-sidor-fa/scripts/avrop.js
+++ b/mock-api/mina-sidor-fa/scripts/avrop.js
@@ -25,6 +25,8 @@ function generateAvrop(amount = 10, deltagare) {
 
     avrop.push({
       id: faker.datatype.uuid(),
+      fornamn: currentDeltagare.contact.fornamn,
+      efternamn: currentDeltagare.contact.efternamn,
       deltagare: `${currentDeltagare.contact.fornamn} ${currentDeltagare.contact.efternamn}`,
       genomforandeReferens: faker.datatype.number({ min: 100000000, max: 999999999 }),
       orgId: faker.datatype.uuid(),
diff --git a/mock-api/mina-sidor-fa/server.js b/mock-api/mina-sidor-fa/server.js
index bc0ea07..eab47fc 100644
--- a/mock-api/mina-sidor-fa/server.js
+++ b/mock-api/mina-sidor-fa/server.js
@@ -96,6 +96,17 @@ router.render = (req, res) => {
     }
   }
 
+  if (pathname === '/deltagare') {
+    data = data.map(({ sokandeId, fornamn, efternamn, tjansteNamn, utforandeverksamhet, adress }) => ({
+      sokandeId: sokandeId.toString(),
+      fornamn,
+      efternamn,
+      tjanst: tjansteNamn,
+      utforandeVerksamhet: utforandeverksamhet,
+      utforandeAdress: adress,
+    }));
+  }
+
   res.jsonp({
     data,
     ...appendMetaData(params, res),