From 1fb612b028efbd655e07b497fca5f4685c16a7e3 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 8 Sep 2021 20:50:55 +0300 Subject: [PATCH] refactor: enum types naming --- app/Datatypes/Enums/CodeErrorEnum.ts | 7 ++ .../{StatusCodeEnum.ts => HttpStatusEnum.ts} | 0 app/Services/AuthService.ts | 16 ++-- app/Services/CourseService.ts | 80 +++++++++---------- app/Services/ImageService.ts | 14 ++-- app/Services/LessonService.ts | 26 +++--- app/Services/MeService.ts | 31 +++---- app/Services/UserService.ts | 30 +++---- .../Course/SetCourseStatusValidator.ts | 4 +- 9 files changed, 106 insertions(+), 102 deletions(-) create mode 100644 app/Datatypes/Enums/CodeErrorEnum.ts rename app/Datatypes/Enums/{StatusCodeEnum.ts => HttpStatusEnum.ts} (100%) diff --git a/app/Datatypes/Enums/CodeErrorEnum.ts b/app/Datatypes/Enums/CodeErrorEnum.ts new file mode 100644 index 0000000..8b78763 --- /dev/null +++ b/app/Datatypes/Enums/CodeErrorEnum.ts @@ -0,0 +1,7 @@ +enum CodeErrorEnum { + NOT_FOUND = 'E_NOT_FOUND', + BAD_REQUEST = 'E_BAD_REQUEST', + CONFIRM_CODE_EXIST = 'E_CONFIRM_CODE_EXIST', +} + +export default CodeErrorEnum; diff --git a/app/Datatypes/Enums/StatusCodeEnum.ts b/app/Datatypes/Enums/HttpStatusEnum.ts similarity index 100% rename from app/Datatypes/Enums/StatusCodeEnum.ts rename to app/Datatypes/Enums/HttpStatusEnum.ts diff --git a/app/Services/AuthService.ts b/app/Services/AuthService.ts index 57ec251..226533f 100644 --- a/app/Services/AuthService.ts +++ b/app/Services/AuthService.ts @@ -4,14 +4,10 @@ import Hash from '@ioc:Adonis/Core/Hash'; import Logger from '@ioc:Adonis/Core/Logger'; /** - * Interfaces + * Datatypes */ import IResponse from 'App/Datatypes/Interfaces/IResponse'; - -/** - * Enums - */ -import StatusCodeEnum from 'App/Datatypes/Enums/StatusCodeEnum'; +import HttpStatusEnum from 'App/Datatypes/Enums/HttpStatusEnum'; /** * Reposirories @@ -42,7 +38,7 @@ export default class AuthService { if (!user) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'User not found.', data: {}, error: { @@ -57,7 +53,7 @@ export default class AuthService { if (!(await Hash.verify(user.password, password))) { return { success: false, - status: StatusCodeEnum.UNAUTHORIZED, + status: HttpStatusEnum.UNAUTHORIZED, message: 'Invalid credentials.', data: {}, error: { @@ -80,7 +76,7 @@ export default class AuthService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Login success.', data: token.toJSON(), }; @@ -98,7 +94,7 @@ export default class AuthService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Logout success.', data: {}, }; diff --git a/app/Services/CourseService.ts b/app/Services/CourseService.ts index df0e0af..e0dcf5f 100644 --- a/app/Services/CourseService.ts +++ b/app/Services/CourseService.ts @@ -4,10 +4,10 @@ import { AuthContract } from '@ioc:Adonis/Addons/Auth'; /** * Datatypes */ +import IResponse from 'App/Datatypes/Interfaces/IResponse'; import RoleEnum from 'App/Datatypes/Enums/RoleEnum'; import CourseStatusEnum from 'App/Datatypes/Enums/CourseStatusEnum'; -import StatusCodeEnum from 'App/Datatypes/Enums/StatusCodeEnum'; -import IResponse from 'App/Datatypes/Interfaces/IResponse'; +import HttpStatusEnum from 'App/Datatypes/Enums/HttpStatusEnum'; import RoleHelper from 'App/Helpers/RoleHelper'; /** @@ -56,7 +56,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched all courses.', data, }; @@ -74,7 +74,7 @@ export default class CourseService { if (!data) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -85,7 +85,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched course.', data, }; @@ -103,7 +103,7 @@ export default class CourseService { if (!data) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -114,7 +114,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched course teacher.', data, }; @@ -132,7 +132,7 @@ export default class CourseService { if (!data) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -143,7 +143,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched course category.', data, }; @@ -161,7 +161,7 @@ export default class CourseService { if (!data) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -172,7 +172,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched course lessons.', data, }; @@ -190,7 +190,7 @@ export default class CourseService { if (!data) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -201,7 +201,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched course students.', data, }; @@ -218,7 +218,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched students count.', data: { count }, }; @@ -239,7 +239,7 @@ export default class CourseService { if (!teacher) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Teacher not found.', data: {}, error: { @@ -253,7 +253,7 @@ export default class CourseService { if (!isTeacher) { return { success: false, - status: StatusCodeEnum.BAD_REQUEST, + status: HttpStatusEnum.BAD_REQUEST, message: `User with id "${teacher.id}" not a teacher.`, data: {}, error: { @@ -270,7 +270,7 @@ export default class CourseService { if (!category) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Category not found.', data: {}, error: { @@ -284,7 +284,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.CREATED, + status: HttpStatusEnum.CREATED, message: 'Course created.', data: course, }; @@ -302,7 +302,7 @@ export default class CourseService { if (!course) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -314,11 +314,11 @@ export default class CourseService { /** * Delete background image from course */ - await this.imageRepository.deleteFormCloudinaryCloud(course.bg_image_id); + await this.imageRepository.delete(course.bg_image_id); return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Course deleted.', data: course, }; @@ -337,7 +337,7 @@ export default class CourseService { if (!course) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -348,7 +348,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Course updated.', data: course, }; @@ -367,7 +367,7 @@ export default class CourseService { if (!course) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -381,7 +381,7 @@ export default class CourseService { if (!student) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Student not found.', data: {}, error: { @@ -395,7 +395,7 @@ export default class CourseService { if (!isStudent) { return { success: false, - status: StatusCodeEnum.BAD_REQUEST, + status: HttpStatusEnum.BAD_REQUEST, message: `User cannot be added to the course without "${RoleEnum.STUDENT}" role.`, data: {}, error: { @@ -410,7 +410,7 @@ export default class CourseService { if (error.code === '23505') { return { success: false, - status: StatusCodeEnum.BAD_REQUEST, + status: HttpStatusEnum.BAD_REQUEST, message: 'Student already attached to that course.', data: {}, error: { @@ -423,7 +423,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Student attached.', data: {}, }; @@ -435,7 +435,7 @@ export default class CourseService { if (!course) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -449,7 +449,7 @@ export default class CourseService { if (!isAttached) { return { success: false, - status: StatusCodeEnum.BAD_REQUEST, + status: HttpStatusEnum.BAD_REQUEST, message: 'Student not attached to that course.', data: {}, error: { @@ -463,7 +463,7 @@ export default class CourseService { if (!student) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Student not found.', data: {}, error: { @@ -476,7 +476,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Student detached.', data: {}, }; @@ -489,7 +489,7 @@ export default class CourseService { if (!course) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -504,7 +504,7 @@ export default class CourseService { if (error.code === '23505') { return { success: false, - status: StatusCodeEnum.BAD_REQUEST, + status: HttpStatusEnum.BAD_REQUEST, message: 'You are already liked this course.', data: {}, error: { @@ -517,7 +517,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Like attached.', data: {}, }; @@ -530,7 +530,7 @@ export default class CourseService { if (!course) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -547,7 +547,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Like detached.', data: {}, }; @@ -559,7 +559,7 @@ export default class CourseService { if (!data) { return { success: false, - status: StatusCodeEnum.BAD_REQUEST, + status: HttpStatusEnum.BAD_REQUEST, message: `Cannot set status for course with id "${id}"`, data: {}, error: { @@ -570,7 +570,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Status changed.', data: {}, }; @@ -581,7 +581,7 @@ export default class CourseService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched course likes count.', data: { count }, }; diff --git a/app/Services/ImageService.ts b/app/Services/ImageService.ts index ad5b26e..bcffd15 100644 --- a/app/Services/ImageService.ts +++ b/app/Services/ImageService.ts @@ -1,5 +1,5 @@ import { inject, Ioc } from '@adonisjs/core/build/standalone'; -import StatusCodeEnum from 'App/Datatypes/Enums/StatusCodeEnum'; +import HttpStatusEnum from 'App/Datatypes/Enums/HttpStatusEnum'; import IResponse from 'App/Datatypes/Interfaces/IResponse'; import ImageRepository from 'App/Repositories/ImageRepository'; import CreateImageValidator from 'App/Validators/Image/CreateImageValidator'; @@ -18,7 +18,7 @@ export default class ImageService { return { success: true, message: 'Fetched all images.', - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, data: images, }; } @@ -29,7 +29,7 @@ export default class ImageService { if (!image) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Image not found.', data: {}, error: { @@ -41,7 +41,7 @@ export default class ImageService { return { success: true, message: 'Fetched image.', - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, data: image, }; } @@ -52,7 +52,7 @@ export default class ImageService { return { success: true, message: 'Image created.', - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, data: image, }; } @@ -63,7 +63,7 @@ export default class ImageService { if (!image) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Image not found.', data: {}, error: { @@ -75,7 +75,7 @@ export default class ImageService { return { success: true, message: 'Image deleted.', - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, data: image, }; } diff --git a/app/Services/LessonService.ts b/app/Services/LessonService.ts index de16465..ffbcc7c 100644 --- a/app/Services/LessonService.ts +++ b/app/Services/LessonService.ts @@ -4,7 +4,7 @@ import { AuthContract } from '@ioc:Adonis/Addons/Auth'; /** * Datatypes */ -import StatusCodeEnum from 'App/Datatypes/Enums/StatusCodeEnum'; +import HttpStatusEnum from 'App/Datatypes/Enums/HttpStatusEnum'; import IResponse from 'App/Datatypes/Interfaces/IResponse'; /** * Repositories @@ -39,7 +39,7 @@ export default class LessonService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched all lessons.', data: lessons, }; @@ -57,7 +57,7 @@ export default class LessonService { if (!lesson) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Lesson not found.', data: {}, error: { @@ -68,7 +68,7 @@ export default class LessonService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched lesson.', data: lesson, }; @@ -86,7 +86,7 @@ export default class LessonService { if (!course) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Course not found.', data: {}, error: { @@ -99,7 +99,7 @@ export default class LessonService { return { success: true, - status: StatusCodeEnum.CREATED, + status: HttpStatusEnum.CREATED, message: 'Lesson created.', data: lesson, }; @@ -117,7 +117,7 @@ export default class LessonService { if (!lesson) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Lesson not found.', data: {}, error: { @@ -128,7 +128,7 @@ export default class LessonService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Lesson deleted.', data: lesson, }; @@ -147,7 +147,7 @@ export default class LessonService { if (!lesson) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Lesson not found.', data: {}, error: { @@ -158,7 +158,7 @@ export default class LessonService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Lesson updated.', data: lesson, }; @@ -180,7 +180,7 @@ export default class LessonService { if (!lesson) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Lesson not found.', data: {}, error: { @@ -196,7 +196,7 @@ export default class LessonService { if (!userHasCourse) { return { success: false, - status: StatusCodeEnum.FORBIDDEN, + status: HttpStatusEnum.FORBIDDEN, message: 'The user is not a student of this course.', data: {}, error: { @@ -209,7 +209,7 @@ export default class LessonService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched lesson content.', data: lesson.content, }; diff --git a/app/Services/MeService.ts b/app/Services/MeService.ts index a83e8c6..9da417e 100644 --- a/app/Services/MeService.ts +++ b/app/Services/MeService.ts @@ -5,11 +5,12 @@ import Redis from '@ioc:Adonis/Addons/Redis'; import Mail from '@ioc:Adonis/Addons/Mail'; import Hash from '@ioc:Adonis/Core/Hash'; import Logger from '@ioc:Adonis/Core/Logger'; -import StatusCodeEnum from 'App/Datatypes/Enums/StatusCodeEnum'; +import HttpStatusEnum from 'App/Datatypes/Enums/HttpStatusEnum'; import IResponse from 'App/Datatypes/Interfaces/IResponse'; import ContactRepository from 'App/Repositories/ContactRepository'; import UserRepository from 'App/Repositories/UserRepository'; import UpdateContactsValidator from 'App/Validators/Contacts/UpdateContactsValidator'; +import CodeErrorEnum from 'App/Datatypes/Enums/CodeErrorEnum'; @inject() export default class MeService { @@ -39,7 +40,7 @@ export default class MeService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched authorized user data.', data: user, }; @@ -62,7 +63,7 @@ export default class MeService { if (!(await Hash.verify(user.password, oldPassword))) { return { success: false, - status: StatusCodeEnum.UNAUTHORIZED, + status: HttpStatusEnum.UNAUTHORIZED, message: 'Invalid credentials.', data: {}, error: { @@ -81,7 +82,7 @@ export default class MeService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Password updated.', data: {}, }; @@ -89,7 +90,7 @@ export default class MeService { return { success: false, - status: StatusCodeEnum.BAD_REQUEST, + status: HttpStatusEnum.BAD_REQUEST, message: 'Unable to change password', data: {}, error: { @@ -113,11 +114,11 @@ export default class MeService { if (isConfirmationCodeExist) { return { success: false, - status: StatusCodeEnum.SERVICE_UNAVAILABLE, + status: HttpStatusEnum.SERVICE_UNAVAILABLE, message: 'Please wait a few seconds before send new confirmation code.', data: {}, error: { - code: 'E_SERVICE_UNAVAILABLE', + code: CodeErrorEnum.CONFIRM_CODE_EXIST, }, }; } @@ -139,8 +140,8 @@ export default class MeService { Logger.error(`Email send error: ${error}`); return { success: false, - status: StatusCodeEnum.SERVICE_UNAVAILABLE, - message: 'Unable to send confirmation code to this address.', + status: HttpStatusEnum.SERVICE_UNAVAILABLE, + message: 'Unable send confirmation code.', data: { error, }, @@ -157,7 +158,7 @@ export default class MeService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'The confirmation code has been sent.', data: { expired_seconds: EXPIRE_SECONDS, @@ -188,7 +189,7 @@ export default class MeService { if (confirmationCode === null) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'Cannot find the confirmation code for this email.', data: {}, error: { @@ -203,7 +204,7 @@ export default class MeService { if (Number.parseInt(confirmationCode, 10) !== code) { return { success: false, - status: StatusCodeEnum.BAD_REQUEST, + status: HttpStatusEnum.BAD_REQUEST, message: 'Confirmation code is invalid.', data: {}, error: { @@ -220,7 +221,7 @@ export default class MeService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'User email updated.', data: { email }, }; @@ -243,7 +244,7 @@ export default class MeService { if (contacts) { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'User contacts updated.', data: contacts, }; @@ -256,7 +257,7 @@ export default class MeService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'User contacts updated.', data: user.contacts, }; diff --git a/app/Services/UserService.ts b/app/Services/UserService.ts index 0c651bd..7308762 100644 --- a/app/Services/UserService.ts +++ b/app/Services/UserService.ts @@ -8,7 +8,7 @@ import IResponse from 'App/Datatypes/Interfaces/IResponse'; /** * Enums */ -import StatusCodeEnum from 'App/Datatypes/Enums/StatusCodeEnum'; +import HttpStatusEnum from 'App/Datatypes/Enums/HttpStatusEnum'; /** * Models @@ -50,7 +50,7 @@ export default class UserService { if (!user) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'User not found.', data: {}, error: { @@ -61,7 +61,7 @@ export default class UserService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched user.', data: user, }; @@ -78,7 +78,7 @@ export default class UserService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Fetched all users.', data: users, }; @@ -95,7 +95,7 @@ export default class UserService { return { success: true, - status: StatusCodeEnum.CREATED, + status: HttpStatusEnum.CREATED, message: 'User created.', data: user, }; @@ -114,7 +114,7 @@ export default class UserService { if (!user) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'User not found.', data: {}, error: { @@ -125,7 +125,7 @@ export default class UserService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'User updated.', data: user, }; @@ -143,7 +143,7 @@ export default class UserService { if (!user) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'User not found.', data: {}, error: { @@ -154,7 +154,7 @@ export default class UserService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'User deleted.', data: user, }; @@ -173,7 +173,7 @@ export default class UserService { if (!user) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'User not found.', data: {}, error: { @@ -201,7 +201,7 @@ export default class UserService { if (attachedRole) { return { success: false, - status: StatusCodeEnum.BAD_REQUEST, + status: HttpStatusEnum.BAD_REQUEST, message: `Role "${attachedRole.name}" already attached to that user.`, data: {}, error: { @@ -215,7 +215,7 @@ export default class UserService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Roles attached.', data: user.roles, }; @@ -234,7 +234,7 @@ export default class UserService { if (!user) { return { success: false, - status: StatusCodeEnum.NOT_FOUND, + status: HttpStatusEnum.NOT_FOUND, message: 'User not found.', data: {}, error: { @@ -259,7 +259,7 @@ export default class UserService { if (notAttachedRole) { return { success: false, - status: StatusCodeEnum.BAD_REQUEST, + status: HttpStatusEnum.BAD_REQUEST, message: `Role "${notAttachedRole.name}" not attached to that user.`, data: {}, error: { @@ -273,7 +273,7 @@ export default class UserService { return { success: true, - status: StatusCodeEnum.OK, + status: HttpStatusEnum.OK, message: 'Roles detached.', data: user.roles, }; diff --git a/app/Validators/Course/SetCourseStatusValidator.ts b/app/Validators/Course/SetCourseStatusValidator.ts index 001c473..46c24a6 100644 --- a/app/Validators/Course/SetCourseStatusValidator.ts +++ b/app/Validators/Course/SetCourseStatusValidator.ts @@ -4,13 +4,13 @@ import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'; /** * Datatypes */ -import CourseStatusEnum from 'App/Datatypes/Enums/CourseStatusEnum'; +import HttpStatusEnum from 'App/Datatypes/Enums/HttpStatusEnum'; export default class SetCourseStatusValidator { constructor(protected ctx: HttpContextContract) {} public schema = schema.create({ - status: schema.enum(Object.values(CourseStatusEnum)), + status: schema.enum(Object.values(HttpStatusEnum)), }); public messages = {};