Skip to content

chore: some updates #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hmbanan666 merged 1 commit into from
Sep 16, 2025
Merged

chore: some updates #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions apps/web-app/server/tasks/ai/daily-report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand All @@ -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) => ({
Expand Down Expand Up @@ -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)
}
Expand Down
9 changes: 8 additions & 1 deletion packages/database/src/repository/partner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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() {
Expand Down
1 change: 1 addition & 0 deletions packages/database/src/repository/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down