fix types

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

Author: mokevnin

routes/api/courses.ts

@@ -3,7 +3,10 @@ import { asc, eq } from 'drizzle-orm';
 import * as schemas from '../../db/schema.ts';
 import { ensure, getPagingOptions } from '../../lib/utils.ts';
 import type { RouteHandlers } from '../../types/handlers/fastify.gen.ts';
-import type { Course } from '../../types/index.ts';
+import type {
+  CourseCreateDto,
+  CourseEditDto,
+} from '../../types/handlers/index.ts';
 import CourseValidator from '../../validators/CourseValidator.ts';
 
 export default {
@@ -26,16 +29,16 @@ export default {
 
   async coursesCreate(request, reply) {
     await request.jwtVerify();
-    const validated = await CourseValidator.validate(
+    const validated = await CourseValidator.validate<CourseCreateDto>(
       request.db,
-      request.body as Course,
+      request.body,
     );
     // attach creator id from auth if available
     const creatorId = request.user?.id;
     const values = {
       ...validated,
       creatorId: creatorId,
-    } as Course;
+    };
 
     const [course] = await request.db
       .insert(schemas.courses)
@@ -46,9 +49,9 @@ export default {
 
   async coursesUpdate(request, reply) {
     await request.jwtVerify();
-    const validated = await CourseValidator.validate(
+    const validated = await CourseValidator.validate<CourseEditDto>(
       request.db,
-      request.body as Course,
+      request.body,
     );
     const [course] = await request.db
       .update(schemas.courses)

routes/api/courses/lessons.ts

@@ -3,7 +3,7 @@ import { and, asc, eq } from 'drizzle-orm';
 import * as schemas from '../../../db/schema.ts';
 import { ensure, getPagingOptions } from '../../../lib/utils.ts';
 import type { RouteHandlers } from '../../../types/handlers/fastify.gen.ts';
-import type { CourseLesson } from '../../../types/index.ts';
+import type { CourseLessonCreateDto } from '../../../types/handlers/index.ts';
 import LessonValidator from '../../../validators/Course/LessonValidator.ts';
 
 export default {
@@ -30,14 +30,14 @@ export default {
 
   async coursesLessonsCreate(request, reply) {
     await request.jwtVerify();
-    const validated = await LessonValidator.validate(
+    const validated = await LessonValidator.validate<CourseLessonCreateDto>(
       request.db,
-      request.body as CourseLesson,
+      request.body,
     );
     const values = {
       ...validated,
       courseId: request.params.courseId,
-    } as CourseLesson;
+    };
     const [lesson] = await request.db
       .insert(schemas.courseLessons)
       .values(values)

tsp-output/@typespec/openapi3/openapi.v1.json

@@ -36,7 +36,9 @@
                       }
                     }
                   },
-                  "required": ["data"]
+                  "required": [
+                    "data"
+                  ]
                 }
               }
             }
@@ -123,7 +125,9 @@
                       }
                     }
                   },
-                  "required": ["data"]
+                  "required": [
+                    "data"
+                  ]
                 }
               }
             }
@@ -454,7 +458,9 @@
                       }
                     }
                   },
-                  "required": ["data"]
+                  "required": [
+                    "data"
+                  ]
                 }
               }
             }
@@ -643,7 +649,10 @@
     "schemas": {
       "AuthInfo": {
         "type": "object",
-        "required": ["email", "password"],
+        "required": [
+          "email",
+          "password"
+        ],
         "properties": {
           "email": {
             "type": "string"
@@ -655,7 +664,11 @@
       },
       "Course": {
         "type": "object",
-        "required": ["id", "name", "description"],
+        "required": [
+          "id",
+          "name",
+          "description"
+        ],
         "properties": {
           "id": {
             "type": "number"
@@ -670,7 +683,10 @@
       },
       "CourseCreateDTO": {
         "type": "object",
-        "required": ["name", "description"],
+        "required": [
+          "name",
+          "description"
+        ],
         "properties": {
           "name": {
             "type": "string"
@@ -693,7 +709,12 @@
       },
       "CourseLesson": {
         "type": "object",
-        "required": ["id", "courseId", "name", "body"],
+        "required": [
+          "id",
+          "courseId",
+          "name",
+          "body"
+        ],
         "properties": {
           "id": {
             "type": "number"
@@ -711,7 +732,10 @@
       },
       "CourseLessonCreateDTO": {
         "type": "object",
-        "required": ["name", "body"],
+        "required": [
+          "name",
+          "body"
+        ],
         "properties": {
           "name": {
             "type": "string"
@@ -787,7 +811,9 @@
       },
       "TokenInfo": {
         "type": "object",
-        "required": ["token"],
+        "required": [
+          "token"
+        ],
         "properties": {
           "token": {
             "type": "string"
@@ -816,7 +842,9 @@
       },
       "UnprocessableEntityError": {
         "type": "object",
-        "required": ["errors"],
+        "required": [
+          "errors"
+        ],
         "properties": {
           "type": {
             "type": "string"
@@ -848,14 +876,22 @@
                   "type": "string"
                 }
               },
-              "required": ["message", "rule", "field"]
+              "required": [
+                "message",
+                "rule",
+                "field"
+              ]
             }
           }
         }
       },
       "User": {
         "type": "object",
-        "required": ["id", "fullName", "email"],
+        "required": [
+          "id",
+          "fullName",
+          "email"
+        ],
         "properties": {
           "id": {
             "type": "number"
@@ -873,7 +909,9 @@
       },
       "UserCreateDTO": {
         "type": "object",
-        "required": ["email"],
+        "required": [
+          "email"
+        ],
         "properties": {
           "fullName": {
             "type": "string"
@@ -893,7 +931,10 @@
       },
       "Versions": {
         "type": "string",
-        "enum": ["v1", "v2"]
+        "enum": [
+          "v1",
+          "v2"
+        ]
       }
     },
     "securitySchemes": {