Merge remote-tracking branch 'origin' into feature/CPF-56-organizatio…

…n-creation-by-usdr-admins
usdigitalresponse · Dec 29, 2023 · 71ce4df · 71ce4df
2 parents 6dbffad + 1927dbe
commit 71ce4df
Show file tree

Hide file tree

Showing 35 changed files with 9,531 additions and 241 deletions.
diff --git a/api/db/migrations/20231217212515_relate_reporting_period_to_org/migration.sql b/api/db/migrations/20231217212515_relate_reporting_period_to_org/migration.sql
@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - Added the required column `organizationId` to the `ReportingPeriod` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "ReportingPeriod" ADD COLUMN     "organizationId" INTEGER NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "ReportingPeriod" ADD CONSTRAINT "ReportingPeriod_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/api/db/migrations/20231217214528_updated_at_defaults_to_now/migration.sql b/api/db/migrations/20231217214528_updated_at_defaults_to_now/migration.sql
@@ -0,0 +1,28 @@
+-- AlterTable
+ALTER TABLE "ExpenditureCategory" ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE "InputTemplate" ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE "OutputTemplate" ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE "Project" ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE "ReportingPeriod" ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE "Subrecipient" ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE "Upload" ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE "UploadValidation" ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE "User" ALTER COLUMN "createdAt" SET DATA TYPE TIMESTAMPTZ(6),
+ALTER COLUMN "updatedAt" SET DEFAULT CURRENT_TIMESTAMP,
+ALTER COLUMN "updatedAt" SET DATA TYPE TIMESTAMPTZ(6);
diff --git a/api/db/migrations/20231222193706_add_notes_on_upload/migration.sql b/api/db/migrations/20231222193706_add_notes_on_upload/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Upload" ADD COLUMN     "notes" TEXT;
diff --git a/api/db/schema.prisma b/api/db/schema.prisma
@@ -27,6 +27,7 @@ model Organization {
   agencies          Agency[]
   users             User[]
   name              String
+  reportingPeriods  ReportingPeriod[]
   uploads           Upload[]
   uploadValidations UploadValidation[]
   subrecipients     Subrecipient[]
@@ -41,7 +42,7 @@ model User {
   organizationId Int?
   roleId         Int?
   createdAt      DateTime            @default(now()) @db.Timestamptz(6)
-  updatedAt      DateTime            @updatedAt @db.Timestamptz(6)
+  updatedAt      DateTime            @default(now()) @db.Timestamptz(6)
   agency         Agency?             @relation(fields: [agencyId], references: [id])
   organization   Organization?       @relation(fields: [organizationId], references: [id])
   role           Role?               @relation(fields: [roleId], references: [id])
@@ -67,7 +68,7 @@ model InputTemplate {
   effectiveDate       DateTime           @db.Date
   rulesGeneratedAt    DateTime?          @db.Timestamptz(6)
   createdAt           DateTime           @default(now()) @db.Timestamptz(6)
-  updatedAt           DateTime           @db.Timestamptz(6)
+  updatedAt           DateTime           @default(now()) @db.Timestamptz(6)
   reportingPeriods    ReportingPeriod[]
   uploadValidations   UploadValidation[]
 }
@@ -79,7 +80,7 @@ model OutputTemplate {
   effectiveDate      DateTime          @db.Date
   rulesGeneratedAt   DateTime?         @db.Timestamptz(6)
   createdAt          DateTime          @default(now()) @db.Timestamptz(6)
-  updatedAt          DateTime          @db.Timestamptz(6)
+  updatedAt          DateTime          @default(now()) @db.Timestamptz(6)
   reportingPeriods   ReportingPeriod[]
 }
 
@@ -88,6 +89,8 @@ model ReportingPeriod {
   name             String
   startDate        DateTime       @db.Date
   endDate          DateTime       @db.Date
+  organizationId   Int
+  organization     Organization   @relation(fields: [organizationId], references: [id])
   certifiedAt      DateTime?      @db.Timestamptz(6)
   certifiedById    Int?
   certifiedBy      User?          @relation(fields: [certifiedById], references: [id], onDelete: NoAction, onUpdate: NoAction)
@@ -97,7 +100,7 @@ model ReportingPeriod {
   outputTemplate   OutputTemplate @relation(fields: [outputTemplateId], references: [id], onDelete: NoAction, onUpdate: NoAction)
   isCurrentPeriod  Boolean        @default(false)
   createdAt        DateTime       @default(now()) @db.Timestamptz(6)
-  updatedAt        DateTime       @db.Timestamptz(6)
+  updatedAt        DateTime       @default(now()) @db.Timestamptz(6)
   uploads          Upload[]
   projects         Project[]
 }
@@ -107,13 +110,14 @@ model ExpenditureCategory {
   name      String
   code      String
   createdAt DateTime @default(now()) @db.Timestamptz(6)
-  updatedAt DateTime @db.Timestamptz(6)
+  updatedAt DateTime @default(now()) @db.Timestamptz(6)
   Uploads   Upload[]
 }
 
 model Upload {
   id                    Int                 @id @default(autoincrement())
   filename              String
+  notes                 String?
   uploadedById          Int
   uploadedBy            User                @relation(fields: [uploadedById], references: [id])
   agencyId              Int
@@ -125,7 +129,7 @@ model Upload {
   expenditureCategoryId Int
   expenditureCategory   ExpenditureCategory @relation(fields: [expenditureCategoryId], references: [id])
   createdAt             DateTime            @default(now()) @db.Timestamptz(6)
-  updatedAt             DateTime            @db.Timestamptz(6)
+  updatedAt             DateTime            @default(now()) @db.Timestamptz(6)
   validations           UploadValidation[]
   subrecipients         Subrecipient[]
 }
@@ -149,7 +153,7 @@ model UploadValidation {
   invalidatedById     Int?
   invalidatedBy       User?         @relation("InvalidatedUploads", fields: [invalidatedById], references: [id])
   createdAt           DateTime      @default(now()) @db.Timestamptz(6)
-  updatedAt           DateTime      @db.Timestamptz(6)
+  updatedAt           DateTime      @default(now()) @db.Timestamptz(6)
 }
 
 model Subrecipient {
@@ -165,7 +169,7 @@ model Subrecipient {
   originationUploadId Int
   originationUpload   Upload       @relation(fields: [originationUploadId], references: [id])
   createdAt           DateTime     @default(now()) @db.Timestamptz(6)
-  updatedAt           DateTime     @db.Timestamptz(6)
+  updatedAt           DateTime     @default(now()) @db.Timestamptz(6)
 }
 
 model Project {
@@ -181,5 +185,5 @@ model Project {
   originationPeriodId Int
   originationPeriod   ReportingPeriod @relation(fields: [originationPeriodId], references: [id])
   createdAt           DateTime        @default(now()) @db.Timestamptz(6)
-  updatedAt           DateTime        @db.Timestamptz(6)
+  updatedAt           DateTime        @default(now()) @db.Timestamptz(6)
 }
diff --git a/api/package.json b/api/package.json
@@ -13,6 +13,7 @@
     "@prisma/instrumentation": "^5.7.0",
     "@redwoodjs/api": "6.4.2",
     "@redwoodjs/graphql-server": "6.4.2",
-    "dd-trace": "^4.20.0"
+    "dd-trace": "^4.20.0",
+    "exceljs": "^4.4.0"
   }
 }
diff --git a/api/src/graphql/reportingPeriods.sdl.ts b/api/src/graphql/reportingPeriods.sdl.ts
@@ -18,7 +18,13 @@ export const schema = gql`
 
   type Query {
     reportingPeriods: [ReportingPeriod!]! @requireAuth
+    reportingPeriodsByOrg(organizationId: Int!): [ReportingPeriod!]!
+      @requireAuth
     reportingPeriod(id: Int!): ReportingPeriod @requireAuth
+    previousReportingPeriods(
+      id: Int!
+      organizationId: Int!
+    ): [ReportingPeriod!]! @requireAuth
   }
 
   input CreateReportingPeriodInput {

diff --git a/api/src/graphql/uploads.sdl.ts b/api/src/graphql/uploads.sdl.ts
@@ -2,6 +2,7 @@ export const schema = gql`
   type Upload {
     id: Int!
     filename: String!
+    notes: String
     uploadedById: Int!
     uploadedBy: User!
     agencyId: Int!
@@ -15,6 +16,7 @@ export const schema = gql`
     createdAt: DateTime!
     updatedAt: DateTime!
     validations: [UploadValidation]!
+    signedUrl: String
   }
 
   type Query {
@@ -24,6 +26,7 @@ export const schema = gql`
 
   input CreateUploadInput {
     filename: String!
+    notes: String
     uploadedById: Int!
     agencyId: Int!
     organizationId: Int!
@@ -33,6 +36,7 @@ export const schema = gql`
 
   input UpdateUploadInput {
     filename: String
+    notes: String
     uploadedById: Int
     agencyId: Int
     organizationId: Int

diff --git a/api/src/lib/auth.ts b/api/src/lib/auth.ts
@@ -34,7 +34,7 @@ export const getCurrentUser = async (
 ): Promise<RedwoodUser | null> => {
   console.log(decoded)
   return {
-    id: 'unique-user-id',
+    id: 1,
     email: '[email protected]',
     roles: ['admin', 'usdr-admin'],
   }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "Upload" ADD COLUMN "notes" TEXT;