autosync_backend2 1.2.7 → 1.2.8

package/dist/index.d.ts

@@ -619,7 +619,6 @@ export declare const app: Elysia<"", {
                         supplierId?: string | undefined;
                         productId?: string | undefined;
                         priceSell?: number | undefined;
-                        alias?: string | undefined;
                         ids?: string[] | undefined;
                         pagination: {
                             size: number;
@@ -784,7 +783,6 @@ export declare const app: Elysia<"", {
                             supplierId?: string | undefined;
                             productId?: string | undefined;
                             priceSell?: number | undefined;
-                            alias?: string | undefined;
                             ids?: string[] | undefined;
                             pagination: {
                                 size: number;
@@ -1031,12 +1029,7 @@ export declare const app: Elysia<"", {
                             supplierId?: string | undefined;
                             productId?: string | undefined;
                             priceSell?: number | undefined;
-                            alias?: string | undefined;
                             ids?: string[] | undefined;
-                            pagination: {
-                                size: number;
-                                page: number;
-                            };
                         } | undefined;
                         warehouseId?: string | undefined;
                         safetyStock?: number | undefined;
@@ -1199,7 +1192,6 @@ export declare const app: Elysia<"", {
                                 supplierId?: string | undefined;
                                 productId?: string | undefined;
                                 priceSell?: number | undefined;
-                                alias?: string | undefined;
                                 ids?: string[] | undefined;
                             } | undefined;
                             itemId?: string | undefined;
@@ -5527,7 +5519,10 @@ export declare const app: Elysia<"", {
                         query: unknown;
                         headers: unknown;
                         response: {
-                            200: number;
+                            200: {
+                                count: number;
+                                month: string;
+                            }[];
                             401: "Session not found";
                         };
                     };
@@ -5542,7 +5537,10 @@ export declare const app: Elysia<"", {
                         query: unknown;
                         headers: unknown;
                         response: {
-                            200: number;
+                            200: {
+                                count: number;
+                                month: string;
+                            }[];
                             401: "Session not found";
                         };
                     };
@@ -5557,7 +5555,10 @@ export declare const app: Elysia<"", {
                         query: unknown;
                         headers: unknown;
                         response: {
-                            200: number;
+                            200: {
+                                count: number;
+                                month: string;
+                            }[];
                             401: "Session not found";
                         };
                     };
@@ -5572,7 +5573,10 @@ export declare const app: Elysia<"", {
                         query: unknown;
                         headers: unknown;
                         response: {
-                            200: number;
+                            200: {
+                                amount: number;
+                                month: string;
+                            }[];
                             401: "Session not found";
                         };
                     };
@@ -5600,6 +5604,48 @@ export declare const app: Elysia<"", {
                     };
                 };
             };
+        } & {
+            dashboard: {
+                "most-sold-services": {
+                    get: {
+                        body: unknown;
+                        params: {};
+                        query: unknown;
+                        headers: unknown;
+                        response: {
+                            200: {
+                                quantity: number;
+                                service: {
+                                    id: string;
+                                    name: string;
+                                };
+                            }[];
+                            401: "Session not found";
+                        };
+                    };
+                };
+            };
+        } & {
+            dashboard: {
+                "most-sold-vehicles": {
+                    get: {
+                        body: unknown;
+                        params: {};
+                        query: unknown;
+                        headers: unknown;
+                        response: {
+                            200: {
+                                quantity: number;
+                                vehicleKind: {
+                                    id: string;
+                                    name: string;
+                                };
+                            }[];
+                            401: "Session not found";
+                        };
+                    };
+                };
+            };
         } & {
             dashboard: {
                 "daily-sales": {
@@ -5610,7 +5656,7 @@ export declare const app: Elysia<"", {
                         headers: unknown;
                         response: {
                             200: {
-                                amount: string | null;
+                                amount: number;
                                 date: string;
                             }[];
                             401: "Session not found";
@@ -6630,7 +6676,7 @@ export declare const app: Elysia<"", {
                                 companyBranchId?: string | undefined;
                                 startDate?: string | undefined;
                                 endDate?: string | undefined;
-                                groupBy: "day" | "week" | "month" | "year";
+                                groupBy: "month" | "day" | "week" | "year";
                             };
                             headers: unknown;
                             response: {
@@ -6854,7 +6900,7 @@ export declare const app: Elysia<"", {
                                     companyBranchId?: string | undefined;
                                     startDate?: string | undefined;
                                     endDate?: string | undefined;
-                                    groupBy: "day" | "week" | "month" | "year";
+                                    groupBy: "month" | "day" | "week" | "year";
                                 };
                                 headers: unknown;
                                 response: {

package/dist/index.js

@@ -146759,6 +146759,7 @@ var logic_default5 = WarehouseProductLogic;
 var WarehouseItemLogic;
 ((WarehouseItemLogic) => {
   WarehouseItemLogic.select = async (query, user2) => {
+    console.log(query);
     const filter = and(softDeletedFilter(warehouseItemTable).if(query.isActive), isNotNull(warehouseItemTable.deletedAt).if(query.isActive !== undefined && query.isActive === false), ...query.product ? [logic_default5.getFilter(query.product, user2)] : [], eq(warehouseItemTable.safetyStock, query.safetyStock ?? 0).if(query.safetyStock), ilike(warehouseItemTable.shelfNumber, `%${query.shelfNumber}%`).if(query.shelfNumber), eq(warehouseItemTable.warehouseId, query.warehouseId).if(query.warehouseId));
     const baseQuery = db_default.select({
       item: warehouseItemTable,
@@ -151065,48 +151066,69 @@ var customer_default = customerRoutes;
 var CrmDashboardLogic;
 ((CrmDashboardLogic) => {
   CrmDashboardLogic.getCarCount = async (user2) => {
-    const [result] = await db_default.select({
-      count: sql3`count(distinct ${crmCpOrderTable.vehicleId})`
-    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER")));
-    return result?.count ?? 0;
+    const result = await db_default.select({
+      count: sql3`count(distinct ${crmCpOrderTable.vehicleId})`.mapWith(Number),
+      month: sql3`date_trunc('month', ${crmCpOrderTable.createdAt})`.as("month")
+    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), sql3`${crmCpOrderTable.createdAt} >= date_trunc('month', CURRENT_DATE) - INTERVAL '1 month'`)).groupBy((t2) => t2.month);
+    return result;
   };
   CrmDashboardLogic.getCpOrderCount = async (user2) => {
-    const [result] = await db_default.select({
-      count: sql3`count(${crmCpOrderTable.id})`
-    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER")));
-    return result?.count ?? 0;
+    const result = await db_default.select({
+      count: sql3`count(${crmCpOrderTable.id})`.mapWith(Number),
+      month: sql3`date_trunc('month', ${crmCpOrderTable.createdAt})`.as("month")
+    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), sql3`${crmCpOrderTable.createdAt} >= date_trunc('month', CURRENT_DATE) - interval '1 month'`)).groupBy((t2) => t2.month);
+    return result;
   };
   CrmDashboardLogic.getCpOrderServiceCount = async (user2) => {
-    const [result] = await db_default.select({
-      count: sql3`count(${crmCpOrderTable.id})`
-    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), eq(crmCpOrderTable.type, "Service")));
-    return result?.count ?? 0;
+    const result = await db_default.select({
+      count: sql3`count(${crmCpOrderTable.id})`.mapWith(Number),
+      month: sql3`date_trunc('month', ${crmCpOrderTable.createdAt})`.as("month")
+    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), eq(crmCpOrderTable.type, "Service"), sql3`${crmCpOrderTable.createdAt} >= date_trunc('month', CURRENT_DATE) - interval '1 month'`)).groupBy((t2) => t2.month);
+    return result;
   };
   CrmDashboardLogic.getCpOrderTotalAmount = async (user2) => {
-    const [result] = await db_default.select({
-      amount: sum(crmCpOrderItemTable.priceTotal)
-    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"))).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.cpOrderId, crmCpOrderTable.id));
-    return result.amount ? +result.amount : 0;
+    const result = await db_default.select({
+      amount: sum(crmCpOrderItemTable.priceTotal).mapWith(Number),
+      month: sql3`date_trunc('month', ${crmCpOrderTable.createdAt})`.as("month")
+    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), sql3`${crmCpOrderTable.createdAt} >= date_trunc('month', CURRENT_DATE) - interval '1 month'`)).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.cpOrderId, crmCpOrderTable.id)).groupBy((t2) => t2.month);
+    return result;
   };
   CrmDashboardLogic.getMostSelledProduct = async (user2) => {
     const result = await db_default.select({
-      quantity: sum(crmCpOrderItemTable.quantity),
+      quantity: sum(crmCpOrderItemTable.quantity).mapWith(Number),
       product: {
         id: warehouseProductTable.id,
         name: warehouseProductTable.name,
         partNumber: warehouseProductTable.partNumber
       }
-    }).from(crmCpOrderTable).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.cpOrderId, crmCpOrderTable.id)).innerJoin(warehouseProductTable, eq(warehouseProductTable.id, crmCpOrderItemTable.companyProductId)).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"))).orderBy((t2) => desc(t2.quantity)).groupBy(warehouseProductTable.id, warehouseProductTable.name, warehouseProductTable.partNumber).limit(5);
-    return result.map((i2) => ({
-      ...i2,
-      quantity: i2.quantity ? +i2.quantity : 0
-    }));
+    }).from(crmCpOrderTable).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.cpOrderId, crmCpOrderTable.id)).innerJoin(warehouseProductTable, eq(warehouseProductTable.id, crmCpOrderItemTable.companyProductId)).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), sql3`${crmCpOrderTable.createdAt} >= date_trunc('month', CURRENT_DATE)`, sql3`${crmCpOrderTable.createdAt} < date_trunc('month', CURRENT_DATE) + interval '1 month'`)).orderBy((t2) => desc(t2.quantity)).groupBy(warehouseProductTable.id, warehouseProductTable.name, warehouseProductTable.partNumber).limit(5);
+    return result;
+  };
+  CrmDashboardLogic.getMostSelledService = async (user2) => {
+    const result = await db_default.select({
+      quantity: sum(crmCpOrderItemTable.quantity).mapWith(Number),
+      service: {
+        id: companyServiceKindTable.id,
+        name: companyServiceKindTable.name
+      }
+    }).from(crmCpOrderTable).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.cpOrderId, crmCpOrderTable.id)).innerJoin(companyServiceKindTable, eq(companyServiceKindTable.id, crmCpOrderItemTable.companyServiceKindId)).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), sql3`${crmCpOrderTable.createdAt} >= date_trunc('month', CURRENT_DATE)`, sql3`${crmCpOrderTable.createdAt} < date_trunc('month', CURRENT_DATE) + interval '1 month'`)).orderBy((t2) => desc(t2.quantity)).groupBy(companyServiceKindTable.id, companyServiceKindTable.name).limit(5);
+    return result;
+  };
+  CrmDashboardLogic.getMostSelledVehicleKind = async (user2) => {
+    const result = await db_default.select({
+      quantity: count(crmCpOrderTable.id).mapWith(Number),
+      vehicleKind: {
+        id: techdocVehicleKindTable.id,
+        name: techdocVehicleKindTable.name
+      }
+    }).from(crmCpOrderTable).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.cpOrderId, crmCpOrderTable.id)).innerJoin(crmVehicleTable, eq(crmVehicleTable.id, crmCpOrderTable.vehicleId)).innerJoin(techdocVehicleKindTable, eq(techdocVehicleKindTable.id, crmVehicleTable.vehicleKindId)).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), sql3`${crmCpOrderTable.createdAt} >= date_trunc('month', CURRENT_DATE)`, sql3`${crmCpOrderTable.createdAt} < date_trunc('month', CURRENT_DATE) + interval '1 month'`)).orderBy((t2) => desc(t2.quantity)).groupBy(techdocVehicleKindTable.id, techdocVehicleKindTable.name).limit(5);
+    return result;
   };
   CrmDashboardLogic.getCpOrderTotalAmountByDay = async (user2) => {
     const result = await db_default.select({
-      amount: sum(crmCpOrderItemTable.priceTotal),
-      date: sql3`date(${crmCpOrderItemTable.createdAt})`.as("day")
-    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"))).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.cpOrderId, crmCpOrderTable.id)).groupBy((t2) => t2.date);
+      amount: sum(crmCpOrderItemTable.priceTotal).mapWith(Number),
+      date: sql3`date_trunc('day', CURRENT_DATE)`.as("day")
+    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), sql3`${crmCpOrderTable.createdAt} >= date_trunc('month', CURRENT_DATE) - interval '1 month'`)).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.cpOrderId, crmCpOrderTable.id)).groupBy((t2) => t2.date);
     return result;
   };
 })(CrmDashboardLogic ||= {});
