Merge pull request #115 from WhyAsh5114/114-cuid2

feat: cuid2
WhyAsh5114 · Oct 14, 2024 · 3d516b3 · 3d516b3
2 parents ce3129f + 304abaa
commit 3d516b3
Show file tree

Hide file tree

Showing 12 changed files with 421 additions and 402 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
 	},
 	"devDependencies": {
 		"@iconify/json": "^2.2.227",
+		"@paralleldrive/cuid2": "^2.2.2",
 		"@playwright/test": "^1.45.1",
 		"@sveltejs/adapter-auto": "^3.2.2",
 		"@sveltejs/kit": "^2.5.18",
@@ -24,7 +25,6 @@
 		"@typescript-eslint/parser": "^8.0.0",
 		"@vite-pwa/sveltekit": "^0.6.0",
 		"autoprefixer": "^10.4.19",
-		"cuid": "^3.0.0",
 		"dotenv": "^16.4.5",
 		"eslint": "^9.7.0",
 		"eslint-config-prettier": "^9.1.0",

diff --git a/prisma/schema/exerciseSplit.prisma b/prisma/schema/exerciseSplit.prisma
@@ -1,5 +1,5 @@
 model ExerciseSplit {
-  id                String             @id @default(cuid())
+  id                String             @id @default(cuid()) /// @zod.string.cuid2()
   name              String
   user              User               @relation(fields: [userId], references: [id], onDelete: Cascade)
   userId            String
@@ -8,7 +8,7 @@ model ExerciseSplit {
 }
 
 model ExerciseSplitDay {
-  id              String             @id @default(cuid())
+  id              String             @id @default(cuid()) /// @zod.string.cuid2()
   name            String
   dayIndex        Int
   isRestDay       Boolean
@@ -18,7 +18,7 @@ model ExerciseSplitDay {
 }
 
 model ExerciseTemplate {
-  id                 String           @id @default(cuid())
+  id                 String           @id @default(cuid()) /// @zod.string.cuid2()
   name               String
   exerciseIndex      Int
   targetMuscleGroup  MuscleGroup

diff --git a/prisma/schema/mesocycle.prisma b/prisma/schema/mesocycle.prisma
@@ -1,23 +1,23 @@
 model Mesocycle {
-  id                           String                      @id @default(cuid())
-  name                         String
-  user                         User                        @relation(fields: [userId], references: [id], onDelete: Cascade)
-  userId                       String
-  exerciseSplit                ExerciseSplit?              @relation(fields: [exerciseSplitId], references: [id])
-  exerciseSplitId              String?
-  RIRProgression               Int[]
-  startDate                    DateTime?
-  endDate                      DateTime?
-  startOverloadPercentage      Float
-  lastSetToFailure             Boolean
-  forceRIRMatching             Boolean
-  mesocycleExerciseSplitDays   MesocycleExerciseSplitDay[]
-  mesocycleCyclicSetChanges    MesocycleCyclicSetChange[]
-  workoutsOfMesocycle          WorkoutOfMesocycle[]
+  id                         String                      @id @default(cuid()) /// @zod.string.cuid2()
+  name                       String
+  user                       User                        @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId                     String
+  exerciseSplit              ExerciseSplit?              @relation(fields: [exerciseSplitId], references: [id])
+  exerciseSplitId            String?
+  RIRProgression             Int[]
+  startDate                  DateTime?
+  endDate                    DateTime?
+  startOverloadPercentage    Float
+  lastSetToFailure           Boolean
+  forceRIRMatching           Boolean
+  mesocycleExerciseSplitDays MesocycleExerciseSplitDay[]
+  mesocycleCyclicSetChanges  MesocycleCyclicSetChange[]
+  workoutsOfMesocycle        WorkoutOfMesocycle[]
 }
 
 model MesocycleCyclicSetChange {
-  id                   String      @id @default(cuid())
+  id                   String      @id @default(cuid()) /// @zod.string.cuid2()
   mesocycle            Mesocycle   @relation(fields: [mesocycleId], references: [id], onDelete: Cascade)
   mesocycleId          String
   muscleGroup          MuscleGroup
@@ -28,7 +28,7 @@ model MesocycleCyclicSetChange {
 }
 
 model MesocycleExerciseSplitDay {
-  id                         String                      @id @default(cuid())
+  id                         String                      @id @default(cuid()) /// @zod.string.cuid2()
   name                       String
   dayIndex                   Int
   isRestDay                  Boolean
@@ -38,23 +38,23 @@ model MesocycleExerciseSplitDay {
 }
 
 model MesocycleExerciseTemplate {
-  id                           String                    @id @default(cuid())
-  name                         String
-  exerciseIndex                Int
-  targetMuscleGroup            MuscleGroup
-  customMuscleGroup            String?
-  bodyweightFraction           Float?
-  sets                         Int
-  setType                      SetType
-  repRangeStart                Int
-  repRangeEnd                  Int
-  changeType                   ChangeType?
-  changeAmount                 Float?
-  note                         String?
-  mesocycleExerciseSplitDay    MesocycleExerciseSplitDay @relation(fields: [mesocycleExerciseSplitDayId], references: [id], onDelete: Cascade)
-  mesocycleExerciseSplitDayId  String
-  overloadPercentage           Float?
-  lastSetToFailure             Boolean?
-  forceRIRMatching             Boolean?
-  minimumWeightChange          Float?
+  id                          String                    @id @default(cuid()) /// @zod.string.cuid2()
+  name                        String
+  exerciseIndex               Int
+  targetMuscleGroup           MuscleGroup
+  customMuscleGroup           String?
+  bodyweightFraction          Float?
+  sets                        Int
+  setType                     SetType
+  repRangeStart               Int
+  repRangeEnd                 Int
+  changeType                  ChangeType?
+  changeAmount                Float?
+  note                        String?
+  mesocycleExerciseSplitDay   MesocycleExerciseSplitDay @relation(fields: [mesocycleExerciseSplitDayId], references: [id], onDelete: Cascade)
+  mesocycleExerciseSplitDayId String
+  overloadPercentage          Float?
+  lastSetToFailure            Boolean?
+  forceRIRMatching            Boolean?
+  minimumWeightChange         Float?
 }
diff --git a/prisma/schema/schema.prisma b/prisma/schema/schema.prisma
@@ -14,7 +14,7 @@ generator zod {
 }
 
 model User {
-  id             String          @id @default(cuid())
+  id             String          @id @default(cuid()) /// @zod.string.cuid2()
   name           String?
   email          String          @unique
   emailVerified  DateTime?
@@ -24,8 +24,8 @@ model User {
   createdAt      DateTime        @default(now())
   updatedAt      DateTime        @updatedAt
   exerciseSplits ExerciseSplit[]
-  mesocycles      Mesocycle[]
-  workouts        Workout[]
+  mesocycles     Mesocycle[]
+  workouts       Workout[]
 }
 
 model Account {

diff --git a/prisma/schema/workout.prisma b/prisma/schema/workout.prisma
@@ -1,5 +1,5 @@
 model WorkoutOfMesocycle {
-  id            String         @id @default(cuid())
+  id            String         @id @default(cuid()) /// @zod.string.cuid2()
   workoutId     String         @unique
   mesocycleId   String
   splitDayIndex Int
@@ -9,7 +9,7 @@ model WorkoutOfMesocycle {
 }
 
 model Workout {
-  id                 String              @id @default(cuid())
+  id                 String              @id @default(cuid()) /// @zod.string.cuid2()
   user               User                @relation(fields: [userId], references: [id], onDelete: Cascade)
   workoutOfMesocycle WorkoutOfMesocycle?
   userBodyweight     Int
@@ -20,29 +20,29 @@ model Workout {
 }
 
 model WorkoutExercise {
-  id                           String               @id @default(cuid())
-  exerciseIndex                Int
-  name                         String
-  workout                      Workout              @relation(fields: [workoutId], references: [id], onDelete: Cascade)
-  workoutId                    String
-  targetMuscleGroup            MuscleGroup
-  customMuscleGroup            String?
-  bodyweightFraction           Float?
-  sets                         WorkoutExerciseSet[]
-  setType                      SetType
-  changeType                   ChangeType?
-  changeAmount                 Float?
-  repRangeStart                Int
-  repRangeEnd                  Int
-  note                         String?
-  overloadPercentage           Float?
-  lastSetToFailure             Boolean?
-  forceRIRMatching             Boolean?
-  minimumWeightChange          Float?
+  id                  String               @id @default(cuid()) /// @zod.string.cuid2()
+  exerciseIndex       Int
+  name                String
+  workout             Workout              @relation(fields: [workoutId], references: [id], onDelete: Cascade)
+  workoutId           String
+  targetMuscleGroup   MuscleGroup
+  customMuscleGroup   String?
+  bodyweightFraction  Float?
+  sets                WorkoutExerciseSet[]
+  setType             SetType
+  changeType          ChangeType?
+  changeAmount        Float?
+  repRangeStart       Int
+  repRangeEnd         Int
+  note                String?
+  overloadPercentage  Float?
+  lastSetToFailure    Boolean?
+  forceRIRMatching    Boolean?
+  minimumWeightChange Float?
 }
 
 model WorkoutExerciseSet {
-  id                String                   @id @default(cuid())
+  id                String                   @id @default(cuid()) /// @zod.string.cuid2()
   setIndex          Int
   workoutExercise   WorkoutExercise          @relation(fields: [workoutExerciseId], references: [id], onDelete: Cascade)
   workoutExerciseId String
@@ -54,7 +54,7 @@ model WorkoutExerciseSet {
 }
 
 model WorkoutExerciseMiniSet {
-  id                   String             @id @default(cuid())
+  id                   String             @id @default(cuid()) /// @zod.string.cuid2()
   miniSetIndex         Int
   reps                 Int
   load                 Float

diff --git a/src/lib/trpc/routes/exerciseSplits.ts b/src/lib/trpc/routes/exerciseSplits.ts
@@ -6,7 +6,7 @@ import {
 	ExerciseTemplateCreateWithoutExerciseSplitDayInputSchema
 } from '$lib/zodSchemas';
 import type { ExerciseSplit, ExerciseSplitDay, Prisma } from '@prisma/client';
-import cuid from 'cuid';
+import { createId } from '@paralleldrive/cuid2';
 
 const zodExerciseSplitInput = z.strictObject({
 	splitName: z.string(),
@@ -19,20 +19,20 @@ const createOrEditExerciseSplit = async (
 	userId: string,
 	editingId?: string
 ) => {
-	const exerciseSplitId = editingId ?? cuid();
+	const exerciseSplitId = editingId ?? createId();
 	const exerciseSplit: ExerciseSplit = { id: exerciseSplitId, name: input.splitName, userId };
 
 	const exerciseSplitDays: ExerciseSplitDay[] = input.splitDays.map((splitDay) => ({
 		...splitDay,
-		id: cuid(),
+		id: createId(),
 		exerciseSplitId: exerciseSplit.id
 	}));
 
 	const exerciseTemplates: Prisma.ExerciseTemplateUncheckedCreateInput[] = input.splitExercises.flatMap(
 		(dayExercises, dayNumber) =>
 			dayExercises.map((exercise) => ({
 				...exercise,
-				id: cuid(),
+				id: createId(),
 				exerciseSplitDayId: exerciseSplitDays[dayNumber].id
 			}))
 	);
@@ -49,7 +49,7 @@ const createOrEditExerciseSplit = async (
 };
 
 export const exerciseSplits = t.router({
-	findById: t.procedure.input(z.string().cuid()).query(({ input, ctx }) =>
+	findById: t.procedure.input(z.string().cuid2()).query(({ input, ctx }) =>
 		prisma.exerciseSplit.findUnique({
 			where: { id: input, userId: ctx.userId },
 			include: {
@@ -64,7 +64,7 @@ export const exerciseSplits = t.router({
 	load: t.procedure
 		.input(
 			z.strictObject({
-				cursorId: z.string().cuid().optional(),
+				cursorId: z.string().cuid2().optional(),
 				searchString: z.string().optional()
 			})
 		)
@@ -92,13 +92,13 @@ export const exerciseSplits = t.router({
 	}),
 
 	editById: t.procedure
-		.input(z.strictObject({ id: z.string().cuid(), splitData: zodExerciseSplitInput }))
+		.input(z.strictObject({ id: z.string().cuid2(), splitData: zodExerciseSplitInput }))
 		.mutation(async ({ input, ctx }) => {
 			await createOrEditExerciseSplit(input.splitData, ctx.userId, input.id);
 			return { message: 'Exercise split edited successfully' };
 		}),
 
-	deleteById: t.procedure.input(z.string().cuid()).mutation(async ({ input, ctx }) => {
+	deleteById: t.procedure.input(z.string().cuid2()).mutation(async ({ input, ctx }) => {
 		await prisma.exerciseSplit.delete({ where: { userId: ctx.userId, id: input } });
 		return { message: 'Exercise split deleted successfully' };
 	})