chore: some math (#27)

Author: hmbanan666

apps/web-app/app/components/chart/KitchenRevenue.client.vue

@@ -20,11 +20,12 @@
       <VisLine
         :x="x"
         :y="y"
-        color="var(--ui-secondary)"
+        :color="color"
+        :line-dash-array="lineDashArray"
       />
       <VisArea
         :x="x"
-        :y="y"
+        :y="yArea"
         color="var(--ui-secondary)"
         :opacity="0.1"
       />
@@ -55,12 +56,13 @@ type DataRecord = {
   date: Date
   total: number
   checks: number
+  commonTotal: number
 }
 
 const { period, range, values } = defineProps<{
   period: Period
   range: Range
-  values: { date: string, total: number, checks: number }[]
+  values: { date: string, total: number, checks: number, commonTotal: number }[]
 }>()
 
 const cardRef = useTemplateRef<HTMLElement | null>('cardRef')
@@ -84,12 +86,20 @@ watch([() => period, () => range, () => values], () => {
       date,
       total: value?.total ?? 0,
       checks: value?.checks ?? 0,
+      commonTotal: value?.commonTotal ?? 0,
     }
   })
 }, { immediate: true })
 
 const x = (_: DataRecord, i: number) => i
-const y = (d: DataRecord) => d.total
+const y = [
+  (d: DataRecord) => d.total,
+  (d: DataRecord) => d.commonTotal,
+]
+const yArea = (d: DataRecord) => d.total
+
+const color = (_: DataRecord, i: number) => ['var(--ui-secondary)', 'var(--ui-secondary)'][i]
+const lineDashArray = (_: DataRecord, i: number) => [i === 0 ? undefined : 4]
 
 const total = computed(() => data.value.reduce((acc: number, { total }) => acc + total, 0))
 
@@ -111,7 +121,7 @@ function xTicks(i: number) {
   return formatDate(data.value[i].date)
 }
 
-const template = (d: DataRecord) => `${formatDate(d.date)}: ${formatNumber(d.total)}, ${d.checks} ${pluralizationRu(d.checks, ['чек', 'чека', 'чеков'])}`
+const template = (d: DataRecord) => `${formatDate(d.date)}, ${format(d.date, 'eeeeee', { locale: ru })}: ${d.checks} ${pluralizationRu(d.checks, ['чек', 'чека', 'чеков'])}<br> Выручка: ${formatNumber(d.total)}<br> Средняя: ${formatNumber(d.commonTotal)}`
 </script>
 
 <style scoped>

apps/web-app/nuxt.config.ts

@@ -37,7 +37,7 @@ export default defineNuxtConfig({
       tasks: true,
     },
     scheduledTasks: {
-      '* * * * *': ['task:auto-create', 'kitchen:average-update'], // Every minute
+      '* * * * *': ['task:auto-create'], // Every minute
       '0 * * * *': ['kitchen:revenue-update'], // Every hour
       '0 0 * * *': ['kitchen:rating-update'], // Every day
     },

apps/web-app/server/api/kitchen/revenue/iiko-daily.post.ts

@@ -121,7 +121,7 @@ async function parseFileAndUpdateData(file: MultiPartData) {
     })
   }
 
-  const parsedKitchens: { name: string, total: number, checks: number }[] = []
+  const parsedKitchens: { name: string, total: number, checks: number, averageCheck: number, commonAverageCheck: number, commonTotal: number }[] = []
 
   for (const row of dataRows) {
     const name = row[indexOfName]
@@ -132,13 +132,27 @@ async function parseFileAndUpdateData(file: MultiPartData) {
       continue
     }
 
+    const averageCheck = Math.round(total / checks)
+
     parsedKitchens.push({
       name,
       total,
       checks,
+      averageCheck,
+      commonAverageCheck: 0,
+      commonTotal: 0,
     })
   }
 
