autosync_backend2 1.1.61 → 1.1.63

package/dist/index.d.ts

@@ -5135,6 +5135,45 @@ export declare const app: Elysia<"", {
                     };
                 };
             };
+        } & {
+            customer: {
+                post: {
+                    body: {
+                        email?: string | null | undefined;
+                        companyId?: string | null | undefined;
+                        firstname?: string | null | undefined;
+                        lastname?: string | null | undefined;
+                        regNum?: string | null | undefined;
+                        phoneNumber: string;
+                    };
+                    params: {};
+                    query: unknown;
+                    headers: unknown;
+                    response: {
+                        200: {
+                            id: string;
+                            email: string | null;
+                            createdAt: string;
+                            updatedAt: string;
+                            companyId: string | null;
+                            deletedAt: string | null;
+                            firstname: string | null;
+                            lastname: string | null;
+                            phoneNumber: string;
+                            regNum: string | null;
+                        };
+                        422: {
+                            type: "validation";
+                            on: string;
+                            summary?: string;
+                            message?: string;
+                            found?: unknown;
+                            property?: string;
+                            expected?: string;
+                        };
+                    };
+                };
+            };
         } & {
             customer: {
                 ":id": {
@@ -5705,7 +5744,7 @@ export declare const app: Elysia<"", {
                     query: {
                         search?: string | undefined;
                         licensePlate?: string | undefined;
-                        status?: string | undefined;
+                        status?: "CREATED" | "APPROVED" | "CANCELLED" | undefined;
                         pagination: {
                             size: number;
                             page: number;

package/dist/index.js

@@ -102848,7 +102848,7 @@ var mirror = (schema, property, instruction) => {
     if (v += `if(${key}===undefined`, instruction.unionKeys[key])
       v += `||x${prop}===undefined`;
     let shouldQuestion = prop.charCodeAt(0) !== 63 && schema.type !== "array";
-    v += `)delete x${shouldQuestion ? "?" : ""}${prop}
+    v += `)delete x${shouldQuestion ? prop.charCodeAt(0) === 91 ? "?." : "?" : ""}${prop}
 `;
   }
   return `${v}return x`;
@@ -103309,9 +103309,9 @@ var getSchemaValidator = (s, { models = {}, dynamic = false, modules, normalize
     try {
       compiled.Clean = createMirror(schema, { TypeCompiler, sanitize: sanitize2?.(), modules });
     } catch (error2) {
-      console.warn("Failed to create exactMirror. Please report the following code to https://github.com/elysiajs/elysia/issues"), console.warn(schema), compiled.Clean = createCleaner(schema);
+      console.warn("Failed to create exactMirror. Please report the following code to https://github.com/elysiajs/elysia/issues"), console.dir(schema, { depth: null }), compiled.Clean = createCleaner(schema);
     }
-  else
+  else if (normalize === "typebox")
     compiled.Clean = createCleaner(schema);
   return compiled.parse = (v) => {
     try {
@@ -103427,8 +103427,8 @@ var coercePrimitiveRoot = () => {
     _coercePrimitiveRoot = [{ from: t.Number(), to: (options) => t.Numeric(options), rootOnly: true }, { from: t.Boolean(), to: (options) => t.BooleanString(options), rootOnly: true }];
   return _coercePrimitiveRoot;
 };
-var getCookieValidator = ({ validator, modules, defaultConfig = {}, config, dynamic, models, validators, sanitize: sanitize2 }) => {
-  let cookieValidator = getSchemaValidator(validator, { modules, dynamic, models, additionalProperties: true, coerce: true, additionalCoerce: stringToStructureCoercions(), validators, sanitize: sanitize2 });
+var getCookieValidator = ({ validator, modules, defaultConfig = {}, config, dynamic, normalize = false, models, validators, sanitize: sanitize2 }) => {
+  let cookieValidator = getSchemaValidator(validator, { modules, dynamic, models, normalize, additionalProperties: true, coerce: true, additionalCoerce: stringToStructureCoercions(), validators, sanitize: sanitize2 });
   if (cookieValidator)
     cookieValidator.config = mergeCookie(cookieValidator.config, config);
   else
@@ -104073,7 +104073,7 @@ c=transformed}`;
       }
     }
     if (validator.cookie) {
-      let cookieValidator = getCookieValidator({ modules: app.definitions.typebox, validator: validator.cookie, defaultConfig: app.config.cookie, dynamic: !!app.config.aot, config: validator.cookie?.config ?? {}, models: app.definitions.type });
+      let cookieValidator = getCookieValidator({ modules: app.definitions.typebox, validator: validator.cookie, defaultConfig: app.config.cookie, dynamic: !!app.config.aot, config: validator.cookie?.config ?? {}, normalize: app.config.normalize, models: app.definitions.type });
       if (fnLiteral += `const cookieValue={}
 for(const [key,value] of Object.entries(c.cookie))cookieValue[key]=value.value
 `, cookieValidator.hasDefault)
@@ -104371,7 +104371,7 @@ var composeGeneralHandler = (app) => {
 `;
   let afterResponse = `c.error=notFound
 `;
-  if (app.event.afterResponse?.length) {
+  if (app.event.afterResponse?.length && !app.event.error) {
     let prefix = app.event.afterResponse.some(isAsync) ? "async" : "";
     afterResponse += `
 setImmediate(${prefix}()=>{`;
@@ -104499,8 +104499,7 @@ error.message=error.response}`, adapter.declare)
 `;
       if (fnLiteral += "if(skipGlobal!==true){", hasReturn(handler)) {
         fnLiteral += `_r=${response}
-if(_r!==undefined){if(_r instanceof Response)return mapResponse(_r,set${adapter.mapResponseContext})
-if(_r instanceof ElysiaCustomStatusResponse){error.status=error.code
+if(_r!==undefined){if(_r instanceof Response){` + afterResponse() + `return mapResponse(_r,set${adapter.mapResponseContext})}if(_r instanceof ElysiaCustomStatusResponse){error.status=error.code
 error.message = error.response}if(set.status===200||!set.status)set.status=error.status
 `;
         let mapResponseReporter2 = report("mapResponse", { total: hooks.mapResponse?.length, name: "context" });
@@ -104510,7 +104509,7 @@ error.message = error.response}if(set.status===200||!set.status)set.status=error
             fnLiteral += `context.response=_r_r=${isAsyncName(mapResponse3) ? "await " : ""}onMapResponse[${i22}](context)
 `, endUnit();
           }
-        mapResponseReporter2.resolve(), fnLiteral += `return mapResponse(${saveResponse}_r,set${adapter.mapResponseContext})}`;
+        mapResponseReporter2.resolve(), fnLiteral += afterResponse() + `return mapResponse(${saveResponse}_r,set${adapter.mapResponseContext})}`;
       } else
         fnLiteral += response;
       fnLiteral += "}";
@@ -105462,7 +105461,7 @@ class Elysia {
     let instanceValidator = this.validator.getCandidate(), cloned = { body: localHook?.body ?? instanceValidator?.body, headers: localHook?.headers ?? instanceValidator?.headers, params: localHook?.params ?? instanceValidator?.params, query: localHook?.query ?? instanceValidator?.query, cookie: localHook?.cookie ?? instanceValidator?.cookie, response: localHook?.response ?? instanceValidator?.response }, shouldPrecompile = this.config.precompile === true || typeof this.config.precompile === "object" && this.config.precompile.compose === true, createValidator = () => {
       let models = this.definitions.type, dynamic = !this.config.aot, normalize = this.config.normalize, modules = this.definitions.typebox, sanitize2 = () => this.config.sanitize, cookieValidator = () => {
         if (cloned.cookie || standaloneValidators.find((x2) => x2.cookie))
-          return getCookieValidator({ modules, validator: cloned.cookie, defaultConfig: this.config.cookie, config: cloned.cookie?.config ?? {}, dynamic, models, validators: standaloneValidators.map((x2) => x2.cookie), sanitize: sanitize2 });
+          return getCookieValidator({ modules, validator: cloned.cookie, defaultConfig: this.config.cookie, normalize, config: cloned.cookie?.config ?? {}, dynamic, models, validators: standaloneValidators.map((x2) => x2.cookie), sanitize: sanitize2 });
       };
       return shouldPrecompile ? { body: getSchemaValidator(cloned.body, { modules, dynamic, models, normalize, additionalCoerce: coercePrimitiveRoot(), validators: standaloneValidators.map((x2) => x2.body), sanitize: sanitize2 }), headers: getSchemaValidator(cloned.headers, { modules, dynamic, models, additionalProperties: true, coerce: true, additionalCoerce: stringToStructureCoercions(), validators: standaloneValidators.map((x2) => x2.headers), sanitize: sanitize2 }), params: getSchemaValidator(cloned.params, { modules, dynamic, models, coerce: true, additionalCoerce: stringToStructureCoercions(), validators: standaloneValidators.map((x2) => x2.params), sanitize: sanitize2 }), query: getSchemaValidator(cloned.query, { modules, dynamic, models, normalize, coerce: true, additionalCoerce: stringToStructureCoercions(), validators: standaloneValidators.map((x2) => x2.query), sanitize: sanitize2 }), cookie: cookieValidator(), response: getResponseSchemaValidator(cloned.response, { modules, dynamic, models, normalize, validators: standaloneValidators.map((x2) => x2.response), sanitize: sanitize2 }) } : { createBody() {
         if (this.body)
@@ -105471,15 +105470,15 @@ class Elysia {
       }, createHeaders() {
         if (this.headers)
           return this.headers;
-        return this.headers = getSchemaValidator(cloned.headers, { modules, dynamic, models, additionalProperties: !normalize, coerce: true, additionalCoerce: stringToStructureCoercions(), validators: standaloneValidators.map((x2) => x2.headers), sanitize: sanitize2 });
+        return this.headers = getSchemaValidator(cloned.headers, { modules, dynamic, models, normalize, additionalProperties: !normalize, coerce: true, additionalCoerce: stringToStructureCoercions(), validators: standaloneValidators.map((x2) => x2.headers), sanitize: sanitize2 });
       }, createParams() {
         if (this.params)
           return this.params;
-        return this.params = getSchemaValidator(cloned.params, { modules, dynamic, models, coerce: true, additionalCoerce: stringToStructureCoercions(), validators: standaloneValidators.map((x2) => x2.params), sanitize: sanitize2 });
+        return this.params = getSchemaValidator(cloned.params, { modules, dynamic, models, normalize, coerce: true, additionalCoerce: stringToStructureCoercions(), validators: standaloneValidators.map((x2) => x2.params), sanitize: sanitize2 });
       }, createQuery() {
         if (this.query)
           return this.query;
-        return this.query = getSchemaValidator(cloned.query, { modules, dynamic, models, coerce: true, additionalCoerce: stringToStructureCoercions(), validators: standaloneValidators.map((x2) => x2.query), sanitize: sanitize2 });
+        return this.query = getSchemaValidator(cloned.query, { modules, dynamic, models, normalize, coerce: true, additionalCoerce: stringToStructureCoercions(), validators: standaloneValidators.map((x2) => x2.query), sanitize: sanitize2 });
       }, createCookie() {
         if (this.cookie)
           return this.cookie;
@@ -151971,6 +151970,11 @@ var logic_default5 = CrmCpOrderItemLogic;
 // src/routes/crm/customer/logic.ts
 var CrmCustomerLogic;
 ((CrmCustomerLogic) => {
+  CrmCustomerLogic.create = async (body) => {
+    const [result] = await db_default.insert(crmCustomerTable).values(body).returning();
+    await redis_client_default.set(`crm_customer:${body.phoneNumber}`, result);
+    return result;
+  };
   CrmCustomerLogic.findOrCreate = async (body, tdb = db_default) => {
     const cachedCustomer = await redis_client_default.get(`crm_customer:${body.phoneNumber}`);
     if (cachedCustomer) {
@@ -154215,7 +154219,8 @@ var CrmVehicleLogic;
   CrmVehicleLogic.create = async (body, user2) => {
     const vehicle = await CrmVehicleLogic.findOrCreate(body);
     await db_default.update(crmVehicleTable).set({
-      companyId: user2.companyId
+      companyId: user2.companyId,
+      deletedAt: null
     });
     return vehicle;
   };
@@ -155171,14 +155176,20 @@ var CrmCpOrderLogic;
     await db_default.delete(crmCpOrderTable).where(and(eq(crmCpOrderTable.id, id), eq(crmCpOrderTable.companyId, user2.companyId)));
   };
   CrmCpOrderLogic.selectPayments = async (id) => {
-    const [totalAmount] = await logic_default5.selectAmountTotal(id);
-    const [packageAmount] = await logic_default7.selectAmountTotal(id);
-    const payments = await logic_default10.selectByCpOrderId(id);
-    const appliedDiscounts = await logic_default11.selectAppliesByCpOrderId(id);
+    const [totalAmounts, packageAmounts, payments, appliedDiscounts] = await Promise.all([
+      logic_default5.selectAmountTotal(id),
+      logic_default7.selectAmountTotal(id),
+      logic_default10.selectByCpOrderId(id),
+      logic_default11.selectAppliesByCpOrderId(id)
+    ]);
     const totalAppliedDiscount = appliedDiscounts.map((i2) => i2.apply.valueApplied).reduce((a12, b) => a12 + b, 0);
+    const totalAmount = totalAmounts[0];
+    const packageAmount = packageAmounts[0];
+    console.log(totalAmount, packageAmount);
+    const ta = ((totalAmount?.amount ?? 0) + (packageAmount?.amount ?? 0)) * (totalAmount?.isNoat ? 1.1 : 1);
     return {
       payments,
-      totalAmount: !totalAmount ? 0 : totalAmount.amount * (totalAmount.isNoat ? 1.1 : 1) + (packageAmount ? packageAmount.amount : 0),
+      totalAmount: ta,
       paidAmount: payments.map((p) => p.state === "PAID" ? p.amount : 0).reduce((a12, b) => a12 + b, 0),
       totalAppliedDiscount,
       discounts: appliedDiscounts
@@ -155723,6 +155734,8 @@ var customerRoutes = new Elysia({
   tags: ["CrmCustomer"]
 }).use(better_auth_default).guard({ auth: true }).get("/", async ({ query, user: user2 }) => logic_default6.select(query, user2), {
   query: model_default9.select
+}).post("/", async ({ body }) => logic_default6.create(body), {
+  body: model_default9.create
 }).put("/:id", async ({ body, params: { id } }) => logic_default6.update(id, body), {
   body: model_default9.update
 });
@@ -155853,7 +155866,7 @@ var CrmInspectionLogic;
 ((CrmInspectionLogic) => {
   CrmInspectionLogic.getFilter = (query, user2) => {
     const ilikeSearch = `%${query.search}%`;
-    return and(softDeletedFilter(crmInspectionTable), eq(crmInspectionTable.companyId, user2.companyId), eq(crmInspectionTable.branchId, user2.branchId).if(user2.kind === "CUSTOMER"), or(ilike(crmInspectionTable.licensePlate, ilikeSearch), ilike(crmInspectionTable.description, ilikeSearch))?.if(!!query.search), eq(crmInspectionTable.status, query.status).if(query.status), ilike(crmInspectionTable.licensePlate, `%${query.licensePlate}%`).if(query.licensePlate));
+    return and(softDeletedFilter(crmInspectionTable), eq(crmInspectionTable.companyId, user2.companyId), eq(crmInspectionTable.branchId, user2.branchId).if(user2.kind === "CUSTOMER"), or(ilike(crmInspectionTable.licensePlate, ilikeSearch), ilike(crmInspectionTable.description, ilikeSearch))?.if(!!query.search), eq(crmInspectionTable.status, query.status ?? "CREATED").if(query.status), ilike(crmInspectionTable.licensePlate, `%${query.licensePlate}%`).if(query.licensePlate));
   };
   CrmInspectionLogic.select = async (query, user2) => {
     const baseQuery = db_default.select({
@@ -155987,7 +156000,9 @@ var CrmInspectionModel;
   CrmInspectionModel.select = t.Composite([
     t.Partial(t.Object({
       search: t.String(),
-      status: t.String(),
+      status: t.UnionEnum(crmInspectionTable.status.enumValues, {
+        default: undefined
+      }),
       licensePlate: t.String()
     })),
     PaginationSchema

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autosync_backend2",
-  "version": "1.1.61",
+  "version": "1.1.63",
   "module": "src/index.ts",
   "type": "module",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
     "better-auth": "^1.3.7",
     "drizzle-orm": "^0.44.4",
     "drizzle-typebox": "^0.3.3",
-    "elysia": "1.3.11",
+    "elysia": "1.3.13",
     "exceljs": "^4.4.0",
     "fast-xml-parser": "^5.2.5",
     "generate-password": "^1.7.1",