fix: GEO-1098 datetime cleanups

backend/src/v1/services/admin-user-invites-service.ts

@@ -1,4 +1,4 @@
-import { convert, LocalDateTime, ZoneId } from '@js-joda/core';
+import { convert, ZonedDateTime, ZoneId } from '@js-joda/core';
 import { admin_user_onboarding } from '@prisma/client';
 import { config } from '../../config';
 import {
@@ -37,12 +37,12 @@ const createInvite = async (
     where: {
       email: email,
       is_onboarded: false,
-      expiry_date: { lte: convert(LocalDateTime.now(ZoneId.UTC)).toDate() },
+      expiry_date: { lte: convert(ZonedDateTime.now(ZoneId.UTC)).toDate() },
     },
   });
 
   const expiryDate = convert(
-    LocalDateTime.now(ZoneId.UTC).plusHours(
+    ZonedDateTime.now(ZoneId.UTC).plusHours(
       config.get('server:adminInvitationDurationInHours'),
     ),
   ).toDate();
@@ -93,7 +93,7 @@ const resendInvite = async (invitationId: string) => {
   );
 
   const expiryDate = convert(
-    LocalDateTime.now(ZoneId.UTC).plusHours(
+    ZonedDateTime.now(ZoneId.UTC).plusHours(
       config.get('server:adminInvitationDurationInHours'),
     ),
   ).toDate();

backend/src/v1/services/file-upload-service.spec.ts

@@ -7,13 +7,10 @@ import { SUBMISSION_ROW_COLUMNS } from './validate-service';
 import { createSampleRecord } from './validate-service.spec';
 const { mockRequest } = require('mock-req-res');
 
-const mockShouldPreventReportOverrides = jest.fn();
-
 jest.mock('./report-service', () => ({
   ...jest.requireActual('./report-service'),
   reportService: {
     ...jest.requireActual('./report-service').reportService,
-    shouldPreventReportOverrides: () => mockShouldPreventReportOverrides(),
   },
 }));
 
@@ -41,7 +38,7 @@ const mockValidSubmission = {
 
 jest.mock('./file-upload-service', () => {
   const actual = jest.requireActual('./file-upload-service');
-  const mocked = jest.genMockFromModule('./file-upload-service') as any;
+  const mocked = jest.createMockFromModule('./file-upload-service') as any;
 
   return {
     ...mocked,

backend/src/v1/services/report-service.spec.ts

@@ -190,7 +190,7 @@ describe('getReportAndCalculations', () => {
         prisma.pay_transparency_calculated_data.findMany,
       ).toHaveBeenCalledTimes(1);
       expect(reportAndCalculations.report).toEqual(mockReportInDB);
-      expect(Object.keys(reportAndCalculations.calculations).length).toEqual(
+      expect(Object.keys(reportAndCalculations.calculations)).toHaveLength(
         mockCalculatedDatasInDB.length,
       );
     });
@@ -438,7 +438,7 @@ describe('getReportPdf', () => {
     });
   });
   describe('when an invalid report id and/or bceidBusinessGuid are provided', () => {
-    it('throws an error ', async () => {
+    it('throws an error', async () => {
       const mockReq = {
         session: {
           correlationID: 'mockCorrelationId',
@@ -1014,7 +1014,7 @@ describe('getReportById', () => {
         mockReportId,
         mockBceidBusinessGuid,
       );
-      expect(ret).toEqual(null);
+      expect(ret).toBeNull();
     });
   });
   describe('when an invalid reportId is passed, and bceidBusinessGuid is omitted', () => {
@@ -1023,7 +1023,7 @@ describe('getReportById', () => {
 
       mockReportFindFirst.mockResolvedValue(null);
       const ret = await reportService.getReportById(mockReportId);
-      expect(ret).toEqual(null);
+      expect(ret).toBeNull();
     });
   });
 });
@@ -1082,33 +1082,6 @@ describe('getReportFileName', () => {
   });
 });
 
-describe('shouldPreventReportOverride', () => {
-  describe('when a published report exists for the same date period', () => {
-    it('should prevent override if the report is older than 30 days', async () => {
-      mockCompanyFindFirst.mockReturnValue({ company_id: '' });
-      mockReportFindFirst.mockReturnValue({ report_id: '' });
-      const result = await reportService.shouldPreventReportOverrides(
-        LocalDate.now(),
-        LocalDate.now(),
-        '',
-      );
-      expect(result).toBeTruthy();
-    });
-  });
-  describe('when a published report does not exist for the same date period', () => {
-    it('should not prevent override', async () => {
-      mockCompanyFindFirst.mockReturnValue({ company_id: '' });
-      mockReportFindFirst.mockReturnValue(undefined);
-      const result = await reportService.shouldPreventReportOverrides(
-        LocalDate.now(),
-        LocalDate.now(),
-        '',
-      );
-      expect(result).toBeFalsy();
-    });
-  });
-});
-
 describe('deleteReports', () => {
   it('should delete reports', async () => {
     const company_name = '1234567890';

backend/src/v1/services/report-service.ts

@@ -15,7 +15,6 @@ import {
 } from '../../constants';
 import { logger } from '../../logger';
 import prisma from '../prisma/prisma-client';
-import { REPORT_STATUS } from './file-upload-service';
 import { CALCULATION_CODES, CalculatedAmount } from './report-calc-service';
 import { utils } from './utils-service';
 
@@ -1493,40 +1492,6 @@ const reportService = {
       throw new Error(`No such report with reportId=${reportId}`);
     }
   },
-
-  async shouldPreventReportOverrides(
-    startDate: LocalDate,
-    endDate: LocalDate,
-    bceidBusinessGuid: string,
-  ) {
-    const company = await prisma.pay_transparency_company.findFirst({
-      where: {
-        bceid_business_guid: bceidBusinessGuid,
-      },
-    });
-
-    const report = await prisma.pay_transparency_report.findFirst({
-      where: {
-        company_id: company.company_id,
-        report_status: REPORT_STATUS.PUBLISHED,
-        report_start_date: convert(startDate).toDate(),
-        report_end_date: convert(endDate).toDate(),
-        create_date: {
-          lt: convert(
-            LocalDate.now().minusDays(
-              config.get('server:reportEditDurationInDays'),
-            ),
-          ).toDate(),
-        },
-      },
-    });
-
-    if (report) {
-      return true;
-    }
-
-    return false;
-  },
 };
 
 export {