autosync_backend2 1.2.15 → 1.2.17

package/dist/index.d.ts

@@ -1011,6 +1011,7 @@ export declare const app: Elysia<"", {
                                     warehouseId: string;
                                     productId: string;
                                     quantity: number;
+                                    quantityUnit: number;
                                     safetyStock: number;
                                     shelfNumber: string | null;
                                     description: string | null;
@@ -1088,6 +1089,7 @@ export declare const app: Elysia<"", {
                         oldId?: number | null | undefined;
                         description?: string | null | undefined;
                         quantity?: number | undefined;
+                        quantityUnit?: number | undefined;
                         shelfNumber?: string | null | undefined;
                         isOrdered?: boolean | undefined;
                         productId: string;
@@ -1108,6 +1110,7 @@ export declare const app: Elysia<"", {
                             quantity: number;
                             productId: string;
                             warehouseId: string;
+                            quantityUnit: number;
                             safetyStock: number;
                             shelfNumber: string | null;
                             isOrdered: boolean;
@@ -1132,6 +1135,7 @@ export declare const app: Elysia<"", {
                             oldId?: number | null | undefined;
                             description?: string | null | undefined;
                             quantity?: number | undefined;
+                            quantityUnit?: number | undefined;
                             shelfNumber?: string | null | undefined;
                             isOrdered?: boolean | undefined;
                             productId: string;
@@ -1223,6 +1227,7 @@ export declare const app: Elysia<"", {
                                         warehouseId: string;
                                         productId: string;
                                         quantity: number;
+                                        quantityUnit: number;
                                         safetyStock: number;
                                         shelfNumber: string | null;
                                         description: string | null;
@@ -1296,6 +1301,7 @@ export declare const app: Elysia<"", {
                                 warehouseId: string;
                                 productId: string;
                                 quantity: number;
+                                quantityUnit: number;
                                 safetyStock: number;
                                 shelfNumber: string | null;
                                 description: string | null;
@@ -1326,10 +1332,12 @@ export declare const app: Elysia<"", {
                 ":id": {
                     put: {
                         body: {
+                            deletedAt?: string | null | undefined;
                             oldId?: number | null | undefined;
                             description?: string | null | undefined;
                             productId?: string | undefined;
                             warehouseId?: string | undefined;
+                            quantityUnit?: number | undefined;
                             safetyStock?: number | undefined;
                             shelfNumber?: string | null | undefined;
                             isOrdered?: boolean | undefined;
@@ -1344,6 +1352,7 @@ export declare const app: Elysia<"", {
                                 warehouseId: string;
                                 productId: string;
                                 quantity: number;
+                                quantityUnit: number;
                                 safetyStock: number;
                                 shelfNumber: string | null;
                                 description: string | null;
@@ -7040,6 +7049,47 @@ export declare const app: Elysia<"", {
                     };
                 };
             };
+        } & {
+            reports: {
+                "cp-order": {
+                    get: {
+                        body: unknown;
+                        params: {};
+                        query: {
+                            type: "Service" | "Product";
+                        };
+                        headers: unknown;
+                        response: {
+                            200: {
+                                createdAt: string | null;
+                                orderId: string | null;
+                                phone: string | null;
+                                licensePlate: string | null;
+                                name: string | null;
+                                partNumber: string | null;
+                                employeeName: unknown;
+                                quantity: number;
+                                priceBuy: number | null;
+                                price: number;
+                                discount: unknown;
+                                priceAfterDiscount: number | null;
+                                totalPrice: unknown;
+                                totalPriceNoat: unknown;
+                            }[];
+                            401: "Session not found";
+                            422: {
+                                type: "validation";
+                                on: string;
+                                summary?: string;
+                                message?: string;
+                                found?: unknown;
+                                property?: string;
+                                expected?: string;
+                            };
+                        };
+                    };
+                };
+            };
         };
     };
 } & {

package/dist/index.js

@@ -142990,6 +142990,7 @@ var warehouseItemTable = warehouseSchema.table("item", {
   warehouseId: uuid5().notNull(),
   productId: uuid5().notNull(),
   quantity: numeric({ mode: "number" }).notNull().default(0),
+  quantityUnit: integer2().notNull().default(1),
   safetyStock: numeric({ mode: "number" }).notNull(),
   shelfNumber: varchar(),
   description: text(),
@@ -146088,7 +146089,7 @@ var requestLogger = new Elysia({ name: "Middleware.RequestLogger" }).onRequest((
     },
     query: url2.searchParams
   });
-}).onAfterResponse(async ({ request, response, server, status: status2, set: set2, body, headers }) => {
+}).onAfterResponse(async ({ request, responseValue, server, status: status2, set: set2, body, headers }) => {
   logger2.info({
     msg: "Outgoing response",
     method: request.method,
@@ -146101,8 +146102,8 @@ var requestLogger = new Elysia({ name: "Middleware.RequestLogger" }).onRequest((
       headers,
       body
     },
-    response,
-    ipAddress: headers["X-FORWARDED_FOR"] ?? server?.requestIP(request)?.address,
+    response: responseValue,
+    ipAddress: headers?.["X-FORWARDED_FOR"] ?? server?.requestIP(request)?.address,
     method: request.method,
     path: request.url,
     statusCode: set2.status?.toString() ?? "200",
@@ -147251,7 +147252,8 @@ var WarehouseItemLogic;
       return status("Bad Request", "\u0411\u0430\u0440\u0430\u0430\u043D\u044B \u04AF\u043B\u0434\u044D\u0433\u0434\u044D\u043B \u0445\u04AF\u0440\u044D\u043B\u0446\u044D\u0445\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430.");
     }
     const [updatedItem] = await tdb.update(warehouseItemTable).set({
-      quantity: quantityAfter
+      quantity: quantityAfter,
+      deletedAt: null
     }).where(eq(warehouseItemTable.id, itemId)).returning();
     await tdb.insert(warehouseItemTransactionTable).values({
       itemId,
@@ -147284,7 +147286,7 @@ var CrmCpOrderItemLogic;
 ((CrmCpOrderItemLogic) => {
   CrmCpOrderItemLogic.select = async ({ cpOrderId }) => {
     const filter = and(eq(crmCpOrderItemTable.cpOrderId, cpOrderId), softDeletedFilter(crmCpOrderItemTable));
-    const rows = await db_default.select().from(crmCpOrderItemTable).leftJoin(companyServiceKindTable, eq(companyServiceKindTable.id, crmCpOrderItemTable.companyServiceKindId)).leftJoin(warehouseProductTable, eq(warehouseProductTable.id, crmCpOrderItemTable.companyProductId)).leftJoin(crmCpOrderItemEmployeeTable, eq(crmCpOrderItemEmployeeTable.cpOrderItemId, crmCpOrderItemTable.id)).leftJoin(companyEmployeeTable, eq(companyEmployeeTable.id, crmCpOrderItemEmployeeTable.employeeId)).leftJoin(crmCpOrderSpPackageTable, eq(crmCpOrderSpPackageTable.cpOrderId, crmCpOrderItemTable.cpOrderId)).leftJoin(crmSpPackageTable, eq(crmSpPackageTable.id, crmCpOrderSpPackageTable.spPackageId)).where(filter);
+    const rows = await db_default.select().from(crmCpOrderItemTable).leftJoin(companyServiceKindTable, eq(companyServiceKindTable.id, crmCpOrderItemTable.companyServiceKindId)).leftJoin(warehouseProductTable, eq(warehouseProductTable.id, crmCpOrderItemTable.companyProductId)).leftJoin(crmCpOrderItemEmployeeTable, eq(crmCpOrderItemEmployeeTable.cpOrderItemId, crmCpOrderItemTable.id)).leftJoin(companyEmployeeTable, eq(companyEmployeeTable.id, crmCpOrderItemEmployeeTable.employeeId)).leftJoin(crmCpOrderSpPackageTable, eq(crmCpOrderSpPackageTable.id, crmCpOrderItemTable.cpOrderSpPackageId)).leftJoin(crmSpPackageTable, eq(crmSpPackageTable.id, crmCpOrderSpPackageTable.spPackageId)).where(filter);
     const result = rows.reduce((acc, row) => {
       if (!acc[row.cp_order_item.id]) {
         acc[row.cp_order_item.id] = {
@@ -147338,7 +147340,7 @@ var CrmCpOrderItemLogic;
     }
     const curr = await db_default.select({
       id: crmCpOrderItemTable.id
-    }).from(crmCpOrderItemTable).where(and(eq(crmCpOrderItemTable.cpOrderId, body.cpOrderId), eq(crmCpOrderItemTable.companyServiceKindId, body.companyServiceKindId ?? "").if(body.companyServiceKindId), eq(crmCpOrderItemTable.companyProductId, body.companyProductId ?? "").if(body.companyProductId)));
+    }).from(crmCpOrderItemTable).where(and(eq(crmCpOrderItemTable.cpOrderId, body.cpOrderId), eq(crmCpOrderItemTable.companyServiceKindId, body.companyServiceKindId ?? "").if(body.companyServiceKindId), eq(crmCpOrderItemTable.companyProductId, body.companyProductId ?? "").if(body.companyProductId), isNull2(crmCpOrderItemTable.cpOrderSpPackageId)));
     if (curr.length > 0) {
       const [updated] = await db_default.update(crmCpOrderItemTable).set({
         ...body,
@@ -147412,7 +147414,11 @@ var CrmCpOrderItemLogic;
         priceTotal: item.quantity * (item.priceUnit ?? serviceKind?.price ?? product?.product.priceSell ?? 0)
       });
     }
-    const currentValues = await db_default.select().from(crmCpOrderItemTable).where(and(eq(crmCpOrderItemTable.cpOrderId, insertValues[0].cpOrderId), or(inArray(crmCpOrderItemTable.companyProductId, insertValues.map((i2) => i2.companyProductId).filter((i2) => !!i2)), inArray(crmCpOrderItemTable.companyServiceKindId, insertValues.map((i2) => i2.companyServiceKindId).filter((i2) => !!i2)))));
+    const currentValues = await db_default.select().from(crmCpOrderItemTable).where(and(eq(crmCpOrderItemTable.cpOrderId, insertValues[0].cpOrderId), or(...insertValues.map((i2) => {
+      if (!i2.companyProductId && !i2.companyServiceKindId)
+        return null;
+      return and(eq(crmCpOrderItemTable.companyProductId, i2.companyProductId).if(i2.companyProductId), eq(crmCpOrderItemTable.companyServiceKindId, i2.companyServiceKindId).if(i2.companyServiceKindId), i2.cpOrderSpPackageId ? eq(crmCpOrderItemTable.cpOrderSpPackageId, i2.cpOrderSpPackageId) : isNull2(crmCpOrderItemTable.cpOrderSpPackageId));
+    }).filter((i2) => !!i2))));
     if (currentValues.length > 0) {
       return status("Bad Request", "\u0411\u043E\u0440\u043B\u0443\u0443\u043B\u0430\u043B\u0442\u044B\u043D \u04AF\u0439\u043B\u0447\u0438\u043B\u0433\u044D\u044D \u044D\u0441\u0432\u044D\u043B \u0431\u0430\u0440\u0430\u0430 \u0430\u043B\u044C \u0445\u044D\u0434\u0438\u0439\u043D \u043E\u0440\u0441\u043E\u043D \u0431\u0430\u0439\u043D\u0430.");
     }
@@ -152208,7 +152214,7 @@ var CrmReportsLogic;
     ]);
     return formatCSV(headers, rows);
   };
-  CrmReportsLogic.cpOrderReport = async () => {
+  CrmReportsLogic.cpOrderReport = async (query, user2) => {
     const result = await db_default.select({
       createdAt: crmCpOrderTable.createdAt,
       orderId: crmCpOrderTable.orderId,
@@ -152224,7 +152230,7 @@ var CrmReportsLogic;
       priceAfterDiscount: crmDiscountApplyTable.priceAfterDiscount,
       totalPrice: sql3`CASE WHEN ${crmCpOrderTable.isNoat} = FALSE THEN ${crmCpOrderItemTable.priceTotal} ELSE 0 END`.as("total_price"),
       totalPriceNoat: sql3`CASE WHEN ${crmCpOrderTable.isNoat} = TRUE THEN ${crmCpOrderItemTable.priceTotal} * 1.1 ELSE 0 END`.as("total_price_noat")
-    }).from(crmCpOrderItemTable).leftJoin(crmCpOrderTable, eq(crmCpOrderTable.id, crmCpOrderItemTable.cpOrderId)).leftJoin(crmCustomerTable, eq(crmCustomerTable.id, crmCpOrderTable.customerId)).leftJoin(crmVehicleTable, eq(crmVehicleTable.id, crmCpOrderTable.vehicleId)).leftJoin(warehouseProductTable, eq(warehouseProductTable.productId, crmCpOrderItemTable.companyProductId)).leftJoin(companyServiceKindTable, eq(companyServiceKindTable.id, crmCpOrderItemTable.companyServiceKindId)).leftJoin(crmCpOrderItemEmployeeTable, eq(crmCpOrderItemEmployeeTable.cpOrderItemId, crmCpOrderItemTable.id)).leftJoin(companyEmployeeTable, eq(companyEmployeeTable.id, crmCpOrderItemEmployeeTable.employeeId)).leftJoin(crmDiscountApplyTable, eq(crmDiscountApplyTable.cpOrderItemId, crmCpOrderItemTable.id)).groupBy((t2) => [
+    }).from(crmCpOrderItemTable).leftJoin(crmCpOrderTable, eq(crmCpOrderTable.id, crmCpOrderItemTable.cpOrderId)).leftJoin(crmCustomerTable, eq(crmCustomerTable.id, crmCpOrderTable.customerId)).leftJoin(crmVehicleTable, eq(crmVehicleTable.id, crmCpOrderTable.vehicleId)).leftJoin(warehouseProductTable, eq(warehouseProductTable.productId, crmCpOrderItemTable.companyProductId)).leftJoin(companyServiceKindTable, eq(companyServiceKindTable.id, crmCpOrderItemTable.companyServiceKindId)).leftJoin(crmCpOrderItemEmployeeTable, eq(crmCpOrderItemEmployeeTable.cpOrderItemId, crmCpOrderItemTable.id)).leftJoin(companyEmployeeTable, eq(companyEmployeeTable.id, crmCpOrderItemEmployeeTable.employeeId)).leftJoin(crmDiscountApplyTable, eq(crmDiscountApplyTable.cpOrderItemId, crmCpOrderItemTable.id)).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), isNotNull(crmCpOrderItemTable.companyProductId).if(query.type === "Product"), isNotNull(crmCpOrderItemTable.companyServiceKindId).if(query.type === "Service"))).groupBy((t2) => [
       t2.createdAt,
       t2.orderId,
       t2.phone,
@@ -152325,6 +152331,12 @@ var CrmReportsModel;
       totalPages: t.Number()
     })
   });
+  CrmReportsModel.cpOrderReport = t.Object({
+    type: t.UnionEnum(["Product", "Service"])
+  });
+  CrmReportsModel.cpOrderEmployeeReport = t.Object({
+    employeeId: t.String({ format: "uuid" })
+  });
 })(CrmReportsModel ||= {});
 var model_default14 = CrmReportsModel;
 
@@ -152379,6 +152391,8 @@ var reportsRoutes = new Elysia({
   return csvData;
 }, {
   query: model_default14.csvExportQuery
+}).get("/cp-order", ({ query, user: user2 }) => logic_default18.cpOrderReport(query, user2), {
+  query: model_default14.cpOrderReport
 });
 var reports_default = reportsRoutes;
 
@@ -153360,7 +153374,10 @@ var WarehouseItemModel;
   const createSchema = createInsertSchema(warehouseItemTable);
   const updateSchema = createUpdateSchema(warehouseItemTable);
   WarehouseItemModel.create = OmitBaseSchema(createSchema);
-  WarehouseItemModel.update = t.Omit(OmitBaseSchema(updateSchema), ["quantity"]);
+  WarehouseItemModel.update = t.Composite([
+    t.Omit(OmitBaseSchema(updateSchema), ["quantity"]),
+    t.Pick(updateSchema, ["deletedAt"])
+  ]);
   WarehouseItemModel.createMany = t.Array(WarehouseItemModel.create, {
     minItems: 1
   });

package/package.json

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