Merge pull request #11 from fumeapp/helpers-bindUser

✨ kill bindUser and add notFound helpers

.github/workflows/test.yml

@@ -2,8 +2,6 @@ name: Run Tests
 on:
   pull_request
 
-env:
-  DEVRUN: true
 jobs:
   test:
     if: github.event.pull_request.draft == false
@@ -12,16 +10,10 @@ jobs:
       mysql:
         image: mysql:8.0
         env:
-          # The MySQL docker container requires these environment variables to be set
-          # so we can create and migrate the test database.
-          # See: https://hub.docker.com/_/mysql
           MYSQL_DATABASE: bio-test
           MYSQL_ROOT_PASSWORD: root
         ports:
-          # Opens port 3306 on service container and host
-          # https://docs.github.com/en/actions/using-containerized-services/about-service-containers
           - 3306:3306
-          # Before continuing, verify the mysql container is reachable from the ubuntu host
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - uses: actions/checkout@v4
@@ -73,7 +65,7 @@ jobs:
         env:
           NUXT_UI_PRO_LICENSE: ${{ secrets.NUXT_UI_PRO_LICENSE }}
           NODE_ENV: test
-        run: pnpm run test:dev:coverage
+        run: pnpm run test:coverage
 
       - name: Report Coverage
         if: always()

package.json

@@ -9,21 +9,17 @@
     "generate": "nuxt generate",
     "preview": "nuxt preview",
     "test": "vitest run",
-    "test:dev": "DEVRUN=true vitest run",
-    "test:dev:ui": "DEVRUN=true vitest --ui",
+    "test::ui": "vitest --ui",
     "test:reset": "pnpm run db:test:reset; vitest run",
-    "test:dev:reset": "pnpm run db:test:reset; DEVRUN=true vitest run",
     "db:test:reset": "dotenv -e .env.test -- npx prisma migrate reset --force",
     "test:coverage": "vitest run --coverage.enabled true",
-    "test:dev:coverage": "DEVRUN=true vitest run --coverage.enabled true",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "lint:action": "pnpm run lint -f @jamesacarr/github-actions"
   },
   "dependencies": {
     "@nuxt/ui-pro": "^1.4.1",
-    "date-fns": "^3.6.0",
-    "h3": "npm:h3-nightly@latest"
+    "date-fns": "^3.6.0"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^2.26.0",
@@ -47,8 +43,5 @@
     "ua-parser-js": "^1.0.38",
     "vitest": "^2.0.5",
     "zod": "^3.23.8"
-  },
-  "resolutions": {
-    "h3": "npm:h3-nightly@latest"
   }
 }

prisma/migrations/migration_lock.toml

@@ -1,3 +1,3 @@
 # Please do not edit this file manually
 # It should be added in your version-control system (i.e. Git)
-provider = "mysql"
+provider = "mysql"

server/controllers/cartridges.ts

@@ -2,27 +2,18 @@ import { z } from 'zod'
 import type { Cartridge } from '~/types/models'
 import { cartridgeContents, cartridgeMgs, cartridgeMls } from '~/utils/shared'
 
-const index = defineEventHandler(async (event) => {
-  const { user } = await requireUserSession(event)
-  if (!user.isAdmin) return metapi().notFound(event)
+const index = authedHandler(async ({ event }) => {
   const schema = z.object({ id: z.number() })
   const parsed = schema.safeParse({ id: Number.parseInt(event.context.params?.user as string) })
   if (!parsed.success) return metapi().error(event, parsed.error.issues, 400)
   return metapi().render(
     await prisma.cartridge.findMany({
-      where: {
-        userId: parsed.data.id,
-      },
-      orderBy: {
-        updatedAt: 'desc',
-      },
-      include: {
-        pen: true,
-        shots: true,
-      },
+      where: { userId: parsed.data.id },
+      orderBy: { updatedAt: 'desc' },
+      include: { pen: true, shots: true },
     }),
   )
-})
+}, true)
 
 const create = authedHandler(async ({ event }) => {
   const schema = z.object({
@@ -51,7 +42,7 @@ const create = authedHandler(async ({ event }) => {
 
 const get = authedModelHandler<Cartridge>(async ({ model: cartridge }) => {
   return metapi().render(cartridge)
-}, { admin: true, bindUser: false })
+}, true)
 
 const remove = authedModelHandler<Cartridge>(async ({ model: cartridge }) => {
   await prisma.cartridge.delete({
@@ -60,7 +51,7 @@ const remove = authedModelHandler<Cartridge>(async ({ model: cartridge }) => {
     },
   })
   return metapi().success('cartridge deleted')
-}, { admin: true, bindUser: false })
+}, true)
 
 export default {
   index,

server/controllers/pens.ts

@@ -52,31 +52,29 @@ const create = authedHandler(async ({ event }) => {
   return metapi().success('pen created', pen)
 }, true)
 
-const update = authedHandler(async ({ event }) => {
+const update = authedModelHandler<Pen>(async ({ event, model: pen }) => {
   const schema = z.object({
-    id: z.number(),
     user: z.number(),
     cartridgeId: z.number().optional(),
   })
 
   const parsed = schema.safeParse({
-    id: Number.parseInt(event.context.params?.id as string),
     user: Number.parseInt(event.context.params?.user as string),
     cartridgeId: Number.parseInt((await readBody(event))?.cartridgeId) || undefined,
   })
   if (!parsed.success) return metapi().error(event, parsed.error.issues, 400)
 
-  const pen = await prisma.pen.update({
+  const updatedPen = await prisma.pen.update({
     where: {
-      id: parsed.data.id,
+      id: pen.id,
       userId: parsed.data.user,
     },
     data: {
       cartridgeId: parsed.data.cartridgeId ? BigInt(parsed.data.cartridgeId) : null,
     },
   })
 
-  return metapi().success('pen updated', pen)
+  return metapi().success('pen updated', updatedPen)
 }, true)
 
 const get = authedModelHandler<Pen>(async ({ model: pen }) => {