Import licence document for a licence #1392
Conversation
https://eaflood.atlassian.net/browse/WATER-4669 We need to replace the import service logic to import a licence from NALD. WRLS has the concept of a licence document. NALD does not. As part of the import process this licence document is created from the NALD licence. The start and end date use the licence and licence versions to calculate the earliest date for both. This change will replicate this logic. We will insert this imported data in the relevant public views.
…icence-document # Conflicts: # app/services/import/legacy/process-licence.service.js
There was a problem hiding this comment.
A couple of copy and paste typos.
The one change I'd make is not to overwrite the deletedAt date when we upsert. But that also raises the question of how does the import currently determine deletedAt?
Once we know that we can make a decision as to whether it should be included in this change or added separately.
test/services/import/legacy/transform-licence-document.service.test.js
Outdated
Show resolved
Hide resolved
test/services/import/persist/persist-licence-document.service.test.js
Outdated
Show resolved
Hide resolved
test/services/import/persist/persist-licence-document.service.test.js
Outdated
Show resolved
Hide resolved
| 'endDate', | ||
| 'startDate', | ||
| 'updatedAt', | ||
| 'deletedAt' |
There was a problem hiding this comment.
I'd have to dig into how deletedAt is determined (because I think that is set during the import as well).
But we shouldn't be overwriting this if it is already set.
There was a problem hiding this comment.
The import sets this to null on the insert in the original query.
I took this as something has changed in NALD and now the data is no longer 'deleted' ?
There was a problem hiding this comment.
I see what you mean now.
There was a problem hiding this comment.
-- auto-generated definition
create table documents
(
document_id uuid default gen_random_uuid() not null
primary key,
regime varchar default 'water'::character varying not null,
document_type varchar default 'abstraction_licence'::character varying not null,
document_ref varchar not null,
start_date date not null,
end_date date,
external_id varchar,
date_created timestamp default now() not null,
date_updated timestamp default now() not null,
is_test boolean default false not null,
date_deleted timestamp
);
I can remove 'deletedAt' from the upsert.
It will default to null if not set and not overide the existing logic.
There was a problem hiding this comment.
Change made and pushed to remove the deletedAt logic
Co-authored-by: Alan Cruikshanks <[email protected]>
Co-authored-by: Alan Cruikshanks <[email protected]>
Co-authored-by: Alan Cruikshanks <[email protected]>
There was a problem hiding this comment.
Answered my own question. deletedAt gets set by another job: src/modules/licence-import/jobs/delete-removed-documents.js.
It wouldn't apply in this case as it happens when a user deletes a licence from NALD (which they are not supposed to do but is possible).
So, not applicable to this change or our current import process.
https://eaflood.atlassian.net/browse/WATER-4669
We need to replace the import service logic to import a licence from NALD.
WRLS has the concept of a licence document. NALD does not.
As part of the import process this licence document is created from the NALD licence. The start and end date use the licence and licence versions to calculate the earliest date for both.
This change will replicate this logic.
We will insert this imported data in the relevant public views.