Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function xTicks(i: number) {
return formatDate(data.value[i].date)
}

const template = (d: DataRecord) => `<strong>${formatDate(d.date)}, ${format(d.date, 'eeee', { locale: ru })}</strong><br> Средний чек: ${formatNumber(d.averageCheck)}<br> Средний по сети: ${formatNumber(d.commonAverageCheck)}`
const template = (d: DataRecord) => `<strong>${formatDate(d.date)}, ${format(d.date, 'eeee', { locale: ru })}</strong><br> ${d.checks} ${pluralizationRu(d.checks, ['чек', 'чека', 'чеков'])}, средний ${formatNumber(d.averageCheck)}<br> Средний по сети: ${formatNumber(d.commonAverageCheck)}`
</script>

<style scoped>
Expand Down
2 changes: 1 addition & 1 deletion apps/web-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "nuxt build",
"dev": "nuxt dev --port 3501",
"preview": "PORT=3501 nuxt preview",
"clean": "rm -rf dist",
"clean": "rm -rf .output",
"clean:modules": "rm -rf .nuxt node_modules",
"typecheck": "nuxt typecheck",
"postinstall": "nuxt prepare"
Expand Down
22 changes: 8 additions & 14 deletions apps/web-app/server/tasks/kitchen/average-update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,21 @@ export default defineTask({
},
async run() {
try {
const revenues = await repository.kitchen.listRevenuesToUpdate()
let metrics = await repository.network.listMetrics()
const metrics = await repository.network.listMetrics()

for (const revenue of revenues) {
// If have metric for this date
if (metrics.find((metric) => metric.date === revenue.date)) {
for (const m of metrics) {
const allRevenuesThisPeriod = await repository.kitchen.listRevenuesForDate(m.date)
if (!allRevenuesThisPeriod.length) {
continue
}

const allRevenuesThisPeriod = await repository.kitchen.listRevenuesForDate(revenue.date)
const averageCheck = Math.round(allRevenuesThisPeriod.reduce((acc, curr) => acc + curr.averageCheck, 0) / allRevenuesThisPeriod.length)
const total = Math.round(allRevenuesThisPeriod.reduce((acc, curr) => acc + curr.total, 0) / allRevenuesThisPeriod.length)
const checks = allRevenuesThisPeriod.reduce((acc, curr) => acc + curr.checks, 0)
const total = Math.round(allRevenuesThisPeriod.reduce((acc, curr) => acc + curr.total, 0))

await repository.network.createMetrics({
date: revenue.date,
averageCheck,
await repository.network.updateMetrics(m.id, {
checks,
total,
})

// Update
metrics = await repository.network.listMetrics()
}
} catch (error) {
errorResolver(error)
Expand Down
2 changes: 1 addition & 1 deletion apps/web-storefront/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "nuxt build",
"dev": "nuxt dev --port 3502",
"preview": "PORT=3502 nuxt preview",
"clean": "rm -rf dist",
"clean": "rm -rf .output",
"clean:modules": "rm -rf .nuxt node_modules",
"typecheck": "nuxt typecheck",
"postinstall": "nuxt prepare"
Expand Down
55 changes: 0 additions & 55 deletions k8s/web-parser/deployment.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions k8s/web-parser/secret.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"packageManager": "pnpm@10.13.1",
"description": "The technological heart of our delivery network.",
"description": "The technological heart of a Sushi Love delivery network.",
"author": "Nick Kosarev <hmbanan666@hotmail.com>",
"license": "MIT",
"homepage": "https://github.com/sushi-love/roll-stack",
Expand Down Expand Up @@ -48,7 +48,6 @@
"@vitest/browser": "catalog:",
"@vitest/coverage-v8": "catalog:",
"changelogen-monorepo": "catalog:",
"dotenv-cli": "catalog:",
"eslint": "catalog:",
"husky": "catalog:",
"lint-staged": "catalog:",
Expand Down
3 changes: 0 additions & 3 deletions packages/database/build.config.ts

This file was deleted.

19 changes: 3 additions & 16 deletions packages/database/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,15 @@
"version": "0.0.0",
"private": true,
"exports": {
".": {
"types": "./dist/index.d.ts",
"import": "./dist/index.mjs"
}
".": "./src/index.ts"
},
"module": "./dist/index.mjs",
"types": "./dist/index.d.ts",
"files": [
"dist",
"migrations"
],
"scripts": {
"build": "unbuild",
"db:generate": "drizzle-kit generate",
"db:migrate": "drizzle-kit migrate",
"db:push": "drizzle-kit push",
"db:studio": "drizzle-kit studio",
"clean": "rm -rf dist",
"clean:modules": "rm -rf node_modules",
"typecheck": "tsc --noEmit",
"postinstall": "pnpm build"
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@paralleldrive/cuid2": "catalog:",
Expand All @@ -37,7 +25,6 @@
"@types/pg": "catalog:",
"dotenv": "catalog:",
"drizzle-kit": "catalog:",
"typescript": "catalog:",
"unbuild": "catalog:"
"typescript": "catalog:"
}
}
3 changes: 0 additions & 3 deletions packages/geo-database/build.config.ts

This file was deleted.

8 changes: 2 additions & 6 deletions packages/geo-database/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@
".": "./src/index.ts"
},
"scripts": {
"build": "unbuild",
"db:generate": "drizzle-kit generate",
"db:migrate": "drizzle-kit migrate",
"db:push": "drizzle-kit push",
"db:studio": "drizzle-kit studio",
"clean": "rm -rf dist",
"clean:modules": "rm -rf node_modules",
"typecheck": "tsc --noEmit",
"postinstall": "pnpm build"
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@paralleldrive/cuid2": "catalog:",
Expand All @@ -28,7 +25,6 @@
"@types/pg": "catalog:",
"dotenv": "catalog:",
"drizzle-kit": "catalog:",
"typescript": "catalog:",
"unbuild": "catalog:"
"typescript": "catalog:"
}
}
Loading