@@ -151118,7 +151140,7 @@ var dashboardRoutes = new Elysia({
   tags: ["CrmDashboard"]
 }).use(better_auth_default).guard({
   auth: true
-}).get("/car-count", async ({ user: user2 }) => logic_default16.getCarCount(user2)).get("/cp-order-count", async ({ user: user2 }) => logic_default16.getCpOrderCount(user2)).get("/cp-order-service-count", async ({ user: user2 }) => logic_default16.getCpOrderServiceCount(user2)).get("/cp-order-total-amount", async ({ user: user2 }) => logic_default16.getCpOrderTotalAmount(user2)).get("/most-sold-products", async ({ user: user2 }) => logic_default16.getMostSelledProduct(user2)).get("/daily-sales", async ({ user: user2 }) => logic_default16.getCpOrderTotalAmountByDay(user2));
+}).get("/car-count", async ({ user: user2 }) => logic_default16.getCarCount(user2)).get("/cp-order-count", async ({ user: user2 }) => logic_default16.getCpOrderCount(user2)).get("/cp-order-service-count", async ({ user: user2 }) => logic_default16.getCpOrderServiceCount(user2)).get("/cp-order-total-amount", async ({ user: user2 }) => logic_default16.getCpOrderTotalAmount(user2)).get("/most-sold-products", async ({ user: user2 }) => logic_default16.getMostSelledProduct(user2)).get("/most-sold-services", async ({ user: user2 }) => logic_default16.getMostSelledService(user2)).get("/most-sold-vehicles", async ({ user: user2 }) => logic_default16.getMostSelledVehicleKind(user2)).get("/daily-sales", async ({ user: user2 }) => logic_default16.getCpOrderTotalAmountByDay(user2));
 var dashboard_default = dashboardRoutes;
 
 // src/routes/crm/discount/model.ts
