feat: refactor entity routes to use userId from request (#27)

Closes #27
rakenduste-programmeerimine-2024 · Jan 14, 2025 · 20a7397 · 20a7397
1 parent 7452fa8
commit 20a7397
Show file tree

Hide file tree

Showing 19 changed files with 86 additions and 36 deletions.
diff --git a/app/api/combat_logs/[id]/hard-delete/route.ts b/app/api/combat_logs/[id]/hard-delete/route.ts
@@ -1,8 +1,10 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import CombatLogService from "@/lib/services/combat-log-service"
 
 // HARD DELETE a single combat log by ID
-export const DELETE = createRouteHandler(async (id, userId) => {
+export const DELETE = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const deletedCombatLog = await CombatLogService.hardDelete(id!, userId)
   return deletedCombatLog
 })
diff --git a/app/api/combat_logs/[id]/route.ts b/app/api/combat_logs/[id]/route.ts
@@ -1,21 +1,25 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import CombatLogService from "@/lib/services/combat-log-service"
 
 // GET a single combat log by ID
-export const GET = createRouteHandler(async (id, userId) => {
+export const GET = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const combatLog = await CombatLogService.get(id!, userId)
   return combatLog
 })
 
 // UPDATE a single combat log by ID
-export const PUT = createRouteHandler(async (id, userId, req) => {
+export const PUT = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const updates = await req!.json()
   const updatedCombatLog = await CombatLogService.update(id!, updates, userId)
   return updatedCombatLog
 })
 
 // SOFT DELETE a single combat log by ID
-export const DELETE = createRouteHandler(async (id, userId) => {
+export const DELETE = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const deletedCombatLog = await CombatLogService.softDelete(id!, userId)
   return deletedCombatLog
 })
diff --git a/app/api/combat_logs/by-encounter/[encounterId]/route.ts b/app/api/combat_logs/by-encounter/[encounterId]/route.ts
@@ -1,7 +1,9 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import CombatLogService from "@/lib/services/combat-log-service"
 
-export const GET = createRouteHandler(async (_, userId, req) => {
+export const GET = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const encounterId = req?.url?.split("/").pop() // Extract encounterId from URL
   if (!encounterId) throw new Error("Missing encounter ID")
 

diff --git a/app/api/combat_logs/by-participant/[participantId]/route.ts b/app/api/combat_logs/by-participant/[participantId]/route.ts
@@ -1,7 +1,9 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import CombatLogService from "@/lib/services/combat-log-service"
 
-export const GET = createRouteHandler(async (_, userId, req) => {
+export const GET = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const participantId = req?.url?.split("/").pop() // Extract participantId from URL
   if (!participantId) throw new Error("Missing participant ID")
 

diff --git a/app/api/combat_logs/route.ts b/app/api/combat_logs/route.ts
@@ -1,8 +1,10 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import CombatLogService from "@/lib/services/combat-log-service"
 
 // GET all combat logs for a specific user
-export const GET = createRouteHandler(async (_, userId) => {
+export const GET = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const combatLogs = await CombatLogService.getByUserId(
     "user_id",
     userId,
@@ -12,7 +14,8 @@ export const GET = createRouteHandler(async (_, userId) => {
 }, false) // `requiresId` is false since we're not dealing with a single record
 
 // CREATE a new combat log
-export const POST = createRouteHandler(async (_, userId, req) => {
+export const POST = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const data = await req!.json()
   const newCombatLog = await CombatLogService.create(data, userId)
   return newCombatLog

diff --git a/app/api/encounters/[id]/hard-delete/route.ts b/app/api/encounters/[id]/hard-delete/route.ts
@@ -1,8 +1,10 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import EncounterService from "@/lib/services/encounter-service"
 
 // HARD DELETE a single encounter by ID
-export const DELETE = createRouteHandler(async (id, userId) => {
+export const DELETE = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const deletedEncounter = await EncounterService.hardDelete(id!, userId)
   return deletedEncounter
 })
diff --git a/app/api/encounters/[id]/route.ts b/app/api/encounters/[id]/route.ts
@@ -1,21 +1,25 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import EncounterService from "@/lib/services/encounter-service"
 
 // GET a single encounter by ID
-export const GET = createRouteHandler(async (id, userId) => {
+export const GET = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const encounter = await EncounterService.get(id!, userId)
   return encounter
 })
 
 // UPDATE a single encounter by ID
-export const PUT = createRouteHandler(async (id, userId, req) => {
+export const PUT = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const updates = await req!.json()
   const updatedEncounter = await EncounterService.update(id!, updates, userId)
   return updatedEncounter
 })
 
 // SOFT DELETE a single encounter by ID
-export const DELETE = createRouteHandler(async (id, userId) => {
+export const DELETE = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const deletedEncounter = await EncounterService.softDelete(id!, userId)
   return deletedEncounter
 })
diff --git a/app/api/encounters/route.ts b/app/api/encounters/route.ts
@@ -1,8 +1,10 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import EncounterService from "@/lib/services/encounter-service"
 
 // GET all encounters for a specific user
-export const GET = createRouteHandler(async (_, userId) => {
+export const GET = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const encounters = await EncounterService.getByUserId(
     "user_id",
     userId,
@@ -12,7 +14,8 @@ export const GET = createRouteHandler(async (_, userId) => {
 }, false) // `requiresId` is false since we're not dealing with a single record
 
 // CREATE a new encounter
-export const POST = createRouteHandler(async (_, userId, req) => {
+export const POST = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const data = await req!.json()
   const newEncounter = await EncounterService.create(data, userId)
   return newEncounter

diff --git a/app/api/participants/[id]/hard-delete/route.ts b/app/api/participants/[id]/hard-delete/route.ts
@@ -1,8 +1,10 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import ParticipantService from "@/lib/services/participant-service"
 
 // HARD DELETE a single participant by ID
-export const DELETE = createRouteHandler(async (id, userId) => {
+export const DELETE = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const deletedParticipant = await ParticipantService.hardDelete(id!, userId)
   return deletedParticipant
 })
diff --git a/app/api/participants/[id]/route.ts b/app/api/participants/[id]/route.ts
@@ -1,14 +1,17 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import ParticipantService from "@/lib/services/participant-service"
 
 // GET a single participant by ID
-export const GET = createRouteHandler(async (id, userId) => {
+export const GET = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const participant = await ParticipantService.get(id!, userId)
   return participant
 })
 
 // UPDATE a single participant by ID
-export const PUT = createRouteHandler(async (id, userId, req) => {
+export const PUT = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const updates = await req!.json()
   const updatedParticipant = await ParticipantService.update(
     id!,
@@ -19,7 +22,8 @@ export const PUT = createRouteHandler(async (id, userId, req) => {
 })
 
 // SOFT DELETE a single participant by ID
-export const DELETE = createRouteHandler(async (id, userId) => {
+export const DELETE = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const deletedParticipant = await ParticipantService.softDelete(id!, userId)
   return deletedParticipant
 })
diff --git a/app/api/participants/by-encounter/[encounterId]/route.ts b/app/api/participants/by-encounter/[encounterId]/route.ts
@@ -1,7 +1,9 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import ParticipantService from "@/lib/services/participant-service"
 
-export const GET = createRouteHandler(async (_, userId, req) => {
+export const GET = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const encounterId = req?.url?.split("/").pop() // Extract encounterId from URL
   if (!encounterId) throw new Error("Missing encounter ID")
 

diff --git a/app/api/participants/by-stat-block/[statBlockId]/route.ts b/app/api/participants/by-stat-block/[statBlockId]/route.ts
@@ -1,7 +1,9 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import ParticipantService from "@/lib/services/participant-service"
 
-export const GET = createRouteHandler(async (_, userId, req) => {
+export const GET = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const statBlockId = req?.url?.split("/").pop() // Extract statBlockId from URL
   if (!statBlockId) throw new Error("Missing stat block ID")
 

diff --git a/app/api/participants/route.ts b/app/api/participants/route.ts
@@ -1,8 +1,10 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import ParticipantService from "@/lib/services/participant-service"
 
 // GET all participants for a specific user
-export const GET = createRouteHandler(async (_, userId) => {
+export const GET = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const participants = await ParticipantService.getByUserId(
     "user_id",
     userId,
@@ -12,7 +14,8 @@ export const GET = createRouteHandler(async (_, userId) => {
 }, false) // `requiresId` is false since we're not dealing with a single record
 
 // CREATE a new participant
-export const POST = createRouteHandler(async (_, userId, req) => {
+export const POST = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const data = await req!.json()
   const newParticipant = await ParticipantService.create(data, userId)
   return newParticipant

diff --git a/app/api/profiles/[id]/route.ts b/app/api/profiles/[id]/route.ts
@@ -1,12 +1,13 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import { getProfile, updateProfile } from "@/lib/services/profile-service"
 
-export const GET = createRouteHandler(async (id, userId) => {
+export const GET = createRouteHandler(async (id, req) => {
   const profile = await getProfile(id!) // `id` will be present since `requiresId` is true by default
   return profile
 })
 
-export const PUT = createRouteHandler(async (id, userId, req) => {
+export const PUT = createRouteHandler(async (id, req) => {
   const updates = await req!.json()
   await updateProfile(id!, updates)
   return { success: true }

diff --git a/app/api/stat_blocks/[id]/hard-delete/route.ts b/app/api/stat_blocks/[id]/hard-delete/route.ts
@@ -1,8 +1,10 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import StatBlockService from "@/lib/services/stat-block-service"
 
 // HARD DELETE a single stat block by ID
-export const DELETE = createRouteHandler(async (id, userId) => {
+export const DELETE = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const deletedStatBlock = await StatBlockService.hardDelete(id!, userId)
   return deletedStatBlock
 })
diff --git a/app/api/stat_blocks/[id]/route.ts b/app/api/stat_blocks/[id]/route.ts
@@ -1,21 +1,25 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import StatBlockService from "@/lib/services/stat-block-service"
 
 // GET a single stat block by ID
-export const GET = createRouteHandler(async (id, userId) => {
+export const GET = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const statBlock = await StatBlockService.get(id!, userId)
   return statBlock
 })
 
 // UPDATE a single stat block by ID
-export const PUT = createRouteHandler(async (id, userId, req) => {
+export const PUT = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const updates = await req!.json()
   const updatedStatBlock = await StatBlockService.update(id!, updates, userId)
   return updatedStatBlock
 })
 
 // SOFT DELETE a single stat block by ID
-export const DELETE = createRouteHandler(async (id, userId) => {
+export const DELETE = createRouteHandler(async (id, req) => {
+  const userId = await getCurrentUserId(req)
   const deletedStatBlock = await StatBlockService.softDelete(id!, userId)
   return deletedStatBlock
 })
diff --git a/app/api/stat_blocks/route.ts b/app/api/stat_blocks/route.ts
@@ -1,8 +1,10 @@
 import { createRouteHandler } from "@/utils/api/create-route-handler"
+import { getCurrentUserId } from "@/utils/api/user-utils"
 import StatBlockService from "@/lib/services/stat-block-service"
 
 // GET all stat blocks for a specific user
-export const GET = createRouteHandler(async (_, userId) => {
+export const GET = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const statBlocks = await StatBlockService.getByUserId(
     "user_id",
     userId,
@@ -12,7 +14,8 @@ export const GET = createRouteHandler(async (_, userId) => {
 }, false) // `requiresId` is false since we're not dealing with a single record
 
 // CREATE a new stat block
-export const POST = createRouteHandler(async (_, userId, req) => {
+export const POST = createRouteHandler(async (_, req) => {
+  const userId = await getCurrentUserId(req)
   const data = await req!.json()
   const newStatBlock = await StatBlockService.create(data, userId)
   return newStatBlock

diff --git a/utils/api/create-route-handler.ts b/utils/api/create-route-handler.ts
@@ -1,11 +1,7 @@
 import { validateRequest } from "@/utils/api/validate-request"
 import { NextResponse } from "next/server"
 
-type HandlerFunction = (
-  id: string | null,
-  userId: string,
-  req?: Request,
-) => Promise<any>
+type HandlerFunction = (id: string | null, req: Request) => Promise<any>
 
 export function createRouteHandler(
   handler: HandlerFunction,
@@ -33,7 +29,7 @@ export function createRouteHandler(
     }
 
     try {
-      const result = await handler(id, userIdOrError, req)
+      const result = await handler(id, req)
       return NextResponse.json(result)
     } catch (error) {
       return NextResponse.json(

diff --git a/utils/api/user-utils.ts b/utils/api/user-utils.ts
@@ -0,0 +1,9 @@
+import { getUserIdFromRequest } from "@/middleware"
+
+export async function getCurrentUserId(req: Request): Promise<string> {
+  const userId = await getUserIdFromRequest(req)
+  if (!userId) {
+    throw new Error("Unauthorized")
+  }
+  return userId
+}