Merge pull request #85 from lblod/ben/lmb-1288-end-of-day-end-date-ma…

…ndatarissen LMB-1288 make end dates of mandatarissen end of day end dates
lblod · Jan 28, 2025 · 848f90a · 848f90a
2 parents 728031f + bfb0a02
commit 848f90a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/controllers/linked-mandataris.ts b/controllers/linked-mandataris.ts
@@ -36,6 +36,7 @@ import {
   VOORZITTER_RMW_CODE,
   VOORZITTER_VB_FUNCTIE_CODE,
 } from '../util/constants';
+import { endOfDay } from '../util/date-manipulation';
 
 export const checkLinkedMandataris = async (req) => {
   const mandatarisId = req.params.id;
@@ -274,8 +275,7 @@ export const changeStateLinkedMandataris = async (req) => {
   await linkInstances(newMandatarisId, newLinkedMandataris.id);
 
   // End original linked mandatee
-  const endDate = new Date();
-  endExistingMandataris(destinationGraph, linkedMandataris.uri, endDate);
+  endExistingMandataris(destinationGraph, linkedMandataris.uri, endOfDay());
 };
 
 const preliminaryChecksLinkedMandataris = async (req) => {

diff --git a/controllers/mandataris.ts b/controllers/mandataris.ts
@@ -14,6 +14,8 @@ import { createRangorde } from '../util/rangorde';
 import { v4 as uuidv4 } from 'uuid';
 import { areIdsValid, isValidId, RDF_TYPE } from '../util/valid-id';
 
+import { endOfDay } from '../util/date-manipulation';
+
 export const mandatarisUsecase = {
   getMandatarisFracties,
   updateCurrentFractie,
@@ -231,7 +233,7 @@ async function setEndDateOfActiveMandatarissen(
   const activeMandatarisUris =
     await mandataris.getActiveMandatarissenForPerson(id);
 
-  await mandataris.bulkUpdateEndDate(activeMandatarisUris, new Date());
+  await mandataris.bulkUpdateEndDate(activeMandatarisUris, endOfDay());
   await saveBulkHistoryItem(
     activeMandatarisUris,
     userId,

diff --git a/data-access/burgemeester.ts b/data-access/burgemeester.ts
@@ -11,6 +11,7 @@ import {
   copyFromPreviousMandataris,
   endExistingMandataris,
 } from './mandataris';
+import { endOfDay } from '../util/date-manipulation';
 
 export async function isBestuurseenheidDistrict(
   bestuurseenheidUri: string,
@@ -132,7 +133,12 @@ export const markCurrentBurgemeesterAsRejected = async (
     );
   }
 
-  await endExistingMandataris(orgGraph, existingMandatarisUri, date, benoeming);
+  await endExistingMandataris(
+    orgGraph,
+    existingMandatarisUri,
+    endOfDay(date),
+    benoeming,
+  );
 
   // TODO: check use case if mandataris is waarnemend -> should something happen to the verhindering?
 
@@ -205,7 +211,7 @@ export const benoemBurgemeester = async (
     await endExistingMandataris(
       orgGraph,
       existingMandataris,
-      date,
+      endOfDay(date),
       benoemingUri,
     );
   } else {

diff --git a/data-access/mandataris-download.ts b/data-access/mandataris-download.ts
@@ -46,7 +46,7 @@ async function getUrisForFilters(filters) {
       FILTER (
         ?safeEinde <= ?safeEindeBestuursorgaan &&
         ?safeEinde >= ?startBestuursorgaan &&
-        ?safeEinde >= ${escapedTodaysDate}
+        ?safeEinde > ${escapedTodaysDate}
       )
     `;
   }

diff --git a/data-access/mandataris.ts b/data-access/mandataris.ts
@@ -894,7 +894,7 @@ async function getActiveMandatarissenForPerson(persoonId: string) {
       }
       FILTER (
           ${escaped.dateNow} >= xsd:dateTime(?startDate) &&
-          ${escaped.dateNow} <= ?safeEnd
+          ${escaped.dateNow} < ?safeEnd
       )
       BIND(IF(BOUND(?endDate), ?endDate,  ${escaped.dateNow}) as ?safeEnd )
     }

diff --git a/util/date-manipulation.ts b/util/date-manipulation.ts
@@ -0,0 +1,9 @@
+import moment from 'moment';
+
+export function endOfDay(date?: Date) {
+  if (date) {
+    return moment(date).add(1, 'days').startOf('day').toDate();
+  } else {
+    return moment().add(1, 'days').startOf('day').toDate();
+  }
+}