Merge pull request #2 from niscy-eudiw/feat/make-all-pages-dynamic

SmirlakisParis · web-flow · commit 3366baa920a3 · 2025-10-15T10:25:02.000+03:00
refactor: enable dynamic rendering and consolidate credential types
diff --git a/src/app/api/applications/qr-issue/[id]/route.ts b/src/app/api/applications/qr-issue/[id]/route.ts
@@ -1,8 +1,5 @@
 // src/app/api/applications/qr-issue/[id]/route.ts
 import { NextResponse } from "next/server";
-import { Container } from "@/server";
-import { ApplicationService } from "@/server/services/ApplicationService";
-import { IssuerService } from "@/server/services/IssuerService";
 import QRCode from "qrcode";
 
 export async function GET(_req: Request, ctx: { params: Promise<{ id: string }> }) {
diff --git a/src/app/applications/[id]/confirmation/page.tsx b/src/app/applications/[id]/confirmation/page.tsx
@@ -18,7 +18,6 @@ import { Chip } from "@mui/material";
 import SchoolIcon from "@mui/icons-material/School";
 import DirectionsBoatIcon from "@mui/icons-material/DirectionsBoat";
 import BadgeIcon from "@mui/icons-material/Badge";
-import LogoBanner from "@/components/atoms/LogoBanner";
 
 
 function Field({ label, value }: { label: string; value?: string | null }) {
@@ -155,35 +154,34 @@ export default async function ApplicationConfirmationPage({
                         Verified Credentials:
                       </Typography>
                       <Stack direction="row" spacing={1} flexWrap="wrap" useFlexGap>
-                        {verifiedCredentials.map((cred) => {
-                          const isVerified = cred.status === "VERIFIED";
-                          const isPending = cred.status === "PENDING";
-
-                          let icon = <BadgeIcon />;
-                          let label = cred.credentialType;
-
-                          if (cred.credentialType === "PID") {
-                            icon = <BadgeIcon />;
-                            label = "PID (Person Identification)";
-                          } else if (cred.credentialType === "DIPLOMA") {
-                            icon = <SchoolIcon />;
-                            label = "Diploma";
-                          } else if (cred.credentialType === "SEAFARER") {
-                            icon = <DirectionsBoatIcon />;
-                            label = "Seafarer Certificate";
-                          }
-
-                          return (
-                            <Chip
-                              key={cred.id}
-                              icon={icon}
-                              label={label}
-                              color={isVerified ? "success" : isPending ? "warning" : "default"}
-                              size="small"
-                              variant="filled"
-                            />
-                          );
-                        })}
+                        {verifiedCredentials
+                          .filter((cred) => cred.status === "VERIFIED")
+                          .map((cred) => {
+                            let icon = <BadgeIcon />;
+                            let label: string = cred.credentialType;
+
+                            if (cred.credentialType === "PID") {
+                              icon = <BadgeIcon />;
+                              label = "PID (Person Identification)";
+                            } else if (cred.credentialType === "DIPLOMA") {
+                              icon = <SchoolIcon />;
+                              label = "Diploma";
+                            } else if (cred.credentialType === "SEAFARER") {
+                              icon = <DirectionsBoatIcon />;
+                              label = "Seafarer Certificate";
+                            }
+
+                            return (
+                              <Chip
+                                key={cred.id}
+                                icon={icon}
+                                label={label}
+                                color="success"
+                                size="small"
+                                variant="filled"
+                              />
+                            );
+                          })}
                       </Stack>
                     </Grid>
                   </Box>
diff --git a/src/app/applications/[id]/employee/page.tsx b/src/app/applications/[id]/employee/page.tsx
@@ -60,7 +60,6 @@ export default async function EmployeeCredentialPage({
   }
 
   const otp = existingCredential?.otp;
-  const title = app.job?.title ?? "Application";
 
   return (
     <main>
diff --git a/src/app/applications/[id]/extras/page.tsx b/src/app/applications/[id]/extras/page.tsx
@@ -42,34 +42,20 @@ export default async function ApplicationExtrasPage({
   if (extrasCredentials.length === 0) return notFound();
 
   // Determine what was requested based on credentials
-  let extrasCredentialType: string;
   const hasDiploma = extrasCredentials.some((c) => c.credentialType === "DIPLOMA");
   const hasSeafarer = extrasCredentials.some((c) => c.credentialType === "SEAFARER");
 
+  let extrasCredentialTypeLabel: string;
   if (hasDiploma && hasSeafarer) {
-    extrasCredentialType = "BOTH";
+    extrasCredentialTypeLabel = "Diploma & Seafarer Certificate";
   } else if (hasDiploma) {
-    extrasCredentialType = "DIPLOMA";
+    extrasCredentialTypeLabel = "Diploma";
   } else {
-    extrasCredentialType = "SEAFARER";
+    extrasCredentialTypeLabel = "Seafarer Certificate";
   }
 
   const title = app.job?.title ?? "Application";
 
-  // Format credential type for display
-  const formatCredentialType = (type: string) => {
-    switch (type) {
-      case "BOTH":
-        return "Diploma & Seafarer Certificate";
-      case "DIPLOMA":
-        return "Diploma";
-      case "SEAFARER":
-        return "Seafarer Certificate";
-      default:
-        return type;
-    }
-  };
-
   return (
     <main>
       <Card variant="outlined">
@@ -88,7 +74,7 @@ export default async function ApplicationExtrasPage({
                 Application ID: <strong>{app.id}</strong>
               </Typography>
               <Typography variant="body2" color="text.secondary">
-                Requesting: <strong>{formatCredentialType(app.extrasCredentialType)}</strong>
+                Requesting: <strong>{extrasCredentialTypeLabel}</strong>
               </Typography>
             </>
           }
diff --git a/src/app/jobs/page.tsx b/src/app/jobs/page.tsx
@@ -2,6 +2,8 @@ import "server-only";
 import Link from "next/link";
 import { Container } from "@/server";
 import { JobService } from "@/server/services/JobService";
+
+export const dynamic = "force-dynamic";
 import {
   Box,
   Button,
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -6,6 +6,8 @@ import { Metadata } from 'next/types';
 
 export const metadata: Metadata = { title: 'Recruitment Service Demo' };
 
+export const dynamic = "force-dynamic";
+
 
 export default function RootLayout({ children }: { children: ReactNode }) {
   return (
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1 +1,3 @@
+export const dynamic = "force-dynamic";
+
 export { default } from "./jobs/page";
diff --git a/src/components/atoms/CredentialRequirementChips.tsx b/src/components/atoms/CredentialRequirementChips.tsx
@@ -3,8 +3,7 @@
 import { Chip, Stack, Typography } from "@mui/material";
 import SchoolIcon from "@mui/icons-material/School";
 import DirectionsBoatIcon from "@mui/icons-material/DirectionsBoat";
-
-export type CredentialType = 'NONE' | 'DIPLOMA' | 'SEAFARER' | 'BOTH' | 'PID';
+import type { CredentialType } from "@/server/domain/types";
 
 interface CredentialRequirementChipsProps {
   requiredCredentials: CredentialType;
diff --git a/src/server/domain/entities/Job.ts b/src/server/domain/entities/Job.ts
@@ -1,4 +1,4 @@
-import { CredentialType } from "./Application";
+import { CredentialType } from "../types";
 
 export class Job {
   private constructor(
diff --git a/src/server/domain/mappers/JobMapper.ts b/src/server/domain/mappers/JobMapper.ts
@@ -1,6 +1,6 @@
 import { JobPosting as PrismaJob } from "@prisma/client";
 import { Job } from "../entities/Job";
-import type { CredentialType } from "../entities/Application";
+import type { CredentialType } from "../types";
 
 export class JobMapper {
   /**
diff --git a/src/server/domain/types.ts b/src/server/domain/types.ts
@@ -0,0 +1,13 @@
+/**
+ * Shared domain types for the application
+ */
+
+/**
+ * Represents the types of credentials that can be requested or verified
+ * - NONE: No credentials required
+ * - PID: Personal Identification Document
+ * - DIPLOMA: Educational diploma certificate
+ * - SEAFARER: Seafarer certificate
+ * - BOTH: Both diploma and seafarer certificates
+ */
+export type CredentialType = 'NONE' | 'PID' | 'DIPLOMA' | 'SEAFARER' | 'BOTH';
diff --git a/src/server/services/VerifierService.ts b/src/server/services/VerifierService.ts
@@ -2,7 +2,8 @@ import { env } from "env";
 import { VerificationResponse, VpTokenRequest } from "@/server/types/eudi";
 import { Inject, Service } from "@/server/container";
 import { DataDecoderService } from "./DataDecoderService";
-import { buildVpTokenRequest, CredentialType } from "@/server/utils/dcql-queries";
+import { buildVpTokenRequest } from "@/server/utils/dcql-queries";
+import type { CredentialType } from "@/server/domain/types";
 
 
 @Service()
@@ -119,7 +120,6 @@ console.log("Verifier response status:", response.status);
     TransactionId: string,
     responseCode?:string
   ): Promise<VerificationResponse> {
-    console.log("checkVerification called with:", { TransactionId, responseCode });
     if (!TransactionId) {
       throw new Error("Transaction ID is undefined.");
     }
@@ -129,7 +129,6 @@ console.log("Verifier response status:", response.status);
       if(responseCode){
         url += `?response_code=${responseCode}`;
       }
-      console.log("Fetching verification from URL:", url);
       const response = await fetch(url, {
         method: "GET",
         headers: { Accept: "application/json" },
@@ -219,6 +218,13 @@ console.log("Verifier response status:", response.status);
         );
       }
 
+      // Log success details only when verification succeeds
+      if (ok) {
+        console.log("checkVerification called with:", { TransactionId, responseCode });
+        console.log("Fetching verification from URL:", url);
+        console.log("Verification successful");
+      }
+
       return {
         status: ok,
         personalInfo: personalInfo ?? undefined,
diff --git a/src/server/utils/dcql-queries.ts b/src/server/utils/dcql-queries.ts
@@ -1,7 +1,6 @@
 import { VpTokenRequest } from "@/server/types/eudi";
 import { env } from "env";
-
-export type CredentialType = 'PID' | 'DIPLOMA' | 'SEAFARER' | 'BOTH' ;
+import type { CredentialType } from "@/server/domain/types";
 
 export interface DcqlQueryOptions {
   applicationId: string;

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ export default async function EmployeeCredentialPage({`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`const otp = existingCredential?.otp;`
`63`		`- const title = app.job?.title ?? "Application";`
`64`	`63`
`65`	`64`	`return (`
`66`	`65`	`<main>`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+export const dynamic = "force-dynamic";`
	`2`	`+`
`1`	`3`	`export { default } from "./jobs/page";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CredentialType } from "./Application";`
	`1`	`+import { CredentialType } from "../types";`
`2`	`2`
`3`	`3`	`export class Job {`
`4`	`4`	`private constructor(`