feature/CPF-34 merge main, enable Users tab

usdigitalresponse · Dec 18, 2023 · c30d7a0 · c30d7a0
2 parents df6310f + d26a07b
commit c30d7a0
Show file tree

Hide file tree

Showing 28 changed files with 1,292 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -144,3 +144,5 @@ dist
 # Terraform cache
 terraform/.terraform
 .tool-versions
+
+localstack/volume
diff --git a/api/db/migrations/20231211050651_update_user_database_timestamps/migration.sql b/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);
diff --git a/api/db/migrations/20231212224549_update_organization_id_to_optional_for_user/migration.sql b/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;
diff --git a/api/db/schema.prisma b/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[]

diff --git a/api/package.json b/api/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.472.0",
+    "@aws-sdk/client-ses": "^3.470.0",
+    "@aws-sdk/client-sqs": "^3.470.0",
     "@aws-sdk/client-ssm": "^3.462.0",
     "@aws-sdk/rds-signer": "^3.462.0",
+    "@aws-sdk/s3-request-presigner": "^3.472.0",
     "@opentelemetry/instrumentation": "^0.45.1",
     "@prisma/instrumentation": "^5.7.0",
     "@redwoodjs/api": "6.4.2",

diff --git a/api/src/graphql/users.sdl.ts b/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
   }
 

diff --git a/api/src/lib/aws.ts b/api/src/lib/aws.ts
@@ -0,0 +1,106 @@
+import {
+  GetObjectCommand,
+  PutObjectCommand,
+  PutObjectCommandInput,
+  S3Client,
+} from '@aws-sdk/client-s3'
+import {ReceiveMessageCommand, SendMessageCommand, SQSClient} from '@aws-sdk/client-sqs'
+import {getSignedUrl as awsGetSignedUrl} from '@aws-sdk/s3-request-presigner'
+
+function getS3Client() {
+  let s3: S3Client;
+  if (process.env.LOCALSTACK_HOSTNAME) {
+    /*
+        1. Make sure the local environment has awslocal installed.
+        2. Use the commands to create a bucket to test with.
+            - awslocal s3api create-bucket --bucket arpa-audit-reports --region us-west-2 --create-bucket-configuration '{"LocationConstraint": "us-west-2"}'
+        3. Access bucket resource metadata through the following URL.
+            - awslocal s3api list-buckets
+            - awslocal s3api list-objects --bucket arpa-audit-reports
+    */
+    console.log('------------ USING LOCALSTACK ------------');
+    const endpoint = `http://${process.env.LOCALSTACK_HOSTNAME}:${process.env.EDGE_PORT || 4566}`;
+    console.log(`endpoint: ${endpoint}`);
+    s3 = new S3Client({
+      endpoint,
+      forcePathStyle: true,
+      region: process.env.AWS_DEFAULT_REGION,
+    });
+  } else {
+    s3 = new S3Client();
+  }
+  return s3;
+}
+
+async function sendPutObjectToS3Bucket(bucketName: string, key: string, body: any) {
+  const s3 = getS3Client();
+  const uploadParams : PutObjectCommandInput = {
+    Bucket: bucketName,
+    Key: key,
+    Body: body,
+    ServerSideEncryption: 'AES256',
+  };
+  await s3.send(new PutObjectCommand(uploadParams));
+}
+
+async function sendHeadObjectToS3Bucket(bucketName: string, key: string) {
+  const s3 = getS3Client();
+  const uploadParams : PutObjectCommandInput = {
+    Bucket: bucketName,
+    Key: key,
+  };
+  await s3.send(new PutObjectCommand(uploadParams));
+}
+
+/**
+ *  This function is a wrapper around the getSignedUrl function from the @aws-sdk/s3-request-presigner package.
+ *  Exists to organize the imports and to make it easier to mock in tests.
+ */
+async function getSignedUrl(bucketName: string, key: string) {
+  const s3 = getS3Client();
+  const baseParams = { Bucket: bucketName, Key: key };
+  return awsGetSignedUrl(s3, new GetObjectCommand(baseParams), { expiresIn: 60 });
+}
+
+function getSQSClient() {
+  let sqs: SQSClient;
+  if (process.env.LOCALSTACK_HOSTNAME) {
+    console.log('------------ USING LOCALSTACK FOR SQS ------------');
+    const endpoint = `http://${process.env.LOCALSTACK_HOSTNAME}:${process.env.EDGE_PORT || 4566}`;
+    sqs = new SQSClient({ endpoint, region: process.env.AWS_DEFAULT_REGION });
+  } else {
+    sqs = new SQSClient();
+  }
+  return sqs;
+}
+
+async function sendSqsMessage(queueUrl: string, messageBody: any) {
+  const sqs = getSQSClient();
+  await sqs.send(new SendMessageCommand({
+    QueueUrl: queueUrl,
+    MessageBody: JSON.stringify(messageBody),
+  }));
+}
+
+async function receiveSqsMessage(queueUrl: string) {
+  const sqs = getSQSClient();
+  // const receiveResp = await sqs.send(new ReceiveMessageCommand({
+  //   QueueUrl: process.env.TASK_QUEUE_URL, WaitTimeSeconds: 20, MaxNumberOfMessages: 1,
+  // }));
+
+  // const receiveResp = await sqs.send(new ReceiveMessageCommand({
+  //   QueueUrl: process.env.TASK_QUEUE_URL, WaitTimeSeconds: 20, MaxNumberOfMessages: 1,
+  // }));
+
+  await sqs.send(new ReceiveMessageCommand({
+    QueueUrl: queueUrl, WaitTimeSeconds: 20, MaxNumberOfMessages: 1,
+  }));
+}
+
+export default {
+  sendPutObjectToS3Bucket,
+  sendHeadObjectToS3Bucket,
+  getSignedUrl,
+  sendSqsMessage,
+  receiveSqsMessage,
+};
diff --git a/api/src/services/users/users.scenarios.ts b/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' } },
       },
     },

