Merge pull request #50 from akbarsaputrait/fix-49

[FIX #49] Owner - Chart sales & orders

Author: akbarsaputrait

src/app.controller.ts

@@ -1,8 +1,6 @@
 import { Quero } from '@core/decorators/quero.decorator';
-import { Owner } from '@db/entities/owner/owner.entity';
 import base64url from '@lib/helpers/base64.helper';
 import { config } from '@lib/helpers/config.helper';
-import AppDataSource from '@lib/typeorm/datasource.typeorm';
 import { Controller, Get, Res } from '@nestjs/common';
 import * as fs from 'fs';
 import { lookup } from 'mime-types';
@@ -12,9 +10,6 @@ import * as path from 'path';
 export class AppController {
   @Get()
   async getHello(@Res() response) {
-    const check = await AppDataSource.createQueryBuilder(Owner, 't1').getCount();
-    console.log({ check });
-
     return response.send('Ordero API V2');
   }
 

src/app/customer/order/order.controller.ts

@@ -101,6 +101,9 @@ export class OrderController {
             orderProduct = checkOrderProduct;
           }
 
+          stock.allocated += product.qty;
+          await manager.getRepository(ProductStock).save(stock);
+
           orderProduct.order_id = order.id;
           orderProduct.product_variant_id = variant.id;
           orderProduct.qty = product.qty;
@@ -112,9 +115,11 @@ export class OrderController {
         }
 
         // Updare Order Number
+        const totalPrice = orderedProducts.reduce((price, a) => price + a.price, 0);
         await manager.getRepository(Order).update(order.id, {
           number: sequenceNumber(order.uid),
-          gross_total: orderedProducts.reduce((price, a) => price + a.price, 0),
+          gross_total: totalPrice,
+          net_total: totalPrice,
         });
 
         table.status = TableStatus.InUse;

src/app/owner/restaurant/dashboard/dashboard.controller.ts

@@ -30,6 +30,25 @@ export class DashboardController {
     return response.data({ id: uuid(), data });
   }
 
+  @Get('orders/chart')
+  @Permissions(`${PermOwner.Dashboard}@${PermAct.R}`)
+  async orderChart(@Rest() rest, @Loc() loc: Location, @Res() response) {
+    const query = AppDataSource.createQueryBuilder(Order, 't1')
+      .where({ restaurant_id: rest.id })
+      .groupBy('t1.created_at')
+      .selectWithAlias(['_IFNULL(COUNT(t1.id), 0) AS total_order', 'created_at']);
+
+    if (loc) {
+      query.andWhere({ location_id: loc.id });
+    }
+    const orders = await query.search().dateRange().getRawMany();
+
+    const { start, end } = AppDataSource.createQueryBuilder(Order, 't1').dateRange().getParameters();
+    const results = await getChartData({ start, end }, orders, 'total_order');
+
+    return response.data(results);
+  }
+
   @Get('sales/total')
   @Permissions(`${PermOwner.Dashboard}@${PermAct.R}`)
   async salesTotal(@Rest() rest, @Loc() loc: Location, @Res() response) {
@@ -56,7 +75,7 @@ export class DashboardController {
       .where({ restaurant_id: rest.id })
       .andWhere('t1.status = :status', { status: OrderStatus.Completed })
       .groupBy('t1.created_at')
-      .selectWithAlias(['_IFNULL(SUM(t1.net_total),0) AS net_total', 'created_at']);
+      .selectWithAlias(['_IFNULL(SUM(t1.net_total), 0) AS net_total', 'created_at']);
 
     if (loc) {
       query.andWhere({ location_id: loc.id });

src/app/staff/profile/profile.controller.ts

@@ -22,7 +22,6 @@ export class StaffProfileController {
   @UseGuards(StaffGuard)
   @Permissions(`${PermStaff.Profile}@${PermAct.R}`)
   async me(@Me() me: StaffUser, @Res() response) {
-    console.log(me);
     return response.item(me, StaffTransformer);
   }
 

src/core/guards/owner.guard.ts

@@ -75,7 +75,6 @@ export class OwnerGuard implements CanActivate {
     const request = context.switchToHttp().getRequest();
 
     const permissions = this.reflector.get<string[]>('Permissions', context.getHandler());
-    console.log({ permissions });
     if (!permissions) {
       throw new GuardException('Bad permission');
     }

src/core/guards/staff.guard.ts

@@ -10,7 +10,6 @@ import { Reflector } from '@nestjs/core';
 import { get } from 'lodash';
 
 const validateRestaurant = async (request: any) => {
-  console.log(request);
   const user: StaffUser = request.user;
   if (!user) {
     throw new TokenException('Getting user was failed');

src/database/seeds/dump/initial.sql

@@ -10,8 +10,26 @@ VALUES
 	(
 		'01EP4ZDWCZCHVFA1ZHV13YGRJZ',
 		'owner',
-		'[\"owner_role@read\", \"owner_role@create\", \"owner_role@update\", \"owner_role@delete\", \"owner_restaurant@read\", \"owner_restaurant@create\", \"owner_restaurant@update\", \"owner_restaurant@delete\", \"owner_profile@read\", \"owner_profile@create\", \"owner_profile@update\", \"owner_profile@delete\", \"owner_staff@read\", \"owner_staff@create\", \"owner_staff@update\", \"owner_staff@delete\", \"owner_location@read\", \"owner_location@create\", \"owner_location@update\", \"owner_location@delete\", \"owner_table@read\", \"owner_table@create\", \"owner_table@update\", \"owner_table@delete\", \"owner_category@read\", \"owner_category@create\", \"owner_category@update\", \"owner_category@delete\", \"owner_variant@read\", \"owner_variant@create\", \"owner_variant@update\", \"owner_variant@delete\", \"owner_product@read\", \"owner_product@create\", \"owner_product@update\", \"owner_product@delete\", \"owner_stock@read\", \"owner_stock@create\", \"owner_stock@update\", \"owner_stock@delete\", \"owner_order@read\", \"owner_order@create\", \"owner_order@update\", \"owner_order@delete\", \"owner_dashboard@read\", \"owner_dashboard@create\", \"owner_dashboard@update\", \"owner_dashboard@delete\"]'
-		'2023-01-06 16:00:00.501148'
+		'[\"owner_role@read\", \"owner_role@create\", \"owner_role@update\", \"owner_role@delete\", \"owner_restaurant@read\", \"owner_restaurant@create\", \"owner_restaurant@update\", \"owner_restaurant@delete\", \"owner_profile@read\", \"owner_profile@create\", \"owner_profile@update\", \"owner_profile@delete\", \"owner_staff@read\", \"owner_staff@create\", \"owner_staff@update\", \"owner_staff@delete\", \"owner_location@read\", \"owner_location@create\", \"owner_location@update\", \"owner_location@delete\", \"owner_table@read\", \"owner_table@create\", \"owner_table@update\", \"owner_table@delete\", \"owner_category@read\", \"owner_category@create\", \"owner_category@update\", \"owner_category@delete\", \"owner_variant@read\", \"owner_variant@create\", \"owner_variant@update\", \"owner_variant@delete\", \"owner_product@read\", \"owner_product@create\", \"owner_product@update\", \"owner_product@delete\", \"owner_stock@read\", \"owner_stock@create\", \"owner_stock@update\", \"owner_stock@delete\", \"owner_order@read\", \"owner_order@create\", \"owner_order@update\", \"owner_order@delete\", \"owner_dashboard@read\", \"owner_dashboard@create\", \"owner_dashboard@update\", \"owner_dashboard@delete\"]' '2023-01-06 16:00:00.501148'
+	);
+
+INSERT INTO
+	`staff_role` (
+		`id`,
+		`created_at`,
+		`updated_at`,
+		`slug`,
+		`permissions`,
+		`is_default`
+	)
+VALUES
+	(
+		'01J1QHZNYKXAFHTAX7WX1Z3K1W',
+		'2024-07-01 23:41:25.000000',
+		'2024-08-10 20:34:01.173032',
+		'cashier',
+		'[\"staff_role@read\", \"staff_restaurant@read\", \"staff_restaurant@create\", \"staff_restaurant@update\", \"staff_restaurant@delete\", \"staff_profile@read\", \"staff_profile@create\", \"staff_profile@update\", \"staff_profile@delete\", \"staff_staff@read\", \"staff_staff@update\", \"staff_location@read\", \"staff_location@create\", \"staff_location@update\", \"staff_location@delete\", \"staff_table@read\", \"staff_table@create\", \"staff_table@update\", \"staff_table@delete\", \"staff_category@read\", \"staff_category@create\", \"staff_category@update\", \"staff_category@delete\", \"staff_variant@read\", \"staff_variant@create\", \"staff_variant@update\", \"staff_variant@delete\", \"staff_product@read\", \"staff_product@create\", \"staff_product@update\", \"staff_product@delete\", \"staff_stock@read\", \"staff_stock@create\", \"staff_stock@update\", \"staff_stock@delete\", \"staff_order@read\", \"staff_order@create\", \"staff_order@update\", \"staff_order@delete\", \"staff_dashboard@read\", \"staff_dashboard@create\", \"staff_dashboard@update\", \"staff_dashboard@delete\"]',
+		1
 	);
 
 --
@@ -35,7 +53,7 @@ VALUES
 	(
 		'01F2KFTXZNS01CJQCGNPJKXA1N',
 		'Yudha',
-		'owner@yuppey.com',
+		'owner@shimy.com',
 		'+6281931006841',
 		'$2a$10$9/R3pR5rP1gnnG0n06pbEORY39fXfuJ2.eJkdqvoi5oDScm1gcHRi',
 		NULL,

src/library/helpers/utils.helper.ts

@@ -257,7 +257,7 @@ export const getChartData = async (
   { start, end }: { start: Date; end: Date },
   data: any[],
   columnName: string
-): Promise<{ id: string; count: number; total: number; label: string }[]> => {
+): Promise<{ id: string; count: number; total: number; label: string; labelType: 'daily' | 'hourly' }[]> => {
   start =
     start ||
     time(Math.min(...data.map((v) => v.created_at)))
@@ -279,12 +279,13 @@ export const getChartData = async (
     const groupedData = groupBy(data, (o) => time(o.created_at).format(formatTime));
     const label = timeCounter.format(formatTime);
     const total = groupedData[label]?.reduce((prevValue, data) => prevValue + Number(data[columnName]), 0) || 0;
-    const otbCount = groupedData[label]?.length || 0;
+    const dataCount = groupedData[label]?.length || 0;
     const result = {
       id: uuid(),
-      count: otbCount,
+      count: dataCount,
       total,
-      label,
+      label: timeCounter,
+      labelType: timeDiffType,
     };
 
     results.push(result);