From 23db338ea676b2e5fb298367484b472558ed1fa3 Mon Sep 17 00:00:00 2001 From: Alan Cruikshanks Date: Wed, 2 Oct 2024 17:42:52 +0100 Subject: [PATCH] Amend licence version purpose point query --- src/modules/points/jobs/licences.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/modules/points/jobs/licences.js b/src/modules/points/jobs/licences.js index 4c200e2f..d588d5bd 100644 --- a/src/modules/points/jobs/licences.js +++ b/src/modules/points/jobs/licences.js @@ -41,21 +41,27 @@ function _query () { INSERT INTO water.licence_version_purpose_points ( licence_version_purpose_id, external_id, - point_id + point_id, + abstraction_method ) SELECT lvp.licence_version_purpose_id, (concat_ws(':', napp."FGAC_REGION_CODE", napp."AABP_ID", napp."AAIP_ID")) AS external_id, - p.id AS point_id + p.id AS point_id, + nmoa."DESCR" AS abstraction_method FROM "import"."NALD_ABS_PURP_POINTS" napp INNER JOIN water.licence_version_purposes lvp ON napp."FGAC_REGION_CODE" = split_part(lvp.external_id, ':', 1) AND napp."AABP_ID" = split_part(lvp.external_id, ':', 2) INNER JOIN water.points p ON napp."FGAC_REGION_CODE"=split_part(p.external_id, ':',1) AND napp."AAIP_ID"=split_part(p.external_id, ':',2) - ON CONFLICT(external_id) DO - UPDATE SET - point_id = excluded.point_id; + LEFT JOIN "import"."NALD_MEANS_OF_ABS" nmoa + ON nmoa."CODE" = napp."AMOA_CODE" + ON CONFLICT(external_id) + DO UPDATE + SET + point_id = excluded.point_id, + abstraction_method = excluded.abstraction_method; ` }