Manual resolution of differences with master

techmatters · Feb 3, 2024 · 2bdc8c2 · 2bdc8c2
1 parent ee28331
commit 2bdc8c2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/hrm-domain/scheduled-tasks/hrm-data-pull/pull-cases.ts b/hrm-domain/scheduled-tasks/hrm-data-pull/pull-cases.ts
@@ -60,10 +60,9 @@ export const pullCases = async (startDate: Date, endDate: Date) => {
     /*
       Case type is slightly wrong. The instance object actually has:
       1) 'totalCount' property, which I think is wrong, so I'm deleting it
-      2) 'updatedAt' property is actually a Date instead of a string, so I'm explicitly converting it to Date
     */
     delete (cas as any).totalCount;
-    const date = format(cas.updatedAt as unknown as Date, 'yyyy/MM/dd');
+    const date = format(parseISO(cas.updatedAt), 'yyyy/MM/dd');
     const key = `hrm-data/${date}/cases/${cas.id}.json`;
     const body = JSON.stringify(cas);
     const params = { bucket, key, body };

diff --git a/hrm-domain/scheduled-tasks/hrm-data-pull/tests/unit/pull-cases.test.ts b/hrm-domain/scheduled-tasks/hrm-data-pull/tests/unit/pull-cases.test.ts
@@ -43,7 +43,7 @@ jest.mock('@tech-matters/s3-client', () => {
 });
 
 const getExpectedS3Params = (cas: caseApi.CaseService) => {
-  const date = format(cas.updatedAt as unknown as Date, 'yyyy/MM/dd');
+  const date = format(parseISO(cas.updatedAt), 'yyyy/MM/dd');
   return {
     bucket,
     key: `hrm-data/${date}/cases/${cas.id}.json`,
@@ -110,11 +110,13 @@ describe('KHP Data Pull - Pull Cases', () => {
       createdBy: 'Wkxxx',
       updatedBy: 'Wkxxx',
       accountSid,
-      createdAt: addDays(startDate, 1) as unknown as string, // The type defines this as string, but it's actually as Date
-      updatedAt: addDays(startDate, 1) as unknown as string,
+      createdAt: addDays(startDate, 1).toISOString(),
+      updatedAt: addDays(startDate, 1).toISOString(),
+      statusUpdatedAt: null,
+      statusUpdatedBy: null,
     };
 
-    const case2 = {
+    const case2: caseApi.CaseService = {
       id: 2345,
       categories: {},
       connectedContacts: [],
@@ -125,8 +127,10 @@ describe('KHP Data Pull - Pull Cases', () => {
       createdBy: 'Wkxxx',
       updatedBy: 'Wkxxx',
       accountSid,
-      createdAt: addDays(startDate, 2) as unknown as string,
-      updatedAt: addDays(startDate, 2) as unknown as string,
+      createdAt: addDays(startDate, 2).toISOString(),
+      updatedAt: addDays(startDate, 2).toISOString(),
+      statusUpdatedAt: null,
+      statusUpdatedBy: null,
     };
 
     const searchCasesResponse = Promise.resolve({