[API]: @scoffs/refactor/backend

apps/api/package.json

@@ -13,22 +13,22 @@
   },
   "dependencies": {
     "@elysiajs/cors": "^1.0.2",
-    "elysia": "^1.0.10",
+    "elysia": "^1.0.13",
     "elysia-compression": "^0.0.7",
     "elysia-helmet": "^1.0.2",
-    "pg": "^8.11.3",
+    "pg": "^8.11.5",
     "pg-hstore": "^2.3.4",
     "rand-token": "^1.0.1",
     "sequelize": "^6.37.2",
     "@diary-spo/crypto": "workspace:*",
-    "cache-manager": "^5.4.0",
+    "cache-manager": "^5.5.1",
     "sequelize-simple-cache": "^1.3.5",
     "node-rsa": "^1.1.1"
   },
   "devDependencies": {
     "@types/node-rsa": "^1.1.4",
     "@diary-spo/shared": "workspace:*",
     "@elysiajs/swagger": "^1.0.3",
-    "@types/pg": "~8.11.2"
+    "@types/pg": "^8.11.5"
   }
 }

apps/api/src/ApiError/ApiError.ts

@@ -1,3 +1,5 @@
+import { API_CODES } from './types'
+
 export class ApiError extends Error {
   code: number
   message: string
@@ -9,3 +11,31 @@ export class ApiError extends Error {
     Object.setPrototypeOf(this, ApiError.prototype)
   }
 }
+
+export class NotFoundError extends ApiError {
+  constructor(message: string) {
+    super(message, API_CODES.NOT_FOUND)
+    Object.setPrototypeOf(this, NotFoundError.prototype)
+  }
+}
+
+export class UnauthorizedError extends ApiError {
+  constructor(message: string) {
+    super(message, API_CODES.UNAUTHORIZED)
+    Object.setPrototypeOf(this, UnauthorizedError.prototype)
+  }
+}
+
+export class ForbiddenError extends ApiError {
+  constructor(message: string) {
+    super(message, API_CODES.FORBIDDEN)
+    Object.setPrototypeOf(this, ForbiddenError.prototype)
+  }
+}
+
+export class UnknownError extends ApiError {
+  constructor(message: string) {
+    super(message, API_CODES.UNKNOWN_ERROR)
+    Object.setPrototypeOf(this, UnknownError.prototype)
+  }
+}

apps/api/src/models/Absence/model.ts

@@ -1,8 +1,11 @@
-import { cache, enableCache, sequelize } from '@db'
 import { DataTypes } from 'sequelize'
+
+import { cache, enableCache, sequelize } from '@db'
+
 import { AbsenceTypeModel } from '../AbsenceType'
 import { DiaryUserModel } from '../DiaryUser'
 import { ScheduleModel } from '../Schedule'
