14/View users page, add user page, edit user page

api/db/migrations/20231211050651_update_user_database_timestamps/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "User" ALTER COLUMN "createdAt" SET DATA TYPE TIMESTAMPTZ(6),
+ALTER COLUMN "updatedAt" SET DATA TYPE TIMESTAMPTZ(6);

api/db/migrations/20231212224549_update_organization_id_to_optional_for_user/migration.sql

@@ -0,0 +1,8 @@
+-- DropForeignKey
+ALTER TABLE "User" DROP CONSTRAINT "User_organizationId_fkey";
+
+-- AlterTable
+ALTER TABLE "User" ALTER COLUMN "organizationId" DROP NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "User" ADD CONSTRAINT "User_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE SET NULL ON UPDATE CASCADE;

api/db/schema.prisma

@@ -38,12 +38,12 @@ model User {
   email          String
   name           String?
   agencyId       Int?
-  organizationId Int
+  organizationId Int?
   roleId         Int?
-  createdAt      DateTime            @default(now())
-  updatedAt      DateTime
+  createdAt      DateTime            @default(now()) @db.Timestamptz(6)
+  updatedAt      DateTime            @updatedAt @db.Timestamptz(6)
   agency         Agency?             @relation(fields: [agencyId], references: [id])
-  organization   Organization        @relation(fields: [organizationId], references: [id])
+  organization   Organization?       @relation(fields: [organizationId], references: [id])
   role           Role?               @relation(fields: [roleId], references: [id])
   certified      ReportingPeriod[]
   uploaded       Upload[]

api/src/graphql/users.sdl.ts

@@ -12,26 +12,28 @@ export const schema = gql`
     organization: Organization!
     role: Role
     certified: [ReportingPeriod]!
+    uploaded: [Upload]!
+    validated: [UploadValidation]!
+    invalidated: [UploadValidation]!
   }
 
   type Query {
     users: [User!]! @requireAuth
+    usersByOrganization(organizationId: Int!): [User!]! @requireAuth
     user(id: Int!): User @requireAuth
   }
 
   input CreateUserInput {
     email: String!
     name: String
     agencyId: Int
-    organizationId: Int!
     roleId: Int
   }
 
   input UpdateUserInput {
     email: String
     name: String
     agencyId: Int
-    organizationId: Int
     roleId: Int
   }
 

api/src/services/users/users.scenarios.ts

@@ -7,14 +7,14 @@ export const standard = defineScenario<Prisma.UserCreateArgs>({
     one: {
       data: {
         email: 'String',
-        updatedAt: '2023-12-07T18:20:20.679Z',
+        updatedAt: '2023-12-10T00:37:26.049Z',
         organization: { create: { name: 'String' } },
       },
     },
     two: {
       data: {
         email: 'String',
-        updatedAt: '2023-12-07T18:20:20.679Z',
+        updatedAt: '2023-12-10T00:37:26.049Z',
         organization: { create: { name: 'String' } },
       },
     },

api/src/services/users/users.test.ts

@@ -27,13 +27,13 @@ describe('users', () => {
       input: {
         email: 'String',
         organizationId: scenario.user.two.organizationId,
-        updatedAt: '2023-12-07T18:20:20.664Z',
+        updatedAt: '2023-12-10T00:37:26.029Z',
       },
     })
 
     expect(result.email).toEqual('String')
     expect(result.organizationId).toEqual(scenario.user.two.organizationId)
-    expect(result.updatedAt).toEqual(new Date('2023-12-07T18:20:20.664Z'))
+    expect(result.updatedAt).toEqual(new Date('2023-12-10T00:37:26.029Z'))
   })
 
   scenario('updates a user', async (scenario: StandardScenario) => {

api/src/services/users/users.ts

@@ -35,6 +35,20 @@ export const deleteUser: MutationResolvers['deleteUser'] = ({ id }) => {
   })
 }
 
+export const usersByOrganization: QueryResolvers['usersByOrganization'] =
+  async ({ organizationId }) => {
+    try {
+      const users = await db.user.findMany({
+        where: { organizationId },
+      })
+      return users || [] // 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 User: UserRelationResolvers = {
   agency: (_obj, { root }) => {
     return db.user.findUnique({ where: { id: root?.id } }).agency()
@@ -48,4 +62,13 @@ export const User: UserRelationResolvers = {
   certified: (_obj, { root }) => {
     return db.user.findUnique({ where: { id: root?.id } }).certified()
   },
+  uploaded: (_obj, { root }) => {
+    return db.user.findUnique({ where: { id: root?.id } }).uploaded()
+  },
+  validated: (_obj, { root }) => {
+    return db.user.findUnique({ where: { id: root?.id } }).validated()
+  },
+  invalidated: (_obj, { root }) => {
+    return db.user.findUnique({ where: { id: root?.id } }).invalidated()
+  },
 }