From ffdebc4f927abe3b63c62c84268f40f9e6663895 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Thu, 2 Jun 2022 22:44:12 +0300 Subject: [PATCH] fix: lesson duration field updating --- app/Repositories/LessonRepository.ts | 3 ++- .../Course/CreateCourseValidator.ts | 2 +- .../Course/UpdateCourseValidator.ts | 2 +- tsconfig.json | 25 +++++-------------- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/app/Repositories/LessonRepository.ts b/app/Repositories/LessonRepository.ts index 934ee6e..a4c8688 100644 --- a/app/Repositories/LessonRepository.ts +++ b/app/Repositories/LessonRepository.ts @@ -144,12 +144,13 @@ export default class LessonRepository { if (lesson) { /** - * Update files + * Update fields */ lesson.merge({ title: data.title, description: data.description, course_id: data.course_id, + ...(data.duration && { duration: data.duration.toFormat('HH:mm:ss') }), }); /** diff --git a/app/Validators/Course/CreateCourseValidator.ts b/app/Validators/Course/CreateCourseValidator.ts index 337a186..55c847b 100644 --- a/app/Validators/Course/CreateCourseValidator.ts +++ b/app/Validators/Course/CreateCourseValidator.ts @@ -11,7 +11,7 @@ export default class CreateCourseValidator { education_description: schema.string.nullable(), image: schema.file.optional({ size: '10mb', - extnames: ['jpg', 'jpeg', 'png'], + extnames: ['jpg', 'jpeg', 'png', 'webp'], }), teacher_id: schema.string({}, [rules.exists({ table: 'users', column: 'id' })]), category_id: schema.string({}, [rules.exists({ table: 'categories', column: 'id' })]), diff --git a/app/Validators/Course/UpdateCourseValidator.ts b/app/Validators/Course/UpdateCourseValidator.ts index c8c8a8d..40f6633 100644 --- a/app/Validators/Course/UpdateCourseValidator.ts +++ b/app/Validators/Course/UpdateCourseValidator.ts @@ -10,7 +10,7 @@ export default class UpdateCourseValidator { education_description: schema.string.nullable(), image: schema.file.optional({ size: '10mb', - extnames: ['jpg', 'jpeg', 'png'], + extnames: ['jpg', 'jpeg', 'png', 'webp'], }), teacher_id: schema.string.optional({}, [rules.exists({ table: 'users', column: 'id' })]), category_id: schema.string.optional({}, [rules.exists({ table: 'categories', column: 'id' })]), diff --git a/tsconfig.json b/tsconfig.json index 007bcc2..92e754d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,30 +1,17 @@ { "extends": "./node_modules/adonis-preset-ts/tsconfig", - "include": [ - "**/*" - ], - "exclude": [ - "node_modules", - "build" - ], + "include": ["**/*"], + "exclude": ["node_modules", "build"], "compilerOptions": { "outDir": "build", "rootDir": "./", "sourceMap": true, "useDefineForClassFields": true, "paths": { - "App/*": [ - "./app/*" - ], - "Config/*": [ - "./config/*" - ], - "Contracts/*": [ - "./contracts/*" - ], - "Database/*": [ - "./database/*" - ] + "App/*": ["./app/*"], + "Config/*": ["./config/*"], + "Contracts/*": ["./contracts/*"], + "Database/*": ["./database/*"] }, "types": [ "@adonisjs/core",