Набросать отправку уведомлений об оценках в телеграм

Zamelane · Zamelane · commit 9c9dd974b87c · 2024-11-27T10:40:35.000+07:00
diff --git a/apps/api/.env.example b/apps/api/.env.example
@@ -12,6 +12,7 @@ DATABASE_PORT=5432
 DATABASE_NAME='databaseName'
 DATABASE_USERNAME='user'
 DATABASE_PASSWORD='password'
+BOT_TOKEN=''
 
 POSTGRES_USER=postgres
 POSTGRES_PW=postgres
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -17,12 +17,14 @@
   "dependencies": {
     "@diary-spo/crypto": "workspace:*",
     "@elysiajs/cors": "^1.1.1",
+    "@types/node-telegram-bot-api": "^0.64.7",
     "cache-manager": "^5.7.6",
     "elysia": "1.1.21",
     "elysia-compression": "^0.0.7",
     "elysia-helmet": "^2.0.0",
     "ky": "^1.7.2",
     "node-rsa": "^1.1.1",
+    "node-telegram-bot-api": "^0.66.0",
     "pg": "^8.13.1",
     "pg-hstore": "^2.3.4",
     "rand-token": "^1.0.1",
diff --git a/apps/api/src/config/index.ts b/apps/api/src/config/index.ts
@@ -22,5 +22,6 @@ export const {
   DATABASE_USERNAME,
   DATABASE_PASSWORD,
   TIMEZONE,
-  KEY_SCAN_PATH
+  KEY_SCAN_PATH,
+  BOT_TOKEN
 } = PARAMS_INIT
diff --git a/apps/api/src/config/params.ts b/apps/api/src/config/params.ts
@@ -10,5 +10,6 @@ export const PARAMS_INIT: ParamsInit = {
   DATABASE_USERNAME: '',
   DATABASE_PASSWORD: '',
   TIMEZONE: getTimezone(),
-  KEY_SCAN_PATH: './'
+  KEY_SCAN_PATH: './',
+  BOT_TOKEN: ''
 }
diff --git a/apps/api/src/config/types.ts b/apps/api/src/config/types.ts
@@ -29,6 +29,7 @@ export interface StringParams {
   DATABASE_PASSWORD: string
   TIMEZONE: string
   KEY_SCAN_PATH: string
+  BOT_TOKEN: string
 }
 
 export type ParamsKeys = StringKeys<ParamsInit>
diff --git a/apps/api/src/helpers/notificationController.ts b/apps/api/src/helpers/notificationController.ts
@@ -0,0 +1,24 @@
+import type { MarkKeys, Task } from '@diary-spo/shared'
+
+export interface IMarkEvent {
+  diaryUserId: bigint
+  task: Task
+  mark: MarkKeys
+  previousMarkId: number | null
+  status: 'ADD' | 'DELETE' | 'UPDATE'
+  eventDatetime: Date
+}
+
+const ids_marks: IMarkEvent[] = [] // Идентификаторы оценок
+
+/**
+ * Регистрирует событие взаимодействия с оценкой
+ * @param event
+ */
+export const addNewMarkEvent = (event: IMarkEvent): void => {
+  ids_marks.push(event)
+  console.log(event)
+}
+
+export const getMarkEvent = () =>
+  ids_marks.length > 0 ? ids_marks.splice(0, 1)[0] : null
diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts
@@ -4,7 +4,7 @@ import { Elysia } from 'elysia'
 import { compression } from 'elysia-compression'
 import { helmet } from 'elysia-helmet'
 
-import { TIMEZONE } from '@config'
+import { BOT_TOKEN, TIMEZONE } from '@config'
 import { sequelize } from '@db'
 
 import { getTimezone } from './config/getTimeZone'
diff --git a/apps/api/src/models/Mark/actions/save/markSaveOrGet.ts b/apps/api/src/models/Mark/actions/save/markSaveOrGet.ts
@@ -1,6 +1,7 @@
-import type { MarkKeys } from '@diary-spo/shared'
+import type { MarkKeys, Task } from '@diary-spo/shared'
 import { type ICacheData, retriesForError } from '@helpers'
 import { formatDate } from '@utils'
+import { addNewMarkEvent } from '../../../../helpers/notificationController'
 import { markValueSaveOrGet } from '../../../MarkValue'
 import type { IScheduleModel } from '../../../Schedule'
 import { markSaveOrGetUnSafe } from './markSaveOrGetUnSafe'
@@ -10,7 +11,9 @@ export const markSaveOrGet = async (
   schedule: IScheduleModel,
   taskId: bigint,
   termId: bigint | null,
-  authData: ICacheData
+  authData: ICacheData,
+  task: Task | null,
+  systemInitiator = false
 ) => {
   // Не сохраняем текущий семестр для предыдущих семестров
   if (authData.termStartDate && authData.termLastUpdate) {
@@ -35,11 +38,26 @@ export const markSaveOrGet = async (
     authData
   ])
 
+  const previousMarkId = markDB[0].markValueId
+
   // Если есть изменения, то он потом сохранит
   markDB[0].markValueId = markValueId
   if (termId) {
     markDB[0].termId = termId
   }
 
+  // Сохраняем событие добавления/обновления оценки
+  if (task && systemInitiator)
+    if (markDB[0].markValueId !== previousMarkId || markDB[1])
+      addNewMarkEvent({
+        mark,
+        previousMarkId:
+          markDB[0].markValueId !== previousMarkId ? previousMarkId : null,
+        task,
+        diaryUserId: authData.localUserId,
+        status: markDB[1] ? 'ADD' : 'UPDATE',
+        eventDatetime: new Date()
+      })
+
   return markDB[0].save()
 }
diff --git a/apps/api/src/models/Schedule/actions/save/daySave.ts b/apps/api/src/models/Schedule/actions/save/daySave.ts
@@ -8,7 +8,8 @@ import { lessonSave } from './lessonSave'
 export const daySave = async (
   day: Day,
   authData: ICacheData,
-  termPromise?: ITermDetectP
+  termPromise?: ITermDetectP,
+  systemInitiator = false
 ) => {
   if (!day.lessons) {
     return
@@ -19,7 +20,7 @@ export const daySave = async (
   for (const lesson of day.lessons) {
     const promise = retriesForError(
       lessonSave,
-      [new Date(day.date), lesson, authData, termPromise],
+      [new Date(day.date), lesson, authData, termPromise, systemInitiator],
       3,
       1000
     ) //lessonSave(day.date, lesson, authData, termPromise)
diff --git a/apps/api/src/models/Schedule/actions/save/lessonSave.ts b/apps/api/src/models/Schedule/actions/save/lessonSave.ts
@@ -27,13 +27,15 @@ import type { ScheduleWhere } from '../types'
  * @param lesson - Занятие для сохранения
  * @param authData - Данные, предоставленные клиентом для авторизации
  * @param termPromise
+ * @param systemInitiator
  * @returns Promise<IScheduleModel | null>
  */
 export const lessonSave = async (
   date: Date,
   lesson: Lesson,
   authData: ICacheData,
-  termPromise?: ITermDetectP
+  termPromise?: ITermDetectP,
+  systemInitiator = false
 ): Promise<IScheduleModel | null> => {
   /**
    * Пропускаем пустые занятия типа:
@@ -124,7 +126,7 @@ export const lessonSave = async (
 
   /**
    * Если расписание есть в базе, то
-   * пробуем поменять поля и если они поменялись, то
+   * пробуем сравнить поля и если они поменялись, то
    * он (метод save) сделает запрос для сохранения
    */
   if (!isCreated) {
@@ -165,7 +167,7 @@ export const lessonSave = async (
     const schedule = await promiseToReturn
     retriesForError(
       tasksSaveOrGet,
-      [gradebook.tasks, schedule, authData, termPromise],
+      [gradebook.tasks, schedule, authData, termPromise, systemInitiator],
       2
     )
   }
diff --git a/apps/api/src/models/Subscribe/index.ts b/apps/api/src/models/Subscribe/index.ts
@@ -0,0 +1 @@
+export * from './model'
diff --git a/apps/api/src/models/Subscribe/model.ts b/apps/api/src/models/Subscribe/model.ts
@@ -0,0 +1,34 @@
+import { DataTypes } from 'sequelize'
+
+import { cache, enableCache, sequelize } from '@db'
+
+import { DiaryUserModel } from '../DiaryUser'
+import type { IModelPrototypeNoId } from '../types'
+
+export type SubscribeModelType = {
+  diaryUserId: bigint
+  tgId: bigint
+}
+
+export type ISubscribeModelType = IModelPrototypeNoId<SubscribeModelType>
+
+const subscribeModel = sequelize.define<ISubscribeModelType>('subscribe', {
+  diaryUserId: {
+    type: DataTypes.BIGINT,
+    primaryKey: true,
+    references: {
+      model: DiaryUserModel,
+      key: 'id'
+    }
+  },
+  tgId: {
+    type: DataTypes.BIGINT,
+    primaryKey: true,
+    allowNull: false,
+    unique: true
+  }
+})
+
+export const SubscribeModel = enableCache
+  ? cache.init<ISubscribeModelType>(subscribeModel)
+  : subscribeModel
diff --git a/apps/api/src/models/Task/actions/save/tasksSaveOrGet.ts b/apps/api/src/models/Task/actions/save/tasksSaveOrGet.ts
@@ -3,6 +3,7 @@ import { type ICacheData, retriesForError } from '@helpers'
 
 import { objPropertyCopy } from 'src/helpers/objPropertyCopy'
 import { taskTypeSaveOrGet } from 'src/models/TaskType'
+import { addNewMarkEvent } from '../../../../helpers/notificationController'
 import { markDelete, markSaveOrGet } from '../../../Mark'
 import { requiredSaveOrGet } from '../../../Required'
 import type { IScheduleModel } from '../../../Schedule'
@@ -14,7 +15,8 @@ export const tasksSaveOrGet = async (
   tasks: Task[],
   schedule: IScheduleModel,
   authData: ICacheData,
-  termPromise?: ITermDetectP
+  termPromise?: ITermDetectP,
+  systemInitiator = false
 ) => {
   const promises = []
   const scheduleId = schedule.id
@@ -80,9 +82,29 @@ export const tasksSaveOrGet = async (
 
         // На всякий який (ну и пустышки не берём)
         if (task.mark) {
-          markSaveOrGet(task.mark, schedule, taskId, termId, authData)
+          markSaveOrGet(
+            task.mark,
+            schedule,
+            taskId,
+            termId,
+            authData,
+            task,
+            systemInitiator
+          )
         } else {
-          markDelete(taskId, authData)
+          markDelete(taskId, authData).then((count) => {
+            // Игнорируем не системные инициализаторы (т.е. если пользователь уже сам посмотрел)
+            if (count > 0 && systemInitiator)
+              // Регистрируем событие удаления оценки
+              addNewMarkEvent({
+                mark: task.mark,
+                task,
+                diaryUserId: authData.localUserId,
+                status: 'DELETE',
+                eventDatetime: new Date(),
+                previousMarkId: null
+              })
+          })
         }
 
         return taskReturn
diff --git a/apps/api/src/models/relations.ts b/apps/api/src/models/relations.ts
@@ -18,6 +18,7 @@ import { ScheduleModel } from './Schedule'
 import { ScheduleSubgroupModel } from './ScheduleSubgroup'
 import { SubgroupModel } from './Subgroup'
 import { SubjectModel } from './Subject'
+import { SubscribeModel } from './Subscribe'
 import { TaskModel } from './Task'
 import { TaskTypeModel } from './TaskType'
 import { TeacherModel } from './Teacher'
@@ -192,6 +193,9 @@ TermSubjectModel.belongsTo(TeacherModel)
 DiaryUserModel.hasMany(TermSubjectModel)
 TermSubjectModel.belongsTo(DiaryUserModel)
 
+DiaryUserModel.hasMany(SubscribeModel)
+SubscribeModel.belongsTo(DiaryUserModel)
+
 if (forceSyncDatabase) {
   console.log('Syncing database...')
   await sequelize.sync({})
diff --git a/apps/api/src/routes/lessons/service/get/getLessons.ts b/apps/api/src/routes/lessons/service/get/getLessons.ts
@@ -12,8 +12,9 @@ export const getLessonsService = async (
   startDate: string,
   endDate: string,
   authData: ICacheData,
-  notGetFromDB = false
-): Promise<Day[]> => {
+  notGetFromDB = false,
+  systemInitiator = false
+): Promise<Day[] | null> => {
   const path = `${SERVER_URL}/services/students/${authData.idFromDiary}/lessons/${startDate}/${endDate}`
 
   const response = await fetcher.get(path, {
@@ -25,6 +26,7 @@ export const getLessonsService = async (
   }
 
   if (!response.ok && !notGetFromDB) {
+    if (systemInitiator) return null
     // Получаем из базы
     const rawSchedule = await ScheduleGetFromDB(startDate, endDate, authData)
     return getFormattedResponse(rawSchedule, startDate, endDate, authData)
@@ -36,7 +38,7 @@ export const getLessonsService = async (
 
   for (const day of days) {
     const backgroundProcess = async () =>
-      daySave(day, authData, term).catch((err: string) =>
+      daySave(day, authData, term, systemInitiator).catch((err: string) =>
         console.error(`Ошибка сохранения расписания: ${err}`)
       )
 
diff --git a/apps/api/src/routes/performance.current/service/index.ts b/apps/api/src/routes/performance.current/service/index.ts
@@ -5,19 +5,21 @@ import { getPerformanceCurrent } from './get'
 import { savePerformance } from './save'
 
 export const getCurrPerformance = async (
-  authData: ICacheData
-): Promise<PerformanceCurrent> => {
+  authData: ICacheData,
+  systemInitiator = false // Инициировано системой и нужно ли обязательно брать только из сетевого города ?
+): Promise<PerformanceCurrent | null> => {
   const response = await getPerformanceCurrent(authData)
 
   if (!response.ok) {
+    if (systemInitiator) return null
     // Возвращаем из базы
     return getPerformanceFromDB(authData)
   }
 
-  const result = await response.json()
+  const result = await response.json<PerformanceCurrent>()
 
   // Сохраняем в базе
-  savePerformance(result, authData)
+  savePerformance(result, authData, systemInitiator)
 
   return result
 }
diff --git a/apps/api/src/routes/performance.current/service/save/savePerformance.ts b/apps/api/src/routes/performance.current/service/save/savePerformance.ts
@@ -10,7 +10,8 @@ import { getPerformanceFromDB } from '../get'
  */
 export const savePerformance = async (
   performance: PerformanceCurrent,
-  authData: ICacheData
+  authData: ICacheData,
+  systemInitiator = false
 ) => {
   // Вытягиваем данные из БД, чтобы потом сравнивать
   const dataFromDatabase = await getPerformanceFromDB(authData)
@@ -63,7 +64,8 @@ export const savePerformance = async (
       String(group.startDate),
       String(group.endDate),
       authData,
-      true
+      true,
+      systemInitiator
     )
   }
 }
diff --git a/apps/api/src/telegramBot.ts b/apps/api/src/telegramBot.ts
@@ -0,0 +1,6 @@
+import { BOT_TOKEN } from '@config'
+import TelegramBot from 'node-telegram-bot-api'
+
+const token = BOT_TOKEN
+
+export const bot = new TelegramBot(token, { polling: true })
diff --git a/apps/api/src/worker/index.ts b/apps/api/src/worker/index.ts
@@ -1,11 +1,13 @@
 import { error } from '@utils'
 import { sleep } from 'bun'
 import { cookieUpdater } from './cookieUpdater'
+import { notificatorChecker } from './notificator'
+import '../models/relations'
 
 async function runWorker(): Promise<void> {
   while (true) {
     try {
-      await Promise.all([cookieUpdater()])
+      await Promise.all([cookieUpdater(), notificatorChecker()])
       await sleep(1000) // разгружаем немного
     } catch (e) {
       error('Error at worker', e)
diff --git a/apps/api/src/worker/notificator/config.ts b/apps/api/src/worker/notificator/config.ts
@@ -0,0 +1,2 @@
+// Интервал повторения перепроверки новых оценок
+export const INTERVAL_RUN = 2 * 60 // каждые 2 минуты
diff --git a/apps/api/src/worker/notificator/index.ts b/apps/api/src/worker/notificator/index.ts
diff --git a/apps/api/src/worker/notificator/messages/index.ts b/apps/api/src/worker/notificator/messages/index.ts
diff --git a/bun.lockb b/bun.lockb

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@ export const PARAMS_INIT: ParamsInit = {`
`10`	`10`	`DATABASE_USERNAME: '',`
`11`	`11`	`DATABASE_PASSWORD: '',`
`12`	`12`	`TIMEZONE: getTimezone(),`
`13`		`- KEY_SCAN_PATH: './'`
	`13`	`+ KEY_SCAN_PATH: './',`
	`14`	`+ BOT_TOKEN: ''`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ export interface StringParams {`
`29`	`29`	`DATABASE_PASSWORD: string`
`30`	`30`	`TIMEZONE: string`
`31`	`31`	`KEY_SCAN_PATH: string`
	`32`	`+ BOT_TOKEN: string`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`export type ParamsKeys = StringKeys<ParamsInit>`