From 0414fa17f03567c1c7472155d8e6fc3483d28d90 Mon Sep 17 00:00:00 2001 From: jonathangoulding Date: Thu, 30 Jan 2025 12:10:17 +0000 Subject: [PATCH] refactor: use updated model --- .../licences/view-licence-contact-details.presenter.js | 6 +++--- .../licences/fetch-licence-contact-details.service.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/presenters/licences/view-licence-contact-details.presenter.js b/app/presenters/licences/view-licence-contact-details.presenter.js index 8985c37815..ebe3823832 100644 --- a/app/presenters/licences/view-licence-contact-details.presenter.js +++ b/app/presenters/licences/view-licence-contact-details.presenter.js @@ -33,12 +33,12 @@ function go(licence) { function _licenceContactDetails(licenceDocumentHeader) { return [ ...filteredContactDetailsByRole(licenceDocumentHeader.metadata.contacts), - ..._licenceEntityRole(licenceDocumentHeader.licenceEntityRole) + ..._licenceEntityRoles(licenceDocumentHeader.licenceEntityRoles) ] } -function _licenceEntityRole(licenceEntityRole) { - return licenceEntityRole.map(_licenceEntity).sort(_sortLicenceEntity) +function _licenceEntityRoles(licenceEntityRoles) { + return licenceEntityRoles.map(_licenceEntity).sort(_sortLicenceEntity) } function _licenceEntity(entity) { diff --git a/app/services/licences/fetch-licence-contact-details.service.js b/app/services/licences/fetch-licence-contact-details.service.js index d21f8ec35c..a67eb58adc 100644 --- a/app/services/licences/fetch-licence-contact-details.service.js +++ b/app/services/licences/fetch-licence-contact-details.service.js @@ -29,12 +29,12 @@ async function _fetch(licenceId) { .modifyGraph('licenceDocumentHeader', (builder) => { builder.select(['id', 'metadata']) }) - .withGraphFetched('licenceDocumentHeader.licenceEntityRole') - .modifyGraph('licenceDocumentHeader.licenceEntityRole', (builder) => { + .withGraphFetched('licenceDocumentHeader.licenceEntityRoles') + .modifyGraph('licenceDocumentHeader.licenceEntityRoles', (builder) => { builder.select(['role']).whereIn('role', ['primary_user', 'user_returns']) }) - .withGraphFetched('licenceDocumentHeader.licenceEntityRole.licenceEntity') - .modifyGraph('licenceDocumentHeader.licenceEntityRole.licenceEntity', (builder) => { + .withGraphFetched('licenceDocumentHeader.licenceEntityRoles.licenceEntity') + .modifyGraph('licenceDocumentHeader.licenceEntityRoles.licenceEntity', (builder) => { builder.select(['name']) }) }