+
 import type { IModelPrototype } from '../types'
 
 export type AbsenceModelType = {

apps/api/src/models/AbsenceType/actions/save/saveOrGetAbsenceType.ts → apps/api/src/models/AbsenceType/actions/save/absenceTypeSaveOrGet.ts

@@ -1,7 +1,7 @@
 import type { AbsenceTypesKeys } from '@diary-spo/shared'
 import { AbsenceTypeModel, type IAbsenceTypeModel } from '@models'
 
-export const saveOrGetAbsenceType = async (
+export const absenceTypeSaveOrGet = async (
   name: AbsenceTypesKeys
 ): Promise<IAbsenceTypeModel> =>
   AbsenceTypeModel.findOrCreate({

apps/api/src/models/AbsenceType/actions/save/index.ts

@@ -1 +1 @@
-export * from './saveOrGetAbsenceType'
+export * from './absenceTypeSaveOrGet'

apps/api/src/models/AbsenceType/model.ts

@@ -1,6 +1,8 @@
-import { cache, enableCache, sequelize } from '@db'
 import { AbsenceTypes, type AbsenceTypesKeys } from '@diary-spo/shared'
 import { DataTypes } from 'sequelize'
+
+import { cache, enableCache, sequelize } from '@db'
+
 import type { IModelPrototype } from '../types'
 
 export type AbsenceTypeModelType = {

apps/api/src/models/AcademicYear/index.ts

@@ -1,2 +1,2 @@
 export * from './model'
-//export * from './actions'
+export * from './actions'

apps/api/src/models/AcademicYear/model.ts

@@ -1,5 +1,7 @@
-import { sequelize } from '@db'
 import { DataTypes } from 'sequelize'
+
+import { sequelize } from '@db'
+
 import { GroupModel } from '../Group'
 import { TermTypeModel } from '../TermType'
 import type { IModelPrototype } from '../types'

apps/api/src/models/Ads/actions/get/adsGetFromDB.ts

@@ -1,8 +1,8 @@
 import type { ICacheData } from '@helpers'
 import { AdsModel } from '@models'
 
-export const adsGetFromDB = async (authData: ICacheData) => {
-  return AdsModel.findAll({
+export const adsGetFromDB = async (authData: ICacheData) =>
+  AdsModel.findAll({
     where: {
       spoId: authData.spoId
     },
@@ -12,4 +12,3 @@ export const adsGetFromDB = async (authData: ICacheData) => {
     },
     order: [['date', 'DESC']]
   })
-}

apps/api/src/models/Ads/actions/save/saveAd.ts

@@ -2,9 +2,5 @@ import type { NotificationsResponse } from '@diary-spo/shared'
 import { type ICacheData, retriesForError } from '@helpers'
 import { adSaveOrGer } from './'
 
-export const saveAd = async (
-  ad: NotificationsResponse,
-  authData: ICacheData
-) => {
-  return retriesForError(adSaveOrGer, [ad, authData])
-}
+export const saveAd = async (ad: NotificationsResponse, authData: ICacheData) =>
+  retriesForError(adSaveOrGer, [ad, authData])

apps/api/src/models/Ads/model.ts

@@ -1,5 +1,7 @@
-import { sequelize } from '@db'
 import { DataTypes } from 'sequelize'
+
+import { sequelize } from '@db'
+
 import { SPOModel } from '../SPO'
 import type { IModelPrototype } from '../types'
 

apps/api/src/models/Auth/model.ts

@@ -1,5 +1,7 @@
-import { sequelize } from '@db'
 import { DataTypes } from 'sequelize'
+
+import { sequelize } from '@db'
+
 import { DiaryUserModel } from '../DiaryUser'
 import type { IModelPrototypeNoId } from '../types'
 

apps/api/src/models/Classroom/model.ts

@@ -1,9 +1,12 @@
-import { cache, enableCache, sequelize } from '@db'
 import { DataTypes } from 'sequelize'
+
+import { cache, enableCache, sequelize } from '@db'
+
 import { SPOModel } from '../SPO'
 import type { IModelPrototype } from '../types'
 
 // REMOVE IT
+// ?
 export type ClassroomModelType = {
   id: bigint
   building: string

apps/api/src/models/DiaryUser/actions/get/getUserById.ts

@@ -7,15 +7,14 @@ import {
 
 export type IUserInfo = DiaryUserModelType & { group?: GroupModelType }
 
+// не используется нигде
 export const getUserById = async (
   id: bigint,
   getGroup = false
-): Promise<IUserInfo | null> => {
-  // TODO: fix it
-  return DiaryUserModel.findOne({
+): Promise<IUserInfo | null> =>
+  DiaryUserModel.findOne({
     where: {
       id
     },
     include: getGroup ? GroupModel : undefined
   })
-}

apps/api/src/models/DiaryUser/actions/get/index.ts

@@ -1 +1,4 @@
 export * from './getUserById'
+
+export * from './saveOrGetDiaryUser'
+export * from './saveOrGetGroup'

apps/api/src/routes/login/service/get/saveOrGetDiaryUser.ts → apps/api/src/models/DiaryUser/actions/get/saveOrGetDiaryUser.ts

@@ -4,7 +4,6 @@ import {
   type IDiaryUserModel
 } from '@models'
 import type { Optional } from 'sequelize'
-// ВЫНЕСТИ В МОДЕЛЬ юзера
 
 export const saveOrGetDiaryUser = async (
   data: Optional<DiaryUserModelType, 'id'>

apps/api/src/routes/login/service/get/saveOrGetGroup.ts → apps/api/src/models/DiaryUser/actions/get/saveOrGetGroup.ts

@@ -1,5 +1,4 @@
 import { GroupModel, type IGroupModel } from '@models'
-// ВЫНЕСТИ В МОДЕЛЬ группы
 
 export const saveOrGetGroup = async (
   id: number,

apps/api/src/models/DiaryUser/model.ts

@@ -1,12 +1,15 @@
+import type { Nullable } from '@diary-spo/shared'
+import { DataTypes } from 'sequelize'
+
 import { KEY } from '@config'
 import { sequelize } from '@db'
-import type { Nullable } from '@diary-spo/shared'
 import { formatDate } from '@utils'
-import { DataTypes } from 'sequelize'
+
 import { GroupModel } from '../Group'
 import type { IModelPrototype } from '../types'
 
 // REMOVE IT
+// ?
 export type DiaryUserModelType = {
   id: bigint
   groupId: bigint

apps/api/src/models/Examination/actions/save/saveOrGetExaminationType.ts

@@ -1,13 +1,12 @@
 import type { ExaminationKeys } from '@diary-spo/shared'
 import { ExaminationTypeModel } from '../../model'
 
-export const saveOrGetExaminationType = async (type: ExaminationKeys) => {
-  return ExaminationTypeModel.findOrCreate({
+export const saveOrGetExaminationType = async (type: ExaminationKeys) =>
+  ExaminationTypeModel.findOrCreate({
     where: {
       name: type
     },
     defaults: {
       name: type
     }
   }).then((v) => v[0])
-}

apps/api/src/models/Examination/model.ts

@@ -1,6 +1,8 @@
-import { cache, enableCache, sequelize } from '@db'
 import { type ExaminationKeys, Examinations } from '@diary-spo/shared'
 import { DataTypes } from 'sequelize'
+
+import { cache, enableCache, sequelize } from '@db'
+
 import type { IModelPrototype } from '../types'
 
 export type ExaminationTypeModelType = {

apps/api/src/models/FinalMark/actions/save/saveOrGetFinalMark.ts

@@ -6,13 +6,16 @@ export const saveOrGetFinalMark = async (
   subjectId: bigint,
   authData: ICacheData
 ) => {
+  // why
   const where = {
     subjectId,
     diaryUserId: authData.localUserId
   }
   return FinalMarkModel.findOrCreate({
+    // why
     where,
     defaults: {
+      // why
       ...where,
       markValueId
     }

apps/api/src/models/FinalMark/model.ts

@@ -1,5 +1,7 @@
-import { sequelize } from '@db'
 import { DataTypes } from 'sequelize'
+
+import { sequelize } from '@db'
+
 import { DiaryUserModel } from '../DiaryUser'
 import { MarkValueModel } from '../MarkValue'
 import { SubjectModel } from '../Subject'

apps/api/src/models/Group/model.ts

@@ -1,5 +1,7 @@
-import { sequelize } from '@db'
 import { DataTypes } from 'sequelize'
+
+import { sequelize } from '@db'
+
 import { SPOModel } from '../SPO'
 import type { IModelPrototype } from '../types'
 

apps/api/src/models/LessonType/model.ts

@@ -1,6 +1,8 @@
-import { cache, enableCache, sequelize } from '@db'
 import { LessonType, type LessonTypeKeys } from '@diary-spo/shared'
 import { DataTypes } from 'sequelize'
+
+import { cache, enableCache, sequelize } from '@db'
+
 import type { IModelPrototype } from '../types'
 
 export type LessonTypeModelType = {

apps/api/src/models/Mark/actions/delete/markDelete.ts

@@ -1,11 +1,10 @@
 import type { ICacheData } from '@helpers'
 import { MarkModel } from '@models'
 
-export const markDelete = async (taskId: bigint, authData: ICacheData) => {
+export const markDelete = async (taskId: bigint, authData: ICacheData) =>
   MarkModel.destroy({
     where: {
       taskId,
       diaryUserId: authData.localUserId
     }
   })
-}

apps/api/src/models/Mark/actions/save/markSaveOrGet.ts

@@ -1,8 +1,7 @@
 import type { MarkKeys } from '@diary-spo/shared'
 import { type ICacheData, retriesForError } from '@helpers'
+import { type IScheduleModel, markValueSaveOrGet } from '@models'
 import { formatDate } from '@utils'
-import { markValueSaveOrGet } from 'src/models/MarkValue'
-import type { IScheduleModel } from 'src/models/Schedule'
 import { markSaveOrGetUnSafe } from './markSaveOrGetUnSafe'
 
 export const markSaveOrGet = async (

apps/api/src/models/Mark/model.ts

@@ -1,5 +1,7 @@
-import { sequelize } from '@db'
 import { DataTypes } from 'sequelize'
+
+import { sequelize } from '@db'
+
 import { DiaryUserModel } from '../DiaryUser'
 import { MarkValueModel } from '../MarkValue'
 import { TaskModel } from '../Task'

apps/api/src/models/MarkValue/model.ts

@@ -1,6 +1,8 @@
-import { cache, enableCache, sequelize } from '@db'
 import { Grade, type MarkKeys } from '@diary-spo/shared'
 import { DataTypes } from 'sequelize'
+
+import { cache, enableCache, sequelize } from '@db'
+
 import type { IModelPrototype } from '../types'
 
 export type MarkValueModelType = {

apps/api/src/models/Required/actions/save/requiredSaveOrGet.ts

@@ -10,6 +10,7 @@ export const requiredSaveOrGet = async (
     taskId,
     diaryUserId: authData.localUserId
   }
+
   return RequiredModel.findOrCreate({
     where,
     defaults: {

apps/api/src/models/Required/model.ts

@@ -1,5 +1,7 @@
-import { sequelize } from '@db'
 import { DataTypes } from 'sequelize'
+
+import { sequelize } from '@db'
+
 import { DiaryUserModel } from '../DiaryUser'
 import { TaskModel } from '../Task'
 import type { IModelPrototypeNoId } from '../types'

apps/api/src/routes/login/service/get/saveOrGetSPO.ts → apps/api/src/models/SPO/actions/saveOrGetSPO.ts

@@ -1,6 +1,6 @@
 import { type ISPOModel, SPOModel, type SPOModelType } from '@models'
 import type { Optional } from 'sequelize'
-// ВЫНЕСТИ В МОДЕЛЬ СПО
+
 export const saveOrGetSPO = async (
   data: Optional<SPOModelType, 'id'>
 ): Promise<ISPOModel> => {

apps/api/src/models/SPO/index.ts

@@ -1 +1,2 @@
 export * from './model'
+export * from './actions/saveOrGetSPO'

apps/api/src/models/SPO/model.ts

@@ -1,5 +1,7 @@
-import { sequelize } from '@db'
 import { DataTypes } from 'sequelize'
+
+import { sequelize } from '@db'
+
 import type { IModelPrototype } from '../types'
 
 export type SPOModelType = {