Merge main (gde commits) into jest-config

prisma/migrations/20240523072139_init/migration.sql → prisma/migrations/20240623174056_init/migration.sql

@@ -109,15 +109,16 @@ CREATE TABLE "Step" (
 );
 
 -- CreateTable
-CREATE TABLE "UserStep" (
+CREATE TABLE "EventUserStep" (
     "id" SERIAL NOT NULL,
     "userId" INTEGER NOT NULL,
     "stepId" INTEGER NOT NULL,
-    "startAt" TIMESTAMP(3) NOT NULL,
-    "endAt" TIMESTAMP(3) NOT NULL,
-    "duration" INTEGER NOT NULL,
+    "eventId" INTEGER NOT NULL,
+    "startAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "endAt" TIMESTAMP(3),
+    "durationMs" INTEGER,
 
-    CONSTRAINT "UserStep_pkey" PRIMARY KEY ("id")
+    CONSTRAINT "EventUserStep_pkey" PRIMARY KEY ("id")
 );
 
 -- CreateTable
@@ -161,10 +162,13 @@ ALTER TABLE "Journey" ADD CONSTRAINT "Journey_authorId_fkey" FOREIGN KEY ("autho
 ALTER TABLE "Step" ADD CONSTRAINT "Step_journeyId_fkey" FOREIGN KEY ("journeyId") REFERENCES "Journey"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "UserStep" ADD CONSTRAINT "UserStep_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE "EventUserStep" ADD CONSTRAINT "EventUserStep_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "EventUserStep" ADD CONSTRAINT "EventUserStep_stepId_fkey" FOREIGN KEY ("stepId") REFERENCES "Step"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "UserStep" ADD CONSTRAINT "UserStep_stepId_fkey" FOREIGN KEY ("stepId") REFERENCES "Step"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE "EventUserStep" ADD CONSTRAINT "EventUserStep_eventId_fkey" FOREIGN KEY ("eventId") REFERENCES "Event"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE "Comment" ADD CONSTRAINT "Comment_authorId_fkey" FOREIGN KEY ("authorId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/schema.prisma

@@ -21,24 +21,24 @@ model Role {
 }
 
 model User {
-  id          Int         @id @default(autoincrement())
-  name        String?
-  lastName    String?
-  email       String      @unique
-  username    String
-  password    String
-  createdAt   DateTime    @default(now())
-  updatedAt   DateTime    @updatedAt
-  isVerified  Boolean     @default(false)
-  dateOfBirth DateTime?
-  avatar      String?
-  experience  Int         @default(0)
-  userRoles   UserRole[] // liste des rôles de l'utilisateur
-  userEvents  UserEvent[] // liste des events auxquels l'utilisateur participe
-  userSteps   UserStep[] // liste des étapes réalisées par l'utilisateur
-  comments    Comment[] // liste des commentaires créés par l'utilisateur
-  journey     Journey[] // liste des parcours créés par l'utilisateur
-  events      Event[] // liste des events créés par l'utilisateur
+  id             Int             @id @default(autoincrement())
+  name           String?
+  lastName       String?
+  email          String          @unique
+  username       String
+  password       String
+  createdAt      DateTime        @default(now())
+  updatedAt      DateTime        @updatedAt
+  isVerified     Boolean         @default(false)
+  dateOfBirth    DateTime?
+  avatar         String?
+  experience     Int             @default(0)
+  userRoles      UserRole[] // liste des rôles de l'utilisateur
+  userEvents     UserEvent[] // liste des events auxquels l'utilisateur participe
+  EventUserSteps EventUserStep[] // liste des étapes réalisées par l'utilisateur
+  comments       Comment[] // liste des commentaires créés par l'utilisateur
+  journey        Journey[] // liste des parcours créés par l'utilisateur
+  events         Event[] // liste des events créés par l'utilisateur
 }
 
 model UserRole {
@@ -50,23 +50,24 @@ model UserRole {
 }
 
 model Event {
-  id              Int         @id @default(autoincrement())
+  id              Int             @id @default(autoincrement())
   authorId        Int
   journeyId       Int
   title           String
   image           String
   numberPlayerMin Int
   numberPlayerMax Int
   description     String
-  createdAt       DateTime    @default(now())
-  updatedAt       DateTime    @updatedAt
-  isPrivate       Boolean     @default(false)
+  createdAt       DateTime        @default(now())
+  updatedAt       DateTime        @updatedAt
+  isPrivate       Boolean         @default(false)
   accessCode      String?
   startAt         DateTime
   endAt           DateTime
   userEvents      UserEvent[]
-  author          User        @relation(fields: [authorId], references: [id], onDelete: Cascade)
-  journey         Journey     @relation(fields: [journeyId], references: [id], onDelete: Cascade)
+  author          User            @relation(fields: [authorId], references: [id], onDelete: Cascade)
+  journey         Journey         @relation(fields: [journeyId], references: [id], onDelete: Cascade)
+  EventUserStep   EventUserStep[]
 }
 
 model UserEvent {
@@ -102,35 +103,37 @@ model Journey {
 }
 
 model Step {
-  id            Int        @id @default(autoincrement())
-  journeyId     Int
-  puzzle        String
-  answer        String
-  hint          String
-  picturePuzzle String?
-  pictureHint   String?
-  createdAt     DateTime   @default(now())
-  updatedAt     DateTime   @updatedAt
-  latitude      Float
-  longitude     Float
-  address       String?
-  city          String?
-  postalCode    String?
-  country       String?
-  stepNumber    Int
-  journey       Journey    @relation(fields: [journeyId], references: [id], onDelete: Cascade)
-  userSteps     UserStep[]
+  id             Int             @id @default(autoincrement())
+  journeyId      Int
+  puzzle         String
+  answer         String
+  hint           String
+  picturePuzzle  String?
+  pictureHint    String?
+  createdAt      DateTime        @default(now())
+  updatedAt      DateTime        @updatedAt
+  latitude       Float
+  longitude      Float
+  address        String?
+  city           String?
+  postalCode     String?
+  country        String?
+  stepNumber     Int
+  journey        Journey         @relation(fields: [journeyId], references: [id], onDelete: Cascade)
+  EventUserSteps EventUserStep[]
 }
 
-model UserStep {
-  id       Int      @id @default(autoincrement())
-  userId   Int
-  stepId   Int
-  startAt  DateTime
-  endAt    DateTime
-  duration Int
-  user     User     @relation(fields: [userId], references: [id], onDelete: Cascade)
-  step     Step     @relation(fields: [stepId], references: [id], onDelete: Cascade)
+model EventUserStep {
+  id         Int       @id @default(autoincrement())
+  userId     Int
+  stepId     Int
+  eventId    Int
+  startAt    DateTime  @default(now())
+  endAt      DateTime?
+  durationMs Int?
+  user       User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+  step       Step      @relation(fields: [stepId], references: [id], onDelete: Cascade)
+  event      Event     @relation(fields: [eventId], references: [id], onDelete: Cascade)
 }
 
 model Comment {

prisma/seed.ts

@@ -1031,7 +1031,7 @@ async function main() {
     // Generate a random number of events for the user between 0 and 6
     let numEvents = Math.floor(Math.random() * 7);
 
-    // Ensure that Bob, Henry, and Grace are registered for at least one event because we create userStep for this users
+    // Ensure that Bob, Henry, and Grace are registered for at least one event because we create EventUserStep for these users
     if (
       users[i].id === bob.id ||
       users[i].id === henry.id ||
@@ -1223,6 +1223,81 @@ async function main() {
       journeyId: journey5.id,
     },
   });
+
+  const bobEvents = await prisma.userEvent.findMany({
+    where: { userId: bob.id },
+    select: { eventId: true },
+  });
+
+  const henryEvents = await prisma.userEvent.findMany({
+    where: { userId: henry.id },
+    select: { eventId: true },
+  });
+
+  const graceEvents = await prisma.userEvent.findMany({
+    where: { userId: grace.id },
+    select: { eventId: true },
+  });
+
+  const generateEventUserStep = async (userId: number, eventIds: number[]) => {
+    for (const eventId of eventIds) {
+      const event = await prisma.event.findUnique({
+        where: { id: eventId },
+        select: { journeyId: true },
+      });
+      if (!event) continue;
+
+      const journey = await prisma.journey.findUnique({
+        where: { id: event.journeyId },
+        select: { id: true, steps: true },
+      });
+
+      if (!journey) continue;
+
+      // Randomize the number of steps completed by the user for this event
+      const numberOfStepsToComplete = Math.floor(
+        Math.random() * journey.steps.length,
+      );
+
+      for (let i = 0; i < numberOfStepsToComplete; i++) {
+        const step = journey.steps[i];
+        const startAt = new Date();
+        // Randomly generate a duration between 30 minutes and 2 hours for each step
+        const endAt = new Date(
+          startAt.getTime() +
+            Math.floor(
+              Math.random() * (2 * 60 * 60 * 1000 - 30 * 60 * 1000 + 1),
+            ) +
+            30 * 60 * 1000,
+        );
+        const duration = endAt.getTime() - startAt.getTime();
+
+        await prisma.eventUserStep.create({
+          data: {
+            userId,
+            stepId: step.id,
+            eventId,
+            startAt,
+            endAt,
+            durationMs: duration,
+          },
+        });
+      }
+    }
+  };
+
+  await generateEventUserStep(
+    bob.id,
+    bobEvents.map((event) => event.eventId),
+  );
+  await generateEventUserStep(
+    henry.id,
+    henryEvents.map((event) => event.eventId),
+  );
+  await generateEventUserStep(
+    grace.id,
+    graceEvents.map((event) => event.eventId),
+  );
 }
 
 main()

src/app/api/auth/[...nextauth]/route.ts

@@ -1,5 +1,7 @@
 import NextAuth from "next-auth";
 import { authOptions } from "@/lib/authOptions";
+
+// TODO
 // @ts-ignore
 const handler = NextAuth(authOptions);
 

src/app/api/comments/[id]/route.ts

@@ -4,7 +4,8 @@ import {
   registerOrModifyComment,
   removeComment,
 } from "@/services/commentService";
-import { CommentWithoutDates } from "@/types/CommentWithoutDates";
+import { CommentWithoutDates } from "@/types/comment";
+import { commentBodySchema } from "@/validators/api/commentSchema";
 import { NextRequest, NextResponse } from "next/server";
 
 /**
@@ -39,9 +40,8 @@ export async function PUT(
   try {
     const id: number = Number(params.id);
     const body = await request.json();
-    const comment: CommentWithoutDates = body.comment;
-
-    console.log("COMMENT : " + comment);
+    // Parse the body with zod to get the comment
+    const comment: CommentWithoutDates = commentBodySchema.parse(body).comment;
 
     const result = await registerOrModifyComment(id, comment);
     return NextResponse.json({ data: result }, { status: 200 });

src/app/api/comments/route.ts

@@ -1,6 +1,6 @@
 import { handleException } from "@/app/utils/errorHandlerUtils";
 import { registerOrModifyComment } from "@/services/commentService";
-import { CommentWithoutDates } from "@/types/CommentWithoutDates";
+import { CommentWithoutDates } from "@/types/comment";
 import { commentBodySchema } from "@/validators/api/commentSchema";
 import { NextRequest, NextResponse } from "next/server";
 
@@ -12,9 +12,8 @@ import { NextRequest, NextResponse } from "next/server";
 export async function POST(request: NextRequest) {
   try {
     const body = await request.json();
-    const commentParsed = commentBodySchema.parse(body);
-
-    const comment: CommentWithoutDates = commentParsed.comment;
+    // Parse the body with zod to get the comment
+    const comment: CommentWithoutDates = commentBodySchema.parse(body).comment;
 
     const result = await registerOrModifyComment(null, comment);
     return NextResponse.json({ data: result }, { status: 201 });

src/app/api/events/[id]/join/[userId]/route.ts

@@ -13,10 +13,10 @@ export async function POST(
   { params }: { params: { id: string; userId: string } },
 ) {
   try {
-    const id: number = Number(params.id);
+    const eventId: number = Number(params.id);
     const userId: number = Number(params.userId);
 
-    const result = await joinEvent(id, userId);
+    const result = await joinEvent(eventId, userId);
     return NextResponse.json({ data: result }, { status: 200 });
   } catch (error: any) {
     return handleException(error);

src/app/api/events/[id]/leave/[userId]/route.ts

@@ -13,10 +13,11 @@ export async function DELETE(
   { params }: { params: { id: string; userId: string } },
 ) {
   try {
-    const id: number = Number(params.id);
+    const eventId: number = Number(params.id);
     const userId: number = Number(params.userId);
 
-    await leaveEvent(id, userId);
+    await leaveEvent(eventId, userId);
+
     // Using Response instead of NextResponse because NextResponse doesn't handle status 204 actually
     return new Response(null, {
       status: 204,

src/app/api/events/[id]/route.ts

@@ -4,7 +4,8 @@ import {
   registerOrModifyEvent,
   removeEvent,
 } from "@/services/eventService";
-import { Event } from "@prisma/client";
+import { EventWithoutId } from "@/types/event";
+import { eventBodySchema } from "@/validators/api/eventSchema";
 import { NextRequest, NextResponse } from "next/server";
 
 /**
@@ -39,7 +40,9 @@ export async function PUT(
   try {
     const id: number = Number(params.id);
     const body = await request.json();
-    const event: Event = body.event;
+
+    // Parse the body with zod to get the event
+    const event: EventWithoutId = eventBodySchema.parse(body).event;
 
     const result = await registerOrModifyEvent(id, event);
     return NextResponse.json({ data: result }, { status: 200 });