@@ -151354,7 +151376,7 @@ var CrmInspectionLogic;
         status: crmInspectionTable.status
       }
     }).from(crmInspectionTable).where(eq(crmInspectionTable.id, inspection.id)).leftJoin(companyCompanyTable, eq(companyCompanyTable.id, crmInspectionTable.companyId)).leftJoin(crmVehicleTable, eq(crmVehicleTable.id, crmInspectionTable.vehicleId)).leftJoin(techdocVehicleKindTable, eq(techdocVehicleKindTable.id, crmVehicleTable.vehicleKindId)).leftJoin(companyEmployeeTable, eq(companyEmployeeTable.id, crmInspectionTable.employeeId));
-    distribution_default.post("https://driver-partner-api.dev.ubcabtech.com/v1/webhook/autosync/inspection", {
+    distribution_default.post(env_default.NODE_ENV === "development" ? "https://driver-partner-api.dev.ubcabtech.com/v1/webhook/autosync/inspection" : "https://driver-partner-api.ubcabtech.com/v1/webhook/autosync/inspection", {
       json: result[0],
       retry: 3
     });
@@ -152828,7 +152850,6 @@ var WarehouseProductModel;
       supplierId: t.String({ format: "uuid" }),
       search: t.String(),
       priceSell: t.Number(),
-      alias: t.String(),
       productId: t.String({ format: "uuid" }),
       id: t.String({ format: "uuid" }),
       ids: t.Array(t.String({ format: "uuid" })),
@@ -152854,7 +152875,7 @@ var WarehouseItemModel;
   WarehouseItemModel.select = t.Composite([
     PaginationSchema,
     t.Partial(t.Object({
-      product: model_default22.select,
+      product: t.Omit(model_default22.select, ["pagination"]),
       shelfNumber: t.String(),
       safetyStock: t.Number(),
       warehouseId: t.String({ format: "uuid" }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autosync_backend2",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "module": "src/index.ts",
   "type": "module",
   "main": "dist/index.js",