diff --git a/api/src/services/users/users.test.ts b/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) => {

diff --git a/api/src/services/users/users.ts b/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()
+  },
 }
diff --git a/api/types/graphql.d.ts b/api/types/graphql.d.ts
@@ -136,7 +136,6 @@ export type CreateUserInput = {
   agencyId?: InputMaybe<Scalars['Int']>;
   email: Scalars['String'];
   name?: InputMaybe<Scalars['String']>;
-  organizationId: Scalars['Int'];
   roleId?: InputMaybe<Scalars['Int']>;
 };
 
@@ -460,6 +459,7 @@ export type Query = {
   uploads: Array<Upload>;
   user?: Maybe<User>;
   users: Array<User>;
+  usersByOrganization: Array<User>;
 };
 
 
@@ -540,6 +540,12 @@ export type QueryuserArgs = {
   id: Scalars['Int'];
 };
 
+
+/** About the Redwood queries. */
+export type QueryusersByOrganizationArgs = {
+  organizationId: Scalars['Int'];
+};
+
 /**
  * The RedwoodJS Root Schema
  *
@@ -689,7 +695,6 @@ export type UpdateUserInput = {
   agencyId?: InputMaybe<Scalars['Int']>;
   email?: InputMaybe<Scalars['String']>;
   name?: InputMaybe<Scalars['String']>;
-  organizationId?: InputMaybe<Scalars['Int']>;
   roleId?: InputMaybe<Scalars['Int']>;
 };
 
@@ -743,12 +748,15 @@ export type User = {
   createdAt: Scalars['DateTime'];
   email: Scalars['String'];
   id: Scalars['Int'];
+  invalidated: Array<Maybe<UploadValidation>>;
   name?: Maybe<Scalars['String']>;
   organization: Organization;
   organizationId: Scalars['Int'];
   role?: Maybe<Role>;
   roleId?: Maybe<Scalars['Int']>;
   updatedAt: Scalars['DateTime'];
+  uploaded: Array<Maybe<Upload>>;
+  validated: Array<Maybe<UploadValidation>>;
 };
 
 type MaybeOrArrayOfMaybe<T> = T | Maybe<T> | Maybe<T>[];
@@ -1184,6 +1192,7 @@ export type QueryResolvers<ContextType = RedwoodGraphQLContext, ParentType exten
   uploads: OptArgsResolverFn<Array<ResolversTypes['Upload']>, ParentType, ContextType>;
   user: Resolver<Maybe<ResolversTypes['User']>, ParentType, ContextType, RequireFields<QueryuserArgs, 'id'>>;
   users: OptArgsResolverFn<Array<ResolversTypes['User']>, ParentType, ContextType>;
+  usersByOrganization: Resolver<Array<ResolversTypes['User']>, ParentType, ContextType, RequireFields<QueryusersByOrganizationArgs, 'organizationId'>>;
 };
 
 export type QueryRelationResolvers<ContextType = RedwoodGraphQLContext, ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']> = {
@@ -1213,6 +1222,7 @@ export type QueryRelationResolvers<ContextType = RedwoodGraphQLContext, ParentTy
   uploads?: RequiredResolverFn<Array<ResolversTypes['Upload']>, ParentType, ContextType>;
   user?: RequiredResolverFn<Maybe<ResolversTypes['User']>, ParentType, ContextType, RequireFields<QueryuserArgs, 'id'>>;
   users?: RequiredResolverFn<Array<ResolversTypes['User']>, ParentType, ContextType>;
+  usersByOrganization?: RequiredResolverFn<Array<ResolversTypes['User']>, ParentType, ContextType, RequireFields<QueryusersByOrganizationArgs, 'organizationId'>>;
 };
 
 export type RedwoodResolvers<ContextType = RedwoodGraphQLContext, ParentType extends ResolversParentTypes['Redwood'] = ResolversParentTypes['Redwood']> = {
@@ -1412,12 +1422,15 @@ export type UserResolvers<ContextType = RedwoodGraphQLContext, ParentType extend
   createdAt: OptArgsResolverFn<ResolversTypes['DateTime'], ParentType, ContextType>;
   email: OptArgsResolverFn<ResolversTypes['String'], ParentType, ContextType>;
   id: OptArgsResolverFn<ResolversTypes['Int'], ParentType, ContextType>;
+  invalidated: OptArgsResolverFn<Array<Maybe<ResolversTypes['UploadValidation']>>, ParentType, ContextType>;
   name: OptArgsResolverFn<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   organization: OptArgsResolverFn<ResolversTypes['Organization'], ParentType, ContextType>;
   organizationId: OptArgsResolverFn<ResolversTypes['Int'], ParentType, ContextType>;
   role: OptArgsResolverFn<Maybe<ResolversTypes['Role']>, ParentType, ContextType>;
   roleId: OptArgsResolverFn<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
   updatedAt: OptArgsResolverFn<ResolversTypes['DateTime'], ParentType, ContextType>;
+  uploaded: OptArgsResolverFn<Array<Maybe<ResolversTypes['Upload']>>, ParentType, ContextType>;
+  validated: OptArgsResolverFn<Array<Maybe<ResolversTypes['UploadValidation']>>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
@@ -1428,12 +1441,15 @@ export type UserRelationResolvers<ContextType = RedwoodGraphQLContext, ParentTyp
   createdAt?: RequiredResolverFn<ResolversTypes['DateTime'], ParentType, ContextType>;
   email?: RequiredResolverFn<ResolversTypes['String'], ParentType, ContextType>;
   id?: RequiredResolverFn<ResolversTypes['Int'], ParentType, ContextType>;
+  invalidated?: RequiredResolverFn<Array<Maybe<ResolversTypes['UploadValidation']>>, ParentType, ContextType>;
   name?: RequiredResolverFn<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   organization?: RequiredResolverFn<ResolversTypes['Organization'], ParentType, ContextType>;
   organizationId?: RequiredResolverFn<ResolversTypes['Int'], ParentType, ContextType>;
   role?: RequiredResolverFn<Maybe<ResolversTypes['Role']>, ParentType, ContextType>;
   roleId?: RequiredResolverFn<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
   updatedAt?: RequiredResolverFn<ResolversTypes['DateTime'], ParentType, ContextType>;
+  uploaded?: RequiredResolverFn<Array<Maybe<ResolversTypes['Upload']>>, ParentType, ContextType>;
+  validated?: RequiredResolverFn<Array<Maybe<ResolversTypes['UploadValidation']>>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 

diff --git a/localstack/docker-compose.yml b/localstack/docker-compose.yml
@@ -0,0 +1,17 @@
+version: "3.8"
+
+services:
+  localstack:
+    container_name: "cpf-reporter-localstack-main"
+    image: localstack/localstack
+    ports:
+      - "4566:4566"           # LocalStack Gateway
+      - "4510-4559:4510-4559"  # external services port range
+    environment:
+      - DEBUG=${DEBUG-}
+      - DOCKER_HOST=unix:///var/run/docker.sock
+      - AWS_DEFAULT_REGION=${AWS_REGION:-us-west-2}
+    volumes:
+      - "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "./entrypoint/init-aws.sh:/etc/localstack/init/ready.d/init-aws.sh"
diff --git a/localstack/entrypoint/init-aws.sh b/localstack/entrypoint/init-aws.sh
@@ -0,0 +1,16 @@
+#! /bin/bash
+
+export AWS_ACCESS_KEY_ID="test"
+export AWS_SECRET_ACCESS_KEY="test"
+
+VALID_EMAILS=(
+  "[email protected]"
+)
+
+for email in "${VALID_EMAILS[@]}"; do
+  awslocal ses verify-email-identity --email-address ${email}
+  echo "Verified ${email} to send with localstack SES"
+done
+
+awslocal s3api create-bucket --bucket cpf-reporter --region us-west-2 --create-bucket-configuration '{"LocationConstraint": "us-west-2"}'
+