fix: GEO-1197 fix incorrect UTC dates (#882)

bcgov · Dec 12, 2024 · 4d77b47 · 4d77b47
1 parent ab39e1c
commit 4d77b47
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/backend/src/v1/services/announcements-service.spec.ts b/backend/src/v1/services/announcements-service.spec.ts
@@ -694,6 +694,7 @@ describe('AnnouncementsService', () => {
           linkDisplayName: faker.lorem.words(3),
           linkUrl: faker.internet.url(),
         };
+        const now = new Date();
         await announcementService.updateAnnouncement(
           'announcement-id',
           announcementInput,
@@ -738,6 +739,16 @@ describe('AnnouncementsService', () => {
             }),
           }),
         );
+
+        //Ensure the update date saved to the database is approximately now
+        //(within 5 seconds of now)
+        const updateObj = mockUpdate.mock.calls[0][0];
+        const updatedDate = updateObj.data.updated_date;
+        const expectedUpdateDate = now;
+        const updateDateDiffMs =
+          updatedDate.getTime() - expectedUpdateDate.getTime();
+        expect(updateDateDiffMs).toBeGreaterThanOrEqual(0);
+        expect(updateDateDiffMs).toBeLessThan(5000);
       });
     });
     describe('with existing attachment resource', () => {

diff --git a/backend/src/v1/services/announcements-service.ts b/backend/src/v1/services/announcements-service.ts
@@ -1,7 +1,6 @@
 import {
   convert,
   DateTimeFormatter,
-  LocalDateTime,
   ZonedDateTime,
   ZoneId,
 } from '@js-joda/core';
@@ -15,6 +14,7 @@ import {
 import { DefaultArgs } from '@prisma/client/runtime/library';
 import isEmpty from 'lodash/isEmpty';
 import { config } from '../../config';
+import { deleteFiles } from '../../external/services/s3-api';
 import { logger } from '../../logger';
 import prisma from '../prisma/prisma-client';
 import { PaginatedResult } from '../types';
@@ -26,7 +26,6 @@ import {
 } from '../types/announcements';
 import { UserInputError } from '../types/errors';
 import { utils } from './utils-service';
-import { deleteFiles } from '../../external/services/s3-api';
 
 const saveHistory = async (
   tx: Omit<
@@ -321,7 +320,7 @@ export const announcementService = {
     input: AnnouncementDataType,
     currentUserId: string,
   ) {
-    const updateDate = convert(LocalDateTime.now(ZoneId.UTC)).toDate();
+    const updateDate = convert(ZonedDateTime.now(ZoneId.UTC)).toDate();
     await prisma.$transaction(async (tx) => {
       const announcementData = await tx.announcement.findUniqueOrThrow({
         where: {