chore: some updates (#165)

Author: hmbanan666

apps/web-app/server/tasks/ai/daily-report.ts

@@ -3,7 +3,6 @@ import { repository } from '@roll-stack/database'
 import { format } from 'date-fns'
 import { ru } from 'date-fns/locale/ru'
 import OpenAI from 'openai'
-import { useAtriumBot } from '~~/server/services/telegram/atrium-bot'
 
 const logger = useLogger('task:ai:daily-report')
 
@@ -19,7 +18,7 @@ export default defineTask({
     }
 
     try {
-      const { ai, telegram } = useRuntimeConfig()
+      const { ai } = useRuntimeConfig()
 
       const tasks = await repository.task.listCompletedToday()
       const preparedTasks = tasks.map((task) => ({
@@ -55,30 +54,30 @@ export default defineTask({
 
       // Flow item
       const date = format(new Date(), 'd MMMM', { locale: ru })
-      const flowItem = await repository.flow.createItem({
+      await repository.flow.createItem({
         type: 'daily_task_report',
         title: `Задачи ${date}`,
         description: finalMessage,
       })
 
-      const separator = 'zzzzz'
-      const startAppData = `flow${separator}${flowItem?.id}`
+      // const separator = 'zzzzz'
+      // const startAppData = `flow${separator}${flowItem?.id}`
 
-      // Get first words
-      const messageIntro = finalMessage.split(' ').slice(0, 40).join(' ')
-      const preparedMessage = `${messageIntro}...\n\nПродолжение внутри Атриума? 🙃`
+      // // Get first words
+      // const messageIntro = finalMessage.split(' ').slice(0, 40).join(' ')
+      // const preparedMessage = `${messageIntro}...\n\nПродолжение внутри Атриума? 🙃`
 
-      await useAtriumBot().api.sendMessage(telegram.teamGroupId, preparedMessage, {
-        link_preview_options: {
-          is_disabled: true,
-        },
-        reply_markup: {
-          inline_keyboard: [[{
-            text: '👉 Открыть Атриум',
-            url: `https://t.me/sushi_atrium_bot/app?startapp=${startAppData}`,
-          }]],
-        },
-      })
+      // await useAtriumBot().api.sendMessage(telegram.teamGroupId, preparedMessage, {
+      //   link_preview_options: {
+      //     is_disabled: true,
+      //   },
+      //   reply_markup: {
+      //     inline_keyboard: [[{
+      //       text: '👉 Открыть Атриум',
+      //       url: `https://t.me/sushi_atrium_bot/app?startapp=${startAppData}`,
+      //     }]],
+      //   },
+      // })
     } catch (error) {
       errorResolver(error)
     }

packages/database/src/repository/partner.ts

@@ -32,7 +32,7 @@ export class Partner {
   }
 
   static async listWithData() {
-    return useDatabase().query.partners.findMany({
+    const partners = await useDatabase().query.partners.findMany({
       where: (partners, { eq }) => eq(partners.isActive, true),
       with: {
         kitchens: true,
@@ -48,6 +48,13 @@ export class Partner {
         users: true,
       },
     })
+
+    // Order by name of legal entity
+    return partners.sort((a, b) => {
+      const aName = a.legalEntity?.name || ''
+      const bName = b.legalEntity?.name || ''
+      return aName.localeCompare(bName)
+    })
   }
 
   static async listAgreements() {

packages/database/src/repository/user.ts

@@ -70,6 +70,7 @@ export class User {
   static async list() {
     return useDatabase().query.users.findMany({
       where: (users, { eq }) => eq(users.isActive, true),
+      orderBy: (users, { asc }) => asc(users.surname),
       with: {
         focusedTask: true,
         telegramUsers: true,