fixes

Signed-off-by: Kirill Mokevnin <[email protected]>

Author: mokevnin

app.ts

@@ -1,9 +1,9 @@
 import path from 'node:path';
 import type { AutoloadPluginOptions } from '@fastify/autoload';
 import AutoLoad from '@fastify/autoload';
-import { ValiError } from 'valibot'
 import type { FastifyPluginAsync, FastifyServerOptions } from 'fastify';
 import glue from 'fastify-openapi-glue';
+import { ValiError } from 'valibot';
 import serviceHandlers from './routes/index.ts';
 
 export interface AppOptions
@@ -20,25 +20,31 @@ const app: FastifyPluginAsync<AppOptions> = async (
   fastify.setErrorHandler((error, _request, reply) => {
     if (error instanceof ValiError) {
       const errors = error.issues.map((issue) => {
-        const lastPathItem = issue.path && issue.path.length > 0 ? issue.path[issue.path.length - 1] : undefined
-        const field = lastPathItem && 'key' in lastPathItem && lastPathItem.key != null ? String(lastPathItem.key) : ''
+        const lastPathItem =
+          issue.path && issue.path.length > 0
+            ? issue.path[issue.path.length - 1]
+            : undefined;
+        const field =
+          lastPathItem && 'key' in lastPathItem && lastPathItem.key != null
+            ? String(lastPathItem.key)
+            : '';
         return {
           message: issue.message ?? 'Validation error',
           rule: String(issue.type ?? 'validation'),
           field,
-        }
-      })
+        };
+      });
       const errorDetail = {
         status: 422,
         title: 'Validation Error',
         detail: 'Errors related to business logic such as uniqueness',
         errors,
-      }
-      reply.type('application/problem+json').code(422).send(errorDetail)
+      };
+      reply.type('application/problem+json').code(422).send(errorDetail);
     } else {
-      reply.send(error)
+      reply.send(error);
     }
-  })
+  });
 
   fastify.addContentTypeParser(
     'application/problem+json',

biome.json

@@ -7,12 +7,7 @@
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": [
-      "**",
-      "!test/**",
-      "!public/**",
-      "!types/handlers/**"
-    ]
+    "includes": ["**", "!test/**", "!public/**", "!types/handlers/**"]
   },
   "formatter": {
     "enabled": true,

db/seeds.ts

@@ -1,22 +1,36 @@
-import { buildCourse, buildCourseLesson, buildUser } from '../lib/data.ts'
-import type { DrizzleDB } from '../types/index.ts'
-import * as schemas from './schema.ts'
+import { buildCourse, buildCourseLesson, buildUser } from '../lib/data.ts';
+import type { DrizzleDB } from '../types/index.ts';
+import * as schemas from './schema.ts';
 /**
  * @param {import("drizzle-orm/better-sqlite3").BetterSQLite3Database<typeof schemas>} db
  */
 export default async (db: DrizzleDB) => {
-  const [_user1] = await db.insert(schemas.users).values(buildUser()).returning()
-  const [user2] = await db.insert(schemas.users).values(buildUser()).returning()
-  const [_user3] = await db.insert(schemas.users).values(buildUser({
-    email: '[email protected]', fullName: 'Тото Поддерживающий',
-  })).returning()
-  const [_course1] = await db.insert(schemas.courses).values(
-    buildCourse({ creatorId: user2.id }),
-  ).returning()
-  const [course2] = await db.insert(schemas.courses).values(
-    buildCourse({ creatorId: user2.id }),
-  ).returning()
-  await db.insert(schemas.courseLessons).values(
-    buildCourseLesson({ courseId: course2.id }),
-  )
-}
+  const [_user1] = await db
+    .insert(schemas.users)
+    .values(buildUser())
+    .returning();
+  const [user2] = await db
+    .insert(schemas.users)
+    .values(buildUser())
+    .returning();
+  const [_user3] = await db
+    .insert(schemas.users)
+    .values(
+      buildUser({
+        email: '[email protected]',
+        fullName: 'Тото Поддерживающий',
+      }),
+    )
+    .returning();
+  const [_course1] = await db
+    .insert(schemas.courses)
+    .values(buildCourse({ creatorId: user2.id }))
+    .returning();
+  const [course2] = await db
+    .insert(schemas.courses)
+    .values(buildCourse({ creatorId: user2.id }))
+    .returning();
+  await db
+    .insert(schemas.courseLessons)
+    .values(buildCourseLesson({ courseId: course2.id }));
+};

