Merge pull request #24 from MinaFoundation/feature/voting-phase

Feature/voting phase
MinaFoundation · Nov 27, 2024 · d8254c5 · d8254c5
2 parents bc7bb0d + 338bcbc
commit d8254c5
Show file tree

Hide file tree

Showing 14 changed files with 311 additions and 129 deletions.
diff --git a/.gitignore b/.gitignore
@@ -143,3 +143,5 @@ Thumbs.db
 # Prisma
 prisma/.env
 
+# direnv
+.direnv
diff --git a/flake.nix b/flake.nix
@@ -19,7 +19,6 @@
             # Core dependencies
             nodejs_20
             nodePackages.typescript
-            nodePackages.tsx
             podman
             podman-compose
             direnv
@@ -53,4 +52,4 @@
           };
         };
       });
-}
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pgt-web-app",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/prisma/migrations/20241126154717_add_submission_phase/migration.sql b/prisma/migrations/20241126154717_add_submission_phase/migration.sql
@@ -0,0 +1,20 @@
+-- CreateTable
+CREATE TABLE "SubmissionPhase" (
+    "id" UUID NOT NULL,
+    "fundingRoundId" UUID NOT NULL,
+    "startDate" TIMESTAMPTZ(6) NOT NULL,
+    "endDate" TIMESTAMPTZ(6) NOT NULL,
+    "createdAt" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMPTZ(6) NOT NULL,
+
+    CONSTRAINT "SubmissionPhase_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "SubmissionPhase_fundingRoundId_key" ON "SubmissionPhase"("fundingRoundId");
+
+-- CreateIndex
+CREATE INDEX "SubmissionPhase_startDate_endDate_idx" ON "SubmissionPhase"("startDate", "endDate");
+
+-- AddForeignKey
+ALTER TABLE "SubmissionPhase" ADD CONSTRAINT "SubmissionPhase_fundingRoundId_fkey" FOREIGN KEY ("fundingRoundId") REFERENCES "FundingRound"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -153,6 +153,7 @@ model FundingRound {
     topic       Topic             @relation(fields: [topicId], references: [id])
     proposals   Proposal[]
     
+    submissionPhase    SubmissionPhase?
     considerationPhase ConsiderationPhase?
     deliberationPhase  DeliberationPhase?
     votingPhase       VotingPhase?
@@ -201,6 +202,19 @@ model VotingPhase {
     @@index([startDate, endDate])
 }
 
+model SubmissionPhase {
+    id              String        @id @default(uuid()) @db.Uuid
+    fundingRoundId  String        @unique @db.Uuid
+    startDate       DateTime      @db.Timestamptz(6)
+    endDate         DateTime      @db.Timestamptz(6)
+    createdAt       DateTime      @default(now()) @db.Timestamptz(6)
+    updatedAt       DateTime      @updatedAt @db.Timestamptz(6)
+
+    fundingRound    FundingRound  @relation(fields: [fundingRoundId], references: [id], onDelete: Cascade)
+
+    @@index([startDate, endDate])
+}
+
 model AdminUser {
     id          String        @id @default(uuid()) @db.Uuid
     userId      String        @unique @db.Uuid

diff --git a/src/app/api/admin/funding-rounds/[id]/route.ts b/src/app/api/admin/funding-rounds/[id]/route.ts
@@ -6,6 +6,23 @@ import { validatePhaseDates } from "@/lib/validation";
 
 const adminService = new AdminService(prisma);
 
+interface DateRange {
+  from: string;
+  to: string;
+}
+
+interface FundingRoundRequestData {
+  name: string;
+  description: string;
+  topicId: string;
+  totalBudget: number;
+  fundingRoundDates: DateRange;
+  submissionDates: DateRange;
+  considerationDates: DateRange;
+  deliberationDates: DateRange;
+  votingDates: DateRange;
+}
+
 interface RouteContext {
   params: Promise<{
     id: string;
@@ -58,37 +75,56 @@ export async function PUT(request: Request, context: RouteContext) {
       return NextResponse.json({ error: "Forbidden" }, { status: 403 });
     }
 
-    const data = await request.json();
+    const data: FundingRoundRequestData = await request.json();
+
+    // Convert string dates to Date objects for validation
+    const fundingRoundDates = {
+      from: new Date(data.fundingRoundDates.from),
+      to: new Date(data.fundingRoundDates.to),
+    };
+    const submissionDates = {
+      from: new Date(data.submissionDates.from),
+      to: new Date(data.submissionDates.to),
+    };
+    const considerationDates = {
+      from: new Date(data.considerationDates.from),
+      to: new Date(data.considerationDates.to),
+    };
+    const deliberationDates = {
+      from: new Date(data.deliberationDates.from),
+      to: new Date(data.deliberationDates.to),
+    };
+    const votingDates = {
+      from: new Date(data.votingDates.from),
+      to: new Date(data.votingDates.to),
+    };
 
     // Validate phase dates
     const datesValid = validatePhaseDates({
-      fundingRound: {
-        from: new Date(data.fundingRoundDates.from),
-        to: new Date(data.fundingRoundDates.to),
-      },
-      consideration: {
-        from: new Date(data.considerationDates.from),
-        to: new Date(data.considerationDates.to),
-      },
-      deliberation: {
-        from: new Date(data.deliberationDates.from),
-        to: new Date(data.deliberationDates.to),
-      },
-      voting: {
-        from: new Date(data.votingDates.from),
-        to: new Date(data.votingDates.to),
-      },
+      fundingRound: fundingRoundDates,
+      submission: submissionDates,
+      consideration: considerationDates,
+      deliberation: deliberationDates,
+      voting: votingDates,
     });
 
     if (!datesValid.valid) {
       return NextResponse.json({ error: datesValid.error }, { status: 400 });
     }
 
     const round = await adminService.updateFundingRound(
-      (
-        await context.params
-      ).id,
-      data
+      (await context.params).id,
+      {
+        name: data.name,
+        description: data.description,
+        topicId: data.topicId,
+        totalBudget: data.totalBudget,
+        fundingRoundDates,
+        submissionDates,
+        considerationDates,
+        deliberationDates,
+        votingDates,
+      }
     );
 
     return NextResponse.json(round);

diff --git a/src/app/api/admin/funding-rounds/route.ts b/src/app/api/admin/funding-rounds/route.ts
@@ -4,6 +4,23 @@ import prisma from "@/lib/prisma";
 import { getUserFromRequest } from "@/lib/auth";
 import { validatePhaseDates } from "@/lib/validation";
 
+interface DateRange {
+  from: string;
+  to: string;
+}
+
+interface FundingRoundRequestData {
+  name: string;
+  description: string;
+  topicId: string;
+  totalBudget: number;
+  fundingRoundDates: DateRange;
+  submissionDates: DateRange;
+  considerationDates: DateRange;
+  deliberationDates: DateRange;
+  votingDates: DateRange;
+}
+
 const adminService = new AdminService(prisma);
 
 export async function GET(req: Request) {
@@ -41,35 +58,54 @@ export async function POST(req: Request) {
       return NextResponse.json({ error: "Forbidden" }, { status: 403 });
     }
 
-    const data = await req.json();
+    const data: FundingRoundRequestData = await req.json();
+
+    // Convert string dates to Date objects for validation
+    const fundingRoundDates = {
+      from: new Date(data.fundingRoundDates.from),
+      to: new Date(data.fundingRoundDates.to),
+    };
+    const submissionDates = {
+      from: new Date(data.submissionDates.from),
+      to: new Date(data.submissionDates.to),
+    };
+    const considerationDates = {
+      from: new Date(data.considerationDates.from),
+      to: new Date(data.considerationDates.to),
+    };
+    const deliberationDates = {
+      from: new Date(data.deliberationDates.from),
+      to: new Date(data.deliberationDates.to),
+    };
+    const votingDates = {
+      from: new Date(data.votingDates.from),
+      to: new Date(data.votingDates.to),
+    };
 
     // Validate phase dates
     const datesValid = validatePhaseDates({
-      fundingRound: {
-        from: new Date(data.fundingRoundDates.from),
-        to: new Date(data.fundingRoundDates.to),
-      },
-      consideration: {
-        from: new Date(data.considerationDates.from),
-        to: new Date(data.considerationDates.to),
-      },
-      deliberation: {
-        from: new Date(data.deliberationDates.from),
-        to: new Date(data.deliberationDates.to),
-      },
-      voting: {
-        from: new Date(data.votingDates.from),
-        to: new Date(data.votingDates.to),
-      },
+      fundingRound: fundingRoundDates,
+      submission: submissionDates,
+      consideration: considerationDates,
+      deliberation: deliberationDates,
+      voting: votingDates,
     });
 
     if (!datesValid.valid) {
       return NextResponse.json({ error: datesValid.error }, { status: 400 });
     }
 
     const round = await adminService.createFundingRound({
-      ...data,
+      name: data.name,
+      description: data.description,
+      topicId: data.topicId,
+      totalBudget: data.totalBudget,
       createdById: user.id,
+      fundingRoundDates,
+      submissionDates,
+      considerationDates,
+      deliberationDates,
+      votingDates,
     });
     return NextResponse.json(round);
   } catch (error) {