udpate

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

Author: mokevnin

Diff for: routes/api/courses.js

@@ -3,7 +3,7 @@ import { asc, eq } from 'drizzle-orm'
 import * as schemas from '../../db/schema.js'
 import { schema } from '../../schema.js'
 import { getPagingOptions } from '../../lib/utils.js'
-import Course from '../../models/Course.js'
+import CourseValidator from '../../validators/CourseValidator.js'
 
 /**
   * @param {import('fastify').FastifyTypebox} fastify
@@ -55,7 +55,7 @@ export default async function (fastify) {
       },
     },
     async (request, reply) => {
-      const validated = await Course.validate(db, request.body)
+      const validated = await CourseValidator.validate(db, request.body)
       validated.creatorId = request.user.id
 
       const [course] = await db.insert(schemas.courses)

Diff for: routes/api/courses/lessons.js

@@ -3,7 +3,7 @@ import { and, asc, eq } from 'drizzle-orm'
 import * as schemas from '../../../db/schema.js'
 import { schema } from '../../../schema.js'
 import { getPagingOptions } from '../../../lib/utils.js'
-import Lesson from '../../../models/Course/Lesson.js'
+import LessonValidator from '../../../validators/Course/LessonValidator.js'
 
 /**
   * @param {import('fastify').FastifyTypebox} fastify
@@ -71,7 +71,7 @@ export default async function (fastify) {
 
       fastify.assert.equal(request.user.id, course.creatorId, 403)
 
-      const validated = await Lesson.validate(db, request.body)
+      const validated = await LessonValidator.validate(db, request.body)
       validated.courseId = request.params.courseId
 
       const [lesson] = await db.insert(schemas.courseLessons)

Diff for: routes/api/users.js

@@ -3,7 +3,7 @@ import { asc, eq } from 'drizzle-orm'
 import * as schemas from '../../db/schema.js'
 import { schema } from '../../schema.js'
 import { getPagingOptions } from '../../lib/utils.js'
-import User from '../../models/User.js'
+import UserValidator from '../../validators/UserValidator.js'
 
 /**
   * @param {import('fastify').FastifyTypebox} fastify
@@ -59,7 +59,7 @@ export default async function (fastify) {
       },
     },
     async (request, reply) => {
-      const validated = await User.validate(db, request.body)
+      const validated = await UserValidator.validate(db, request.body)
 
       const [user] = await db.insert(schemas.users)
         .values(validated)
@@ -77,7 +77,7 @@ export default async function (fastify) {
       schema: schema['/users/{id}'].PATCH.args.properties,
     },
     async (request) => {
-      const validated = await User.validate(db, request.body)
+      const validated = await UserValidator.validate(db, request.body)
       const [user] = await db.update(schemas.users)
         .set(validated)
         .where(eq(schemas.users.id, request.params.id))

Diff for: models/Course/Lesson.js renamed to validators/Course/LessonValidator.js

@@ -4,7 +4,7 @@ const schema = vine.object({
 }).allowUnknownProperties()
 const validator = vine.compile(schema)
 
-class Lesson {
+class LessonValidator {
   /**
    * @param {import('../../types.js').DrizzleDB} db
    * @param {Partial<import('../../types.js').CourseLesson>} data
@@ -14,4 +14,4 @@ class Lesson {
   }
 }
 
-export default Lesson
+export default LessonValidator

Diff for: models/Course.js renamed to validators/CourseValidator.js

@@ -6,7 +6,7 @@ const schema = vine.object({
 }).allowUnknownProperties()
 const validator = vine.compile(schema)
 
-class Course {
+class CourseValidator {
   /**
    * @param {import('../types.js').DrizzleDB} db
    * @param {Partial<import('../types.js').Course>} data
@@ -16,4 +16,4 @@ class Course {
   }
 }
 
-export default Course
+export default CourseValidator

Diff for: models/User.js renamed to validators/UserValidator.js

@@ -7,10 +7,10 @@ const schema = vine.object({
     .email()
     .normalizeEmail({ all_lowercase: true })
     .use(uniqueRule({ schema: users }))
-}).allowUnknownProperties()
+})
 const validator = vine.compile(schema)
 
-class User {
+class UserValidator {
   /**
    * @param {import('../types.js').DrizzleDB} db
    * @param {Partial<import('../types.js').User>} data
@@ -20,4 +20,4 @@ class User {
   }
 }
 
-export default User
+export default UserValidator