+  // Update common data
+  const commonAverageCheck = Math.round(parsedKitchens.reduce((acc, curr) => acc + curr.averageCheck, 0) / parsedKitchens.length)
+  const commonTotal = Math.round(parsedKitchens.reduce((acc, curr) => acc + curr.total, 0) / parsedKitchens.length)
+
+  for (const kitchen of parsedKitchens) {
+    kitchen.commonAverageCheck = commonAverageCheck
+    kitchen.commonTotal = commonTotal
+  }
+
   // Every kitchen: find in DB and add amount for this day
   const kitchens = await repository.kitchen.list()
   let rowsUpdated = 0
@@ -155,11 +169,17 @@ async function parseFileAndUpdateData(file: MultiPartData) {
           date: dateOnly,
           total: kitchen.total,
           checks: kitchen.checks,
+          averageCheck: kitchen.averageCheck,
+          commonAverageCheck: kitchen.commonAverageCheck,
+          commonTotal: kitchen.commonTotal,
         })
       } else {
         await repository.kitchen.updateRevenue(revenue.id, {
           total: kitchen.total,
           checks: kitchen.checks,
+          averageCheck: kitchen.averageCheck,
+          commonAverageCheck: kitchen.commonAverageCheck,
+          commonTotal: kitchen.commonTotal,
         })
       }
 

apps/web-app/server/tasks/kitchen/average-update.ts

@@ -9,18 +9,11 @@ export default defineTask({
     try {
       const revenuesToUpdate = await repository.kitchen.listRevenuesToUpdate()
       for (const revenue of revenuesToUpdate) {
-        // Average check
-        const averageCheck = Math.round(revenue.total / revenue.checks)
-
         // common
         const allRevenuesThisPeriod = await repository.kitchen.listRevenuesForDate(revenue.date)
         const commonAverageCheck = Math.round(allRevenuesThisPeriod.reduce((acc, curr) => acc + curr.averageCheck, 0) / allRevenuesThisPeriod.length)
-        const commonTotal = Math.round(allRevenuesThisPeriod.reduce((acc, curr) => acc + curr.total, 0) / allRevenuesThisPeriod.length)
-
         await repository.kitchen.updateRevenue(revenue.id, {
-          averageCheck,
           commonAverageCheck,
-          commonTotal,
         })
       }
     } catch (error) {

apps/web-app/server/tasks/kitchen/revenue-update.ts

@@ -1,8 +1,6 @@
 import { repository } from '@roll-stack/database'
 import { endOfWeek, startOfWeek } from 'date-fns'
 
-const logger = useLogger('kitchen:revenue-update')
-
 export default defineTask({
   meta: {
     name: 'kitchen:revenue-update',
@@ -19,12 +17,13 @@ export default defineTask({
       const thisMonday = startOfWeek(utcNow, { weekStartsOn: 1 })
       const thisSunday = endOfWeek(utcNow, { weekStartsOn: 1 })
 
-      logger.log(thisMonday, thisSunday)
-
       for (const kitchen of kitchens) {
         const revenues = await repository.kitchen.listRevenuesByKitchenForPeriod(kitchen.id, thisMonday, thisSunday)
 
-        const revenueForThisWeek = revenues.reduce((acc, curr) => acc + curr.total, 0)
+        const revenueForThisWeek = Math.round(revenues.reduce((acc, curr) => acc + curr.total, 0))
+        if (revenueForThisWeek === kitchen.revenueForThisWeek) {
+          continue
+        }
 
         await repository.kitchen.update(kitchen.id, {
           revenueForThisWeek,

packages/database/src/repository/kitchen.ts

@@ -66,8 +66,7 @@ export class Kitchen {
   static async listRevenuesToUpdate() {
     return useDatabase().query.kitchenRevenues.findMany({
       where: (revenues, { eq, or }) => or(
-        eq(revenues.averageCheck, 0),
-        eq(revenues.commonTotal, 0),
+        eq(revenues.commonAverageCheck, 0),
       ),
       limit: 50,
     })