diff --git a/apps/mina-sidor-fa/src/app/shared/models/contact-information.model.ts b/apps/mina-sidor-fa/src/app/shared/models/contact-information.model.ts index e650031..8933a65 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/contact-information.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/contact-information.model.ts @@ -15,13 +15,18 @@ export interface ContactInformation { export function mapResponseToContactInformation(data: ContactInformationResponse): ContactInformation { const { fornamn, efternamn, personnummer, epost, telekomadresser, adresser } = data; + return { firstName: fornamn || '', lastName: efternamn || '', fullName: fornamn && efternamn ? `${fornamn} ${efternamn}` : '', ssn: personnummer ? mapStringToSsn(personnummer) : '', email: epost || '', - phoneNumbers: telekomadresser ? telekomadresser.map(phoneNumber => mapResponseToPhoneNumber(phoneNumber)) : [], + phoneNumbers: telekomadresser + ? telekomadresser + .filter(phoneNumber => phoneNumber.landskod && phoneNumber.nummer_utan_inledande_nolla) + .map(phoneNumber => mapResponseToPhoneNumber(phoneNumber)) + : [], addresses: adresser ? adresser.map(address => mapResponseToAddress(address)) : null, }; } diff --git a/mock-api/mina-sidor-fa/scripts/avrop.js b/mock-api/mina-sidor-fa/scripts/avrop.js index d0c0c21..62ca1ef 100644 --- a/mock-api/mina-sidor-fa/scripts/avrop.js +++ b/mock-api/mina-sidor-fa/scripts/avrop.js @@ -32,7 +32,7 @@ function generateAvrop(amount = 10, deltagare, handledare) { fornamn: currentDeltagare.contact.fornamn, efternamn: currentDeltagare.contact.efternamn, deltagare: `${currentDeltagare.contact.fornamn} ${currentDeltagare.contact.efternamn}`, - genomforandeReferens: faker.datatype.number({ min: 100000000, max: 999999999 }), + genomforandeReferens: currentDeltagare.genomforandeReferens, orgId: faker.datatype.uuid(), leverantorId: faker.datatype.number({ min: 1000, max: 99999 }), organisationsnummer: organization.organizationNumber, diff --git a/mock-api/mina-sidor-fa/scripts/deltagare.js b/mock-api/mina-sidor-fa/scripts/deltagare.js index bd2c14e..72531cf 100644 --- a/mock-api/mina-sidor-fa/scripts/deltagare.js +++ b/mock-api/mina-sidor-fa/scripts/deltagare.js @@ -44,9 +44,12 @@ function generateDeltagare(amount = 10) { const educationLevel = EDUCATION_LEVELS[Math.floor(Math.random() * EDUCATION_LEVELS.length)]; const sunKod = SUN_KODER[Math.floor(Math.random() * SUN_KODER.length)]; + const genomforandeReferens = faker.datatype.number({ min: 100000000, max: 999999999 }); + const deltagare = { - id, + id: genomforandeReferens, sokandeId: id, + genomforandeReferens, contact: { fornamn, efternamn, diff --git a/mock-api/mina-sidor-fa/server.js b/mock-api/mina-sidor-fa/server.js index 9fe0d49..b6d804e 100644 --- a/mock-api/mina-sidor-fa/server.js +++ b/mock-api/mina-sidor-fa/server.js @@ -147,7 +147,7 @@ router.render = (req, res) => { startdatumAvrop, slutdatumAvrop, hasAvbrott, - genomforandeReferens, + genomforandeReferens: genomforandeReferens.toString(), }) ); }