drizzle.config.ts

@@ -1,7 +1,7 @@
-import { defineConfig } from "drizzle-kit";
+import { defineConfig } from 'drizzle-kit';
 
 export default defineConfig({
-  dialect: "sqlite",
-  schema: "./db/schema.ts",
+  dialect: 'sqlite',
+  schema: './db/schema.ts',
   // out: "./drizzle",
 });

drizzle/meta/0000_snapshot.json

@@ -50,12 +50,8 @@
           "name": "course_lessons_courseId_courses_id_fk",
           "tableFrom": "course_lessons",
           "tableTo": "courses",
-          "columnsFrom": [
-            "courseId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["courseId"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -109,12 +105,8 @@
           "name": "courses_creator_id_users_id_fk",
           "tableFrom": "courses",
           "tableTo": "users",
-          "columnsFrom": [
-            "creator_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["creator_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -165,9 +157,7 @@
       "indexes": {
         "users_email_unique": {
           "name": "users_email_unique",
-          "columns": [
-            "email"
-          ],
+          "columns": ["email"],
           "isUnique": true
         }
       },
@@ -185,4 +175,4 @@
   "internal": {
     "indexes": {}
   }
-}
+}

drizzle/meta/_journal.json

@@ -10,4 +10,4 @@
       "breakpoints": true
     }
   ]
-}
+}

lib/utils.ts

@@ -1,12 +1,25 @@
-import openapiConst from '../tsp-output/@typespec/openapi3/openapi.v2.json' with { type: 'json' }
+import type { FastifyReply } from 'fastify';
+import openapiConst from '../tsp-output/@typespec/openapi3/openapi.v2.json' with {
+  type: 'json',
+};
 
 export function getPagingOptions(page: number, perPage = 10) {
   return {
     limit: perPage,
     offset: (page - 1) * perPage,
-  }
+  };
 }
 
 export function openapi() {
-  return openapiConst
+  return openapiConst;
+}
+
+export function ensure<T>(
+  reply: FastifyReply,
+  value: T | null | undefined,
+  status: number = 404,
+  msg?: string,
+): asserts value is NonNullable<T> {
+  const m = msg || 'Not Found';
+  if (value == null) reply.server.httpErrors.createError(status, m);
 }

plugins/jwt.ts

@@ -1,17 +1,23 @@
-import jwtPlugin from '@fastify/jwt'
-import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify'
-import fp from 'fastify-plugin'
+import jwtPlugin from '@fastify/jwt';
+import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
+import fp from 'fastify-plugin';
 
 export default fp(async (fastify: FastifyInstance) => {
   fastify.register(jwtPlugin, {
     secret: 'supersecret',
-  })
-  fastify.decorate('authenticate', async function (this: FastifyInstance, request: FastifyRequest, reply: FastifyReply) {
-    try {
-      await request.jwtVerify()
-    }
-    catch (err) {
-      reply.send(err)
-    }
-  })
-})
+  });
+  fastify.decorate(
+    'authenticate',
+    async function (
+      this: FastifyInstance,
+      request: FastifyRequest,
+      reply: FastifyReply,
+    ) {
+      try {
+        await request.jwtVerify();
+      } catch (err) {
+        reply.send(err);
+      }
+    },
+  );
+});

plugins/response-validation.ts

@@ -1,6 +1,6 @@
-import responseValidation from '@fastify/response-validation'
-import fp from 'fastify-plugin'
+import responseValidation from '@fastify/response-validation';
+import fp from 'fastify-plugin';
 
 export default fp(async (fastify) => {
-  await fastify.register(responseValidation)
-})
+  await fastify.register(responseValidation);
+});