merge main

usdigitalresponse · Dec 15, 2023 · a63c97c · a63c97c
2 parents 27edbf8 + 5a2dde3
commit a63c97c
Show file tree

Hide file tree

Showing 39 changed files with 51,491 additions and 2,222 deletions.
diff --git a/api/src/services/agencies/agencies.scenarios.ts b/api/src/services/agencies/agencies.scenarios.ts
@@ -1,4 +1,5 @@
 import type { Prisma, agency } from '@prisma/client'
+
 import type { ScenarioData } from '@redwoodjs/testing/api'
 
 export const standard = defineScenario<Prisma.agencyCreateArgs>({

diff --git a/api/src/services/agencies/agencies.ts b/api/src/services/agencies/agencies.ts
@@ -34,17 +34,16 @@ export const deleteAgency: MutationResolvers['deleteAgency'] = ({ id }) => {
   })
 }
 
-export const agenciesByOrganization: QueryResolvers['agenciesByOrganization'] = async ({
-  organizationId,
-}) => {
-  try {
-    const agencies = await db.agency.findMany({
-      where: { organizationId },
-    })
-    return agencies || [] // Return an empty array if null is received
-  } catch (error) {
-    console.error(error)
-    // Handle the error appropriately; maybe log it and return an empty array
-    return []
+export const agenciesByOrganization: QueryResolvers['agenciesByOrganization'] =
+  async ({ organizationId }) => {
+    try {
+      const agencies = await db.agency.findMany({
+        where: { organizationId },
+      })
+      return agencies || [] // Return an empty array if null is received
+    } catch (error) {
+      console.error(error)
+      // Handle the error appropriately; maybe log it and return an empty array
+      return []
+    }
   }
-}
diff --git a/api/src/services/expenditureCategories/expenditureCategories.scenarios.ts b/api/src/services/expenditureCategories/expenditureCategories.scenarios.ts
@@ -1,4 +1,5 @@
 import type { Prisma, ExpenditureCategory } from '@prisma/client'
+
 import type { ScenarioData } from '@redwoodjs/testing/api'
 
 export const standard = defineScenario<Prisma.ExpenditureCategoryCreateArgs>({

diff --git a/api/src/services/inputTemplates/inputTemplates.scenarios.ts b/api/src/services/inputTemplates/inputTemplates.scenarios.ts
@@ -1,4 +1,5 @@
 import type { Prisma, InputTemplate } from '@prisma/client'
+
 import type { ScenarioData } from '@redwoodjs/testing/api'
 
 export const standard = defineScenario<Prisma.InputTemplateCreateArgs>({

diff --git a/api/src/services/organizations/organizations.scenarios.ts b/api/src/services/organizations/organizations.scenarios.ts
@@ -1,4 +1,5 @@
 import type { Prisma, Organization } from '@prisma/client'
+
 import type { ScenarioData } from '@redwoodjs/testing/api'
 
 export const standard = defineScenario<Prisma.OrganizationCreateArgs>({

diff --git a/api/src/services/outputTemplates/outputTemplates.scenarios.ts b/api/src/services/outputTemplates/outputTemplates.scenarios.ts
@@ -1,4 +1,5 @@
 import type { Prisma, OutputTemplate } from '@prisma/client'
+
 import type { ScenarioData } from '@redwoodjs/testing/api'
 
 export const standard = defineScenario<Prisma.OutputTemplateCreateArgs>({

diff --git a/api/src/services/projects/projects.scenarios.ts b/api/src/services/projects/projects.scenarios.ts
@@ -1,4 +1,5 @@
 import type { Prisma, Project } from '@prisma/client'
+
 import type { ScenarioData } from '@redwoodjs/testing/api'
 
 export const standard = defineScenario<Prisma.ProjectCreateArgs>({

diff --git a/api/src/services/reportingPeriods/reportingPeriods.scenarios.ts b/api/src/services/reportingPeriods/reportingPeriods.scenarios.ts
@@ -1,4 +1,5 @@
 import type { Prisma, ReportingPeriod } from '@prisma/client'
+
 import type { ScenarioData } from '@redwoodjs/testing/api'
 
 export const standard = defineScenario<Prisma.ReportingPeriodCreateArgs>({

diff --git a/api/src/services/roles/roles.scenarios.ts b/api/src/services/roles/roles.scenarios.ts
@@ -1,4 +1,5 @@
 import type { Prisma, Role } from '@prisma/client'
+
 import type { ScenarioData } from '@redwoodjs/testing/api'
 
 export const standard = defineScenario<Prisma.RoleCreateArgs>({

diff --git a/api/src/services/uploadValidations/uploadValidations.test.ts b/api/src/services/uploadValidations/uploadValidations.test.ts
diff --git a/api/src/services/uploads/uploads.scenarios.ts b/api/src/services/uploads/uploads.scenarios.ts
@@ -7,11 +7,11 @@ export const standard = defineScenario<Prisma.UploadCreateArgs>({
     one: {
       data: {
         filename: 'String',
-        updatedAt: '2023-12-08T21:03:09.638Z',
+        updatedAt: '2023-12-10T04:48:04.896Z',
         uploadedBy: {
           create: {
             email: 'String',
-            updatedAt: '2023-12-08T21:03:09.638Z',
+            updatedAt: '2023-12-10T04:48:04.896Z',
             organization: { create: { name: 'String' } },
           },
         },
@@ -20,23 +20,23 @@ export const standard = defineScenario<Prisma.UploadCreateArgs>({
         reportingPeriod: {
           create: {
             name: 'String',
-            startDate: '2023-12-08T21:03:09.638Z',
-            endDate: '2023-12-08T21:03:09.638Z',
-            updatedAt: '2023-12-08T21:03:09.638Z',
+            startDate: '2023-12-10T04:48:04.896Z',
+            endDate: '2023-12-10T04:48:04.896Z',
+            updatedAt: '2023-12-10T04:48:04.896Z',
             inputTemplate: {
               create: {
                 name: 'String',
                 version: 'String',
-                effectiveDate: '2023-12-08T21:03:09.638Z',
-                updatedAt: '2023-12-08T21:03:09.638Z',
+                effectiveDate: '2023-12-10T04:48:04.896Z',
+                updatedAt: '2023-12-10T04:48:04.896Z',
               },
             },
             outputTemplate: {
               create: {
                 name: 'String',
                 version: 'String',
-                effectiveDate: '2023-12-08T21:03:09.638Z',
-                updatedAt: '2023-12-08T21:03:09.638Z',
+                effectiveDate: '2023-12-10T04:48:04.896Z',
+                updatedAt: '2023-12-10T04:48:04.896Z',
               },
             },
           },
@@ -45,19 +45,19 @@ export const standard = defineScenario<Prisma.UploadCreateArgs>({
           create: {
             name: 'String',
             code: 'String',
-            updatedAt: '2023-12-08T21:03:09.638Z',
+            updatedAt: '2023-12-10T04:48:04.896Z',
           },
         },
       },
     },
     two: {
       data: {
         filename: 'String',
-        updatedAt: '2023-12-08T21:03:09.638Z',
+        updatedAt: '2023-12-10T04:48:04.896Z',
         uploadedBy: {
           create: {
             email: 'String',
-            updatedAt: '2023-12-08T21:03:09.638Z',
+            updatedAt: '2023-12-10T04:48:04.896Z',
             organization: { create: { name: 'String' } },
           },
         },
@@ -66,23 +66,23 @@ export const standard = defineScenario<Prisma.UploadCreateArgs>({
         reportingPeriod: {
           create: {
             name: 'String',
-            startDate: '2023-12-08T21:03:09.638Z',
-            endDate: '2023-12-08T21:03:09.638Z',
-            updatedAt: '2023-12-08T21:03:09.638Z',
+            startDate: '2023-12-10T04:48:04.896Z',
+            endDate: '2023-12-10T04:48:04.896Z',
+            updatedAt: '2023-12-10T04:48:04.896Z',
             inputTemplate: {
               create: {
                 name: 'String',
                 version: 'String',
-                effectiveDate: '2023-12-08T21:03:09.638Z',
-                updatedAt: '2023-12-08T21:03:09.638Z',
+                effectiveDate: '2023-12-10T04:48:04.896Z',
+                updatedAt: '2023-12-10T04:48:04.896Z',
               },
             },
             outputTemplate: {
               create: {
                 name: 'String',
                 version: 'String',
-                effectiveDate: '2023-12-08T21:03:09.639Z',
-                updatedAt: '2023-12-08T21:03:09.639Z',
+                effectiveDate: '2023-12-10T04:48:04.896Z',
+                updatedAt: '2023-12-10T04:48:04.896Z',
               },
             },
           },
@@ -91,7 +91,7 @@ export const standard = defineScenario<Prisma.UploadCreateArgs>({
           create: {
             name: 'String',
             code: 'String',
-            updatedAt: '2023-12-08T21:03:09.639Z',
+            updatedAt: '2023-12-10T04:48:04.896Z',
           },
         },
       },

diff --git a/api/src/services/uploads/uploads.test.ts b/api/src/services/uploads/uploads.test.ts
@@ -37,7 +37,7 @@ describe('uploads', () => {
         organizationId: scenario.upload.two.organizationId,
         reportingPeriodId: scenario.upload.two.reportingPeriodId,
         expenditureCategoryId: scenario.upload.two.expenditureCategoryId,
-        updatedAt: '2023-12-08T21:03:09.551Z',
+        updatedAt: '2023-12-10T04:48:04.888Z',
       },
     })
 
@@ -51,7 +51,7 @@ describe('uploads', () => {
     expect(result.expenditureCategoryId).toEqual(
       scenario.upload.two.expenditureCategoryId
     )
-    expect(result.updatedAt).toEqual(new Date('2023-12-08T21:03:09.551Z'))
+    expect(result.updatedAt).toEqual(new Date('2023-12-10T04:48:04.888Z'))
   })
 
   scenario('updates a upload', async (scenario: StandardScenario) => {

diff --git a/api/src/services/users/users.scenarios.ts b/api/src/services/users/users.scenarios.ts
@@ -1,4 +1,5 @@
 import type { Prisma, User } from '@prisma/client'
+
 import type { ScenarioData } from '@redwoodjs/testing/api'
 
 export const standard = defineScenario<Prisma.UserCreateArgs>({