autosync_backend2 1.2.82 → 1.2.83

package/dist/index.d.ts

@@ -1169,7 +1169,7 @@ export declare const app: Elysia<"", {
                         };
                         401: "Токен олдсонгүй";
                         403: "Хандах эрхгүй байна.";
-                        409: "Агуулахын барааны мэдээлэл давхцаж байна.";
+                        409: string;
                         422: {
                             type: "validation";
                             on: string;
@@ -1451,7 +1451,7 @@ export declare const app: Elysia<"", {
                             401: "Токен олдсонгүй";
                             403: "Хандах эрхгүй байна.";
                             404: "Агуулахын бараа олдсонгүй.";
-                            409: "Агуулахын барааны мэдээлэл давхцаж байна.";
+                            409: string;
                             422: {
                                 type: "validation";
                                 on: string;
@@ -2545,15 +2545,7 @@ export declare const app: Elysia<"", {
                     body: unknown;
                     params: {};
                     query: {
-                        id?: string | undefined;
-                        createdAt?: string | undefined;
-                        updatedAt?: string | undefined;
-                        companyId?: string | undefined;
-                        account?: string | undefined;
-                        deletedAt?: string | null | undefined;
-                        oldId?: number | null | undefined;
-                        description?: string | null | undefined;
-                        bank?: string | undefined;
+                        branchId?: string | undefined;
                         pagination: {
                             size: number;
                             page: number;
@@ -2565,16 +2557,18 @@ export declare const app: Elysia<"", {
                             totalCount: number;
                             totalPage: number;
                             result: Omit<{
-                                id: string;
-                                createdAt: string;
-                                updatedAt: string;
-                                companyId: string;
-                                account: string;
-                                deletedAt: string | null;
-                                oldId: number | null;
-                                description: string | null;
-                                bank: string;
-                            } & {
+                                account: {
+                                    companyId: string;
+                                    branchId: string | null;
+                                    bank: string;
+                                    account: string;
+                                    description: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                    oldId: number | null;
+                                };
                                 totalCount: number;
                             }, "totalCount">[];
                         };
@@ -2595,6 +2589,7 @@ export declare const app: Elysia<"", {
             account: {
                 post: {
                     body: {
+                        branchId?: string | null | undefined;
                         oldId?: number | null | undefined;
                         description?: string | null | undefined;
                         companyId: string;
@@ -2610,6 +2605,7 @@ export declare const app: Elysia<"", {
                             createdAt: string;
                             updatedAt: string;
                             companyId: string;
+                            branchId: string | null;
                             account: string;
                             deletedAt: string | null;
                             oldId: number | null;
@@ -2636,6 +2632,7 @@ export declare const app: Elysia<"", {
                     put: {
                         body: {
                             companyId?: string | undefined;
+                            branchId?: string | null | undefined;
                             account?: string | undefined;
                             oldId?: number | null | undefined;
                             description?: string | null | undefined;
@@ -2648,19 +2645,20 @@ export declare const app: Elysia<"", {
                         headers: {};
                         response: {
                             200: {
+                                companyId: string;
+                                branchId: string | null;
+                                bank: string;
+                                account: string;
+                                description: string | null;
                                 id: string;
                                 createdAt: string;
                                 updatedAt: string;
-                                companyId: string;
-                                account: string;
                                 deletedAt: string | null;
                                 oldId: number | null;
-                                description: string | null;
-                                bank: string;
                             };
                             401: "Токен олдсонгүй";
                             403: "Хандах эрхгүй байна.";
-                            404: string;
+                            404: "Данс олдсонгүй.";
                             422: {
                                 type: "validation";
                                 on: string;
@@ -2687,7 +2685,7 @@ export declare const app: Elysia<"", {
                         response: {
                             401: "Токен олдсонгүй";
                             403: "Хандах эрхгүй байна.";
-                            404: string;
+                            404: "Данс олдсонгүй.";
                             422: {
                                 type: "validation";
                                 on: string;
@@ -12648,7 +12646,7 @@ export declare const app: Elysia<"", {
                             nmKey: string | null;
                         };
                         401: "Токен олдсонгүй";
-                        409: "nmKey давхцаж байна.";
+                        409: string;
                         422: {
                             type: "validation";
                             on: string;
@@ -12658,7 +12656,7 @@ export declare const app: Elysia<"", {
                             property?: string;
                             expected?: string;
                         };
-                        500: "Суваг үүсгэхэд алдаа гарлаа.";
+                        500: {};
                     };
                 };
             };
@@ -12690,7 +12688,7 @@ export declare const app: Elysia<"", {
                             };
                             401: "Токен олдсонгүй";
                             404: "Бүртгэл олдсонгүй.";
-                            409: "nmKey давхцаж байна.";
+                            409: string;
                             422: {
                                 type: "validation";
                                 on: string;
@@ -12700,7 +12698,7 @@ export declare const app: Elysia<"", {
                                 property?: string;
                                 expected?: string;
                             };
-                            500: "Суваг засахэд алдаа гарлаа.";
+                            500: {};
                         };
                     };
                 };

package/dist/index.js

@@ -121403,9 +121403,9 @@ var require_firebase_app = __commonJS((exports) => {
       this.checkDestroyed_();
       this.appStore?.removeApp(this.name);
       return Promise.all(Object.keys(this.services_).map((serviceName) => {
-        const service5 = this.services_[serviceName];
-        if (isStateful(service5)) {
-          return service5.delete();
+        const service4 = this.services_[serviceName];
+        if (isStateful(service4)) {
+          return service4.delete();
         }
         return Promise.resolve();
       })).then(() => {
@@ -121427,8 +121427,8 @@ var require_firebase_app = __commonJS((exports) => {
     }
   }
   exports.FirebaseApp = FirebaseApp;
-  function isStateful(service5) {
-    return typeof service5.delete === "function";
+  function isStateful(service4) {
+    return typeof service4.delete === "function";
   }
 });
 
@@ -139219,8 +139219,8 @@ var require_index_node_cjs = __commonJS((exports) => {
   }
 
   class ErrorFactory {
-    constructor(service5, serviceName, errors3) {
-      this.service = service5;
+    constructor(service4, serviceName, errors3) {
+      this.service = service4;
       this.serviceName = serviceName;
       this.errors = errors3;
     }
@@ -139808,11 +139808,11 @@ var require_index_node_cjs = __commonJS((exports) => {
     }
     return "th";
   }
-  function getModularInstance(service5) {
-    if (service5 && service5._delegate) {
-      return service5._delegate;
+  function getModularInstance(service4) {
+    if (service4 && service4._delegate) {
+      return service4._delegate;
     } else {
-      return service5;
+      return service4;
     }
   }
   CONSTANTS2.NODE_CLIENT = true;
@@ -140158,8 +140158,8 @@ var require_index_cjs2 = __commonJS((exports) => {
     async delete() {
       const services = Array.from(this.instances.values());
       await Promise.all([
-        ...services.filter((service5) => ("INTERNAL" in service5)).map((service5) => service5.INTERNAL.delete()),
-        ...services.filter((service5) => ("_delete" in service5)).map((service5) => service5._delete())
+        ...services.filter((service4) => ("INTERNAL" in service4)).map((service4) => service4.INTERNAL.delete()),
+        ...services.filter((service4) => ("_delete" in service4)).map((service4) => service4._delete())
       ]);
     }
     isComponentSet() {
@@ -143249,8 +143249,8 @@ var require_index_standalone = __commonJS((exports) => {
         const providers = this.container.getProviders();
         return providers.map((provider) => {
           if (isVersionServiceProvider(provider)) {
-            const service5 = provider.getImmediate();
-            return `${service5.library}/${service5.version}`;
+            const service4 = provider.getImmediate();
+            return `${service4.library}/${service4.version}`;
           } else {
             return null;
           }
@@ -166600,17 +166600,17 @@ var require_service3 = __commonJS((exports, module) => {
     this._methodsArray = null;
   }
   Service.fromJSON = function fromJSON(name, json2) {
-    var service5 = new Service(name, json2.options);
+    var service4 = new Service(name, json2.options);
     if (json2.methods)
       for (var names = Object.keys(json2.methods), i2 = 0;i2 < names.length; ++i2)
-        service5.add(Method.fromJSON(names[i2], json2.methods[names[i2]]));
+        service4.add(Method.fromJSON(names[i2], json2.methods[names[i2]]));
     if (json2.nested)
-      service5.addJSON(json2.nested);
+      service4.addJSON(json2.nested);
     if (json2.edition)
-      service5._edition = json2.edition;
-    service5.comment = json2.comment;
-    service5._defaultEdition = "proto3";
-    return service5;
+      service4._edition = json2.edition;
+    service4.comment = json2.comment;
+    service4._defaultEdition = "proto3";
+    return service4;
   };
   Service.prototype.toJSON = function toJSON(toJSONOptions) {
     var inherited = Namespace.prototype.toJSON.call(this, toJSONOptions);
@@ -166633,9 +166633,9 @@ var require_service3 = __commonJS((exports, module) => {
       return this._methodsArray || (this._methodsArray = util.toArray(this.methods));
     }
   });
-  function clearCache(service5) {
-    service5._methodsArray = null;
-    return service5;
+  function clearCache(service4) {
+    service4._methodsArray = null;
+    return service4;
   }
   Service.prototype.get = function get(name) {
     return this.methods[name] || Namespace.prototype.get.call(this, name);
@@ -169382,19 +169382,19 @@ var require_parse7 = __commonJS((exports, module) => {
     function parseService(parent, token2) {
       if (!nameRe.test(token2 = next()))
         throw illegal(token2, "service name");
-      var service5 = new Service(token2);
-      ifBlock(service5, function parseService_block(token3) {
-        if (parseCommon(service5, token3)) {
+      var service4 = new Service(token2);
+      ifBlock(service4, function parseService_block(token3) {
+        if (parseCommon(service4, token3)) {
           return;
         }
         if (token3 === "rpc")
-          parseMethod(service5, token3);
+          parseMethod(service4, token3);
         else
           throw illegal(token3);
       });
-      parent.add(service5);
+      parent.add(service4);
       if (parent === ptr) {
-        topLevelObjects.push(service5);
+        topLevelObjects.push(service4);
       }
     }
     function parseMethod(parent, token2) {
@@ -185352,9 +185352,9 @@ var require_fallback = __commonJS((exports, module) => {
       GrpcClient.protoCache.set(hash2, root);
       return root;
     }
-    static getServiceMethods(service5) {
+    static getServiceMethods(service4) {
       const methods2 = {};
-      for (const [methodName, methodObject] of Object.entries(service5.methods)) {
+      for (const [methodName, methodObject] of Object.entries(service4.methods)) {
         const methodNameLowerCamelCase = (0, util_1.toLowerCamelCase)(methodName);
         methods2[methodNameLowerCamelCase] = methodObject;
       }
@@ -185400,7 +185400,7 @@ var require_fallback = __commonJS((exports, module) => {
       }
       return gax.constructSettings(serviceName, clientConfig, configOverrides, status_1.Status, { metadataBuilder: buildMetadata });
     }
-    async createStub(service5, opts, customServicePath) {
+    async createStub(service4, opts, customServicePath) {
       if (!this.authClient) {
         if (this.auth && "getClient" in this.auth) {
           this.authClient = await this.auth.getClient();
@@ -185420,15 +185420,15 @@ var require_fallback = __commonJS((exports, module) => {
           throw new Error(`The configured universe domain (${opts.universeDomain}) does not match the universe domain found in the credentials (${universeFromAuth}). ` + "If you haven't configured the universe domain explicitly, googleapis.com is the default.");
         }
       }
-      service5.resolveAll();
-      const methods2 = GrpcClient.getServiceMethods(service5);
+      service4.resolveAll();
+      const methods2 = GrpcClient.getServiceMethods(service4);
       const protocol = opts.protocol || "https";
       let servicePath = opts.servicePath;
-      if (!servicePath && service5.options && service5.options["(google.api.default_host)"]) {
-        servicePath = service5.options["(google.api.default_host)"];
+      if (!servicePath && service4.options && service4.options["(google.api.default_host)"]) {
+        servicePath = service4.options["(google.api.default_host)"];
       }
       if (!servicePath) {
-        throw new Error(`Cannot determine service API path for service ${service5.name}.`);
+        throw new Error(`Cannot determine service API path for service ${service4.name}.`);
       }
       let servicePort;
       const match = servicePath.match(/^(.*):(\d+)$/);
@@ -191540,7 +191540,7 @@ var require_resolving_load_balancer = __commonJS((exports) => {
     "SERVICE",
     "EMPTY"
   ];
-  function hasMatchingName(service5, method, methodConfig, matchLevel) {
+  function hasMatchingName(service4, method, methodConfig, matchLevel) {
     for (const name of methodConfig.name) {
       switch (matchLevel) {
         case "EMPTY":
@@ -191549,21 +191549,21 @@ var require_resolving_load_balancer = __commonJS((exports) => {
           }
           break;
         case "SERVICE":
-          if (name.service === service5 && !name.method) {
+          if (name.service === service4 && !name.method) {
             return true;
           }
           break;
         case "SERVICE_AND_METHOD":
-          if (name.service === service5 && name.method === method) {
+          if (name.service === service4 && name.method === method) {
             return true;
           }
       }
     }
     return false;
   }
-  function findMatchingConfig(service5, method, methodConfigs, matchLevel) {
+  function findMatchingConfig(service4, method, methodConfigs, matchLevel) {
     for (const config5 of methodConfigs) {
-      if (hasMatchingName(service5, method, config5, matchLevel)) {
+      if (hasMatchingName(service4, method, config5, matchLevel)) {
         return config5;
       }
     }
@@ -191574,11 +191574,11 @@ var require_resolving_load_balancer = __commonJS((exports) => {
       invoke(methodName, metadata) {
         var _a2, _b2;
         const splitName = methodName.split("/").filter((x2) => x2.length > 0);
-        const service5 = (_a2 = splitName[0]) !== null && _a2 !== undefined ? _a2 : "";
+        const service4 = (_a2 = splitName[0]) !== null && _a2 !== undefined ? _a2 : "";
         const method = (_b2 = splitName[1]) !== null && _b2 !== undefined ? _b2 : "";
         if (serviceConfig && serviceConfig.methodConfig) {
           for (const matchLevel of NAME_MATCH_LEVEL_ORDER) {
-            const matchingConfig = findMatchingConfig(service5, method, serviceConfig.methodConfig, matchLevel);
+            const matchingConfig = findMatchingConfig(service4, method, serviceConfig.methodConfig, matchLevel);
             if (matchingConfig) {
               return {
                 methodConfig: matchingConfig,
@@ -193845,7 +193845,7 @@ var require_make_client = __commonJS((exports) => {
     const result = {};
     for (const serviceFqn in packageDef) {
       if (Object.prototype.hasOwnProperty.call(packageDef, serviceFqn)) {
-        const service5 = packageDef[serviceFqn];
+        const service4 = packageDef[serviceFqn];
         const nameComponents = serviceFqn.split(".");
         if (nameComponents.some((comp) => isPrototypePolluted(comp))) {
           continue;
@@ -193858,10 +193858,10 @@ var require_make_client = __commonJS((exports) => {
           }
           current = current[packageName];
         }
-        if (isProtobufTypeDefinition(service5)) {
-          current[serviceName] = service5;
+        if (isProtobufTypeDefinition(service4)) {
+          current[serviceName] = service4;
         } else {
-          current[serviceName] = makeClientConstructor(service5, serviceName, {});
+          current[serviceName] = makeClientConstructor(service4, serviceName, {});
         }
       }
     }
@@ -195927,13 +195927,13 @@ var require_descriptor3 = __commonJS((exports, module) => {
   Service.fromDescriptor = function fromDescriptor(descriptor, edition, nested) {
     if (typeof descriptor.length === "number")
       descriptor = exports.ServiceDescriptorProto.decode(descriptor);
-    var service5 = new Service(descriptor.name && descriptor.name.length ? descriptor.name : "Service" + unnamedServiceIndex++, fromDescriptorOptions(descriptor.options, exports.ServiceOptions));
+    var service4 = new Service(descriptor.name && descriptor.name.length ? descriptor.name : "Service" + unnamedServiceIndex++, fromDescriptorOptions(descriptor.options, exports.ServiceOptions));
     if (!nested)
-      service5._edition = edition;
+      service4._edition = edition;
     if (descriptor.method)
       for (var i2 = 0;i2 < descriptor.method.length; ++i2)
-        service5.add(Method.fromDescriptor(descriptor.method[i2]));
-    return service5;
+        service4.add(Method.fromDescriptor(descriptor.method[i2]));
+    return service4;
   };
   Service.prototype.toDescriptor = function toDescriptor() {
     var methods2 = [];
@@ -197593,9 +197593,9 @@ var require_src21 = __commonJS((exports) => {
       options: mapMethodOptions(method.parsedOptions)
     };
   }
-  function createServiceDefinition(service5, name, options, fileDescriptors) {
+  function createServiceDefinition(service4, name, options, fileDescriptors) {
     const def = {};
-    for (const method of service5.methodsArray) {
+    for (const method of service4.methodsArray) {
       def[method.name] = createMethodDefinition(method, name, options, fileDescriptors);
     }
     return def;
@@ -204299,16 +204299,16 @@ var require_server = __commonJS((exports) => {
       addProtoService() {
         throw new Error("Not implemented. Use addService() instead");
       }
-      addService(service5, implementation) {
-        if (service5 === null || typeof service5 !== "object" || implementation === null || typeof implementation !== "object") {
+      addService(service4, implementation) {
+        if (service4 === null || typeof service4 !== "object" || implementation === null || typeof implementation !== "object") {
           throw new Error("addService() requires two objects as arguments");
         }
-        const serviceKeys = Object.keys(service5);
+        const serviceKeys = Object.keys(service4);
         if (serviceKeys.length === 0) {
           throw new Error("Cannot add an empty service to a server");
         }
         serviceKeys.forEach((name) => {
-          const attrs = service5[name];
+          const attrs = service4[name];
           let methodType;
           if (attrs.requestStream) {
             if (attrs.responseStream) {
@@ -204339,13 +204339,13 @@ var require_server = __commonJS((exports) => {
           }
         });
       }
-      removeService(service5) {
-        if (service5 === null || typeof service5 !== "object") {
+      removeService(service4) {
+        if (service4 === null || typeof service4 !== "object") {
           throw new Error("removeService() requires object as argument");
         }
-        const serviceKeys = Object.keys(service5);
+        const serviceKeys = Object.keys(service4);
         serviceKeys.forEach((name) => {
-          const attrs = service5[name];
+          const attrs = service4[name];
           this.unregister(attrs.path);
         });
       }
@@ -207725,9 +207725,9 @@ var require_src23 = __commonJS((exports) => {
       options: mapMethodOptions(method.parsedOptions)
     };
   }
-  function createServiceDefinition(service5, name, options, fileDescriptors) {
+  function createServiceDefinition(service4, name, options, fileDescriptors) {
     const def = {};
-    for (const method of service5.methodsArray) {
+    for (const method of service4.methodsArray) {
       def[method.name] = createMethodDefinition(method, name, options, fileDescriptors);
     }
     return def;
@@ -276056,6 +276056,7 @@ var companyServiceBookingTable = companySchema.table("service_booking", {
 var companyAccountTable = companySchema.table("account", {
   ...base_schema_helper_default,
   companyId: uuid5().notNull(),
+  branchId: uuid5(),
   bank: varchar().notNull(),
   account: varchar().notNull(),
   description: varchar()
@@ -279824,86 +279825,6 @@ var requestLogger = new Elysia({ name: "Middleware.RequestLogger" }).onRequest((
   });
 }).as("global");
 
-// src/lib/db/helpers/pagination.helper.ts
-function withPagination(qb, { size, page }) {
-  return qb.limit(size).offset((page - 1) * size);
-}
-var totalCountSql = sql3`count(*) over()`.mapWith(Number);
-var pagination_helper_default = withPagination;
-
-// src/lib/db/helpers/soft-delete.helper.ts
-var softDeletedFilter = (table) => {
-  return isNull2(table.deletedAt);
-};
-
-// src/lib/db/helpers/crud.helper.ts
-class CrudHelper {
-  table;
-  NOT_FOUND_MESSAGE = "";
-  constructor(table, ntMessage) {
-    this.table = table;
-    this.NOT_FOUND_MESSAGE = ntMessage ?? "";
-  }
-  async get(input, filter) {
-    const wheres = [softDeletedFilter(this.table)];
-    if (!filter) {
-      const tableKeys = Object.keys(this.table);
-      for (const key of Object.keys(input)) {
-        if (!tableKeys.includes(key)) {
-          continue;
-        }
-        const column = this.table[key];
-        const type = column.getSQLType();
-        const value = input[key];
-        if (!value) {
-          continue;
-        }
-        if (type === "varchar") {
-          wheres.push(ilike(column, `%${input[key]}%`));
-        }
-        if (!type.includes("[]")) {
-          wheres.push(eq(column, input[key]));
-        }
-      }
-    }
-    const columns = getTableColumns(this.table);
-    const baseQuery = db_default.select({
-      ...columns,
-      totalCount: totalCountSql
-    }).from(this.table).where(filter ?? and(...wheres)).$dynamic();
-    const result = await pagination_helper_default(baseQuery, input.pagination);
-    const content = {
-      totalCount: result[0]?.totalCount ?? 0,
-      totalPage: result.length === 0 ? 0 : Math.ceil(result[0].totalCount / input.pagination.size)
-    };
-    return {
-      result: result.map(({ totalCount, ...rest }) => rest),
-      ...content
-    };
-  }
-  async create(input) {
-    const [result] = await db_default.insert(this.table).values({
-      ...input
-    }).returning();
-    return result;
-  }
-  async update(id, input) {
-    const [result] = await db_default.update(this.table).set(input).where(eq(this.table.id, id)).returning();
-    if (!result) {
-      return status("Not Found", this.NOT_FOUND_MESSAGE);
-    }
-    return result;
-  }
-  async delete(id) {
-    const [result] = await db_default.update(this.table).set({
-      deletedAt: nowSql_helper_default
-    }).where(eq(this.table.id, id)).returning();
-    if (!result) {
-      return status("Not Found", this.NOT_FOUND_MESSAGE);
-    }
-  }
-}
-
 // src/lib/validation.ts
 var OmitBaseSchema = (type) => {
   return t.Omit(type, ["id", "createdAt", "updatedAt", "deletedAt"]);
@@ -280001,9 +279922,42 @@ var betterAuthMacro = new Elysia({ name: "betterAuth" }).macro({
 });
 var better_auth_default = betterAuthMacro;
 
+// src/lib/db/helpers/pagination.helper.ts
+function withPagination(qb, { size, page }) {
+  return qb.limit(size).offset((page - 1) * size);
+}
+var totalCountSql = sql3`count(*) over()`.mapWith(Number);
+var pagination_helper_default = withPagination;
+
+// src/lib/db/helpers/soft-delete.helper.ts
+var softDeletedFilter = (table) => {
+  return isNull2(table.deletedAt);
+};
+
+// src/lib/utils/getPaginationContent.ts
+function getPaginationContent(result, size) {
+  const totalCount = result[0]?.totalCount ?? 0;
+  const totalPage = result.length === 0 ? 0 : Math.ceil(totalCount / size);
+  return {
+    totalCount,
+    totalPage,
+    result: result.map(({ totalCount: totalCount2, ...res }) => res)
+  };
+}
+
 // src/routes/company/account/logic.ts
+var NOT_FOUND_MESSAGE = "\u0414\u0430\u043D\u0441 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.";
 var CompanyAccountLogic;
 ((CompanyAccountLogic) => {
+  CompanyAccountLogic.select = async (query, user2) => {
+    const filter = and(eq(companyAccountTable.companyId, user2.companyId), or(eq(companyAccountTable.branchId, user2.branchId), isNull2(companyAccountTable.branchId))?.if(user2.kind === "CUSTOMER"), softDeletedFilter(companyAccountTable));
+    const baseQuery = db_default.select({
+      account: companyAccountTable,
+      totalCount: totalCountSql
+    }).from(companyAccountTable).where(filter).orderBy(desc(companyAccountTable.createdAt)).$dynamic();
+    const result = await pagination_helper_default(baseQuery, query.pagination);
+    return getPaginationContent(result, query.pagination.size);
+  };
   CompanyAccountLogic.create = async (body, user2) => {
     let companyId = user2.companyId;
     if (user2.kind === "ADMIN" && body.companyId) {
@@ -280015,6 +279969,21 @@ var CompanyAccountLogic;
     }).returning();
     return account2;
   };
+  CompanyAccountLogic.update = async (id, body, user2) => {
+    const [result] = await db_default.update(companyAccountTable).set(body).where(and(eq(companyAccountTable.id, id), eq(companyAccountTable.companyId, user2.companyId), or(eq(companyAccountTable.branchId, user2.branchId), isNull2(companyAccountTable.branchId))?.if(user2.kind === "CUSTOMER"))).returning();
+    if (!result) {
+      return status("Not Found", NOT_FOUND_MESSAGE);
+    }
+    return result;
+  };
+  CompanyAccountLogic.remove = async (id, user2) => {
+    const [result] = await db_default.update(companyAccountTable).set({
+      deletedAt: new Date().toISOString()
+    }).where(and(eq(companyAccountTable.id, id), eq(companyAccountTable.companyId, user2.companyId), or(eq(companyAccountTable.branchId, user2.branchId), isNull2(companyAccountTable.branchId))?.if(user2.kind === "CUSTOMER"))).returning();
+    if (!result) {
+      return status("Not Found", NOT_FOUND_MESSAGE);
+    }
+  };
 })(CompanyAccountLogic ||= {});
 var logic_default = CompanyAccountLogic;
 
@@ -280321,49 +280290,38 @@ var CompanyAccountModel;
 ((CompanyAccountModel) => {
   const createSchema = createInsertSchema2(companyAccountTable);
   const updateSchema = createUpdateSchema(companyAccountTable);
-  const selectSchema = createSelectSchema(companyAccountTable);
   CompanyAccountModel.create = OmitBaseSchema(createSchema);
   CompanyAccountModel.update = OmitBaseSchema(updateSchema);
   CompanyAccountModel.select = t.Composite([
-    t.Partial(selectSchema),
+    t.Partial(t.Object({
+      branchId: t.String({ format: "uuid" })
+    })),
     PaginationSchema
   ]);
 })(CompanyAccountModel ||= {});
 var model_default = CompanyAccountModel;
 
 // src/routes/company/account/index.ts
-var service = new CrudHelper(companyAccountTable, "\u0414\u0430\u043D\u0441 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
 var accountRoutes = new Elysia({
   prefix: "/account"
 }).use(better_auth_default).guard({
   auth: true,
   tags: ["CompanyAccount"]
-}).get("/", async ({ query }) => await service.get(query), {
+}).get("/", async ({ query, user: user2 }) => await logic_default.select(query, user2), {
   query: model_default.select
 }).post("/", async ({ body, user: user2 }) => await logic_default.create(body, user2), {
   body: model_default.create,
   userKind: "COMPANY_ADMIN"
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ params: { id }, body }) => await service.update(id, body), {
+}).put("/:id", async ({ params: { id }, body, user: user2 }) => await logic_default.update(id, body, user2), {
   body: model_default.update,
   userKind: "COMPANY_ADMIN"
-}).delete("/:id", async ({ params: { id } }) => await service.delete(id), {
+}).delete("/:id", async ({ params: { id }, user: user2 }) => await logic_default.remove(id, user2), {
   userKind: "COMPANY_ADMIN"
 });
 var account_default = accountRoutes;
 
-// src/lib/utils/getPaginationContent.ts
-function getPaginationContent(result, size) {
-  const totalCount = result[0]?.totalCount ?? 0;
-  const totalPage = result.length === 0 ? 0 : Math.ceil(totalCount / size);
-  return {
-    totalCount,
-    totalPage,
-    result: result.map(({ totalCount: totalCount2, ...res }) => res)
-  };
-}
-
 // src/routes/company/billingPlan/logic.ts
 var CompanyBillingPlanLogic;
 ((CompanyBillingPlanLogic) => {
@@ -280441,6 +280399,74 @@ var billingPlanRoutes = new Elysia({
 });
 var billingPlan_default = billingPlanRoutes;
 
+// src/lib/db/helpers/crud.helper.ts
+class CrudHelper {
+  table;
+  NOT_FOUND_MESSAGE = "";
+  constructor(table, ntMessage) {
+    this.table = table;
+    this.NOT_FOUND_MESSAGE = ntMessage ?? "";
+  }
+  async get(input, filter) {
+    const wheres = [softDeletedFilter(this.table)];
+    if (!filter) {
+      const tableKeys = Object.keys(this.table);
+      for (const key of Object.keys(input)) {
+        if (!tableKeys.includes(key)) {
+          continue;
+        }
+        const column = this.table[key];
+        const type = column.getSQLType();
+        const value = input[key];
+        if (!value) {
+          continue;
+        }
+        if (type === "varchar") {
+          wheres.push(ilike(column, `%${input[key]}%`));
+        }
+        if (!type.includes("[]")) {
+          wheres.push(eq(column, input[key]));
+        }
+      }
+    }
+    const columns = getTableColumns(this.table);
+    const baseQuery = db_default.select({
+      ...columns,
+      totalCount: totalCountSql
+    }).from(this.table).where(filter ?? and(...wheres)).$dynamic();
+    const result = await pagination_helper_default(baseQuery, input.pagination);
+    const content = {
+      totalCount: result[0]?.totalCount ?? 0,
+      totalPage: result.length === 0 ? 0 : Math.ceil(result[0].totalCount / input.pagination.size)
+    };
+    return {
+      result: result.map(({ totalCount, ...rest }) => rest),
+      ...content
+    };
+  }
+  async create(input) {
+    const [result] = await db_default.insert(this.table).values({
+      ...input
+    }).returning();
+    return result;
+  }
+  async update(id, input) {
+    const [result] = await db_default.update(this.table).set(input).where(eq(this.table.id, id)).returning();
+    if (!result) {
+      return status("Not Found", this.NOT_FOUND_MESSAGE);
+    }
+    return result;
+  }
+  async delete(id) {
+    const [result] = await db_default.update(this.table).set({
+      deletedAt: nowSql_helper_default
+    }).where(eq(this.table.id, id)).returning();
+    if (!result) {
+      return status("Not Found", this.NOT_FOUND_MESSAGE);
+    }
+  }
+}
+
 // src/routes/company/branch/logic.ts
 var CompanyBranchLogic;
 ((CompanyBranchLogic) => {
@@ -280479,16 +280505,16 @@ var CompanyBranchModel;
 var model_default3 = CompanyBranchModel;
 
 // src/routes/company/branch/index.ts
-var service2 = new CrudHelper(companyBranchTable, "\u0421\u0430\u043B\u0431\u0430\u0440 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
+var service = new CrudHelper(companyBranchTable, "\u0421\u0430\u043B\u0431\u0430\u0440 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
 var branchRoutes = new Elysia({
   prefix: "/branch"
 }).use(better_auth_default).guard({
   auth: true,
   tags: ["CompanyBranch"]
-}).get("/", async ({ query }) => await service2.get(query), {
+}).get("/", async ({ query }) => await service.get(query), {
   query: model_default3.select,
   userKind: "COMPANY_ADMIN"
-}).get("/me", async ({ user: user2 }) => service2.get({
+}).get("/me", async ({ user: user2 }) => service.get({
   id: user2.branchId,
   pagination: {
     page: 1,
@@ -280499,10 +280525,10 @@ var branchRoutes = new Elysia({
   userKind: "COMPANY_ADMIN"
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ params: { id }, body }) => await service2.update(id, body), {
+}).put("/:id", async ({ params: { id }, body }) => await service.update(id, body), {
   body: model_default3.update,
   userKind: "COMPANY_ADMIN"
-}).delete("/:id", async ({ params: { id } }) => await service2.delete(id), {
+}).delete("/:id", async ({ params: { id } }) => await service.delete(id), {
   userKind: "COMPANY_ADMIN"
 });
 var branch_default = branchRoutes;
@@ -280526,24 +280552,24 @@ var CompanyCompanyModel;
 var model_default4 = CompanyCompanyModel;
 
 // src/routes/company/company/index.ts
-var service3 = new CrudHelper(companyCompanyTable, "\u0411\u0430\u0439\u0433\u0443\u0443\u043B\u043B\u0430\u0433\u0430 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
+var service2 = new CrudHelper(companyCompanyTable, "\u0411\u0430\u0439\u0433\u0443\u0443\u043B\u043B\u0430\u0433\u0430 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
 var companyRoutes = new Elysia({
   prefix: "/company"
 }).use(better_auth_default).guard({
   auth: true,
   tags: ["Company"]
-}).get("/", async ({ query }) => await service3.get(query), {
+}).get("/", async ({ query }) => await service2.get(query), {
   query: model_default4.select,
   userKind: "ADMIN"
 }).post("/", async ({ body }) => {
-  const result = await service3.create(body);
+  const result = await service2.create(body);
   return result;
 }, {
   body: model_default4.create,
   userKind: "ADMIN"
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ body, params: { id } }) => service3.update(id, body), {
+}).put("/:id", async ({ body, params: { id } }) => service2.update(id, body), {
   body: model_default4.update,
   userKind: "COMPANY_ADMIN",
   beforeHandle({ status: status2, params: { id }, user: user2 }) {
@@ -280551,7 +280577,7 @@ var companyRoutes = new Elysia({
       return status2("Forbidden", "\u0417\u04E9\u0432\u0445\u04E9\u043D \u04E9\u04E9\u0440\u0438\u0439\u043D \u0431\u0430\u0439\u0433\u0443\u0443\u043B\u043B\u0430\u0433\u044B\u043D \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0437\u0430\u0441\u0430\u0445 \u0431\u043E\u043B\u043E\u043C\u0436\u0442\u043E\u0439.");
     }
   }
-}).delete("/:id", async ({ params: { id } }) => service3.delete(id), {
+}).delete("/:id", async ({ params: { id } }) => service2.delete(id), {
   userKind: "ADMIN"
 });
 var company_default = companyRoutes;
@@ -280915,19 +280941,19 @@ var CompanyPackageModel;
 var model_default8 = CompanyPackageModel;
 
 // src/routes/company/package/index.ts
-var service4 = new CrudHelper(companyPackageTable, "\u0411\u0430\u0433\u0446 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
+var service3 = new CrudHelper(companyPackageTable, "\u0411\u0430\u0433\u0446 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
 var packageRoutes = new Elysia({
   prefix: "/package"
 }).use(better_auth_default).guard({
   auth: true,
   tags: ["CompanyPackage"]
-}).get("/", async ({ query }) => await service4.get(query), {
+}).get("/", async ({ query }) => await service3.get(query), {
   query: PaginationSchema
-}).post("/", async ({ body }) => await service4.create(body), {
+}).post("/", async ({ body }) => await service3.create(body), {
   body: model_default8.create
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ params: { id }, body }) => await service4.update(id, body), { body: model_default8.update }).delete("/:id", async ({ params: { id } }) => await service4.delete(id));
+}).put("/:id", async ({ params: { id }, body }) => await service3.update(id, body), { body: model_default8.update }).delete("/:id", async ({ params: { id } }) => await service3.delete(id));
 var _package_default = packageRoutes;
 
 // src/routes/company/serviceKind/logic.ts
@@ -281043,6 +281069,21 @@ var companySchemaRoutes = new Elysia({
 }).use(company_default).use(branch_default).use(_package_default).use(serviceKind_default).use(employee_default).use(account_default).use(billingPlan_default).use(invoice_default);
 var company_default2 = companySchemaRoutes;
 
+// src/lib/db/helpers/catch-duplicated-error.ts
+var catchDuplicatedError = (err2, message2) => {
+  if (err2 instanceof DrizzleQueryError) {
+    if (err2.cause instanceof DatabaseError) {
+      return status("Conflict", message2);
+    }
+    return status("Internal Server Error", {
+      message: err2.message,
+      name: err2.name,
+      query: err2.query
+    });
+  }
+  return status("Internal Server Error", err2);
+};
+
 // src/lib/utils/dataStore.logic.ts
 var DataStoreLogic;
 ((DataStoreLogic) => {
@@ -281195,7 +281236,7 @@ var ERRORS = {
   ITEM_NOT_FOUND: "\u0410\u0433\u0443\u0443\u043B\u0430\u0445\u044B\u043D \u0431\u0430\u0440\u0430\u0430 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.",
   PRODUCT_NOT_FOUND: "\u0411\u0430\u0440\u0430\u0430\u043D\u044B \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.",
   INSUFFICIENT_STOCK: "\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.",
-  ITEM_CONFLICT: "\u0410\u0433\u0443\u0443\u043B\u0430\u0445\u044B\u043D \u0431\u0430\u0440\u0430\u0430\u043D\u044B \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0434\u0430\u0432\u0445\u0446\u0430\u0436 \u0431\u0430\u0439\u043D\u0430."
+  ITEM_CONFLICT: "\u0422\u0443\u0445\u0430\u0439\u043D \u0430\u0433\u0443\u0443\u043B\u0430\u0445\u0430\u0434 \u0431\u0430\u0440\u0430\u0430\u043D\u044B \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0434\u0430\u0432\u0445\u0446\u0430\u0436 \u0431\u0430\u0439\u043D\u0430."
 };
 var WarehouseItemLogic;
 ((WarehouseItemLogic) => {
@@ -281225,10 +281266,7 @@ var WarehouseItemLogic;
       const [result] = await db_default.insert(warehouseItemTable).values(body).returning();
       return result;
     } catch (err2) {
-      if (err2 instanceof DrizzleQueryError && err2.cause instanceof DatabaseError) {
-        return status("Conflict", ERRORS.ITEM_CONFLICT);
-      }
-      return status("Internal Server Error", err2);
+      return catchDuplicatedError(err2, ERRORS.ITEM_CONFLICT);
     }
   };
   WarehouseItemLogic.update = async (id, body) => {
@@ -281239,10 +281277,7 @@ var WarehouseItemLogic;
       }
       return result;
     } catch (err2) {
-      if (err2 instanceof DrizzleQueryError && err2.cause instanceof DatabaseError) {
-        return status("Conflict", ERRORS.ITEM_CONFLICT);
-      }
-      return status("Internal Server Error", err2);
+      return catchDuplicatedError(err2, ERRORS.ITEM_CONFLICT);
     }
   };
   WarehouseItemLogic.upload = async (body) => {
@@ -281747,7 +281782,7 @@ var CrmSpPackageLogic;
     const services = rows.map((row) => row.service ? {
       ...row.service,
       name: row.serviceName
-    } : undefined).filter((i2) => Boolean(i2)).filter((service5, index2, self2) => index2 === self2.findIndex((t2) => t2.id === service5?.id));
+    } : undefined).filter((i2) => Boolean(i2)).filter((service4, index2, self2) => index2 === self2.findIndex((t2) => t2.id === service4?.id));
     return {
       spPackage,
       products,
@@ -288392,10 +288427,7 @@ var NotificationChannelLogic;
       const [result] = await db_default.insert(nmChannelTable).values(body).returning();
       return result;
     } catch (err2) {
-      if (err2 instanceof DrizzleQueryError && err2.cause instanceof DatabaseError && err2.cause.code === "23505") {
-        return status("Conflict", "nmKey \u0434\u0430\u0432\u0445\u0446\u0430\u0436 \u0431\u0430\u0439\u043D\u0430.");
-      }
-      return status("Internal Server Error", "\u0421\u0443\u0432\u0430\u0433 \u04AF\u04AF\u0441\u0433\u044D\u0445\u044D\u0434 \u0430\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430.");
+      return catchDuplicatedError(err2, "nmKey \u0434\u0430\u0432\u0445\u0446\u0430\u0436 \u0431\u0430\u0439\u043D\u0430.");
     }
   };
   NotificationChannelLogic.update = async (id, body) => {
@@ -288406,10 +288438,7 @@ var NotificationChannelLogic;
       }
       return result;
     } catch (err2) {
-      if (err2 instanceof DrizzleQueryError && err2.cause instanceof DatabaseError && err2.cause.code === "23505") {
-        return status("Conflict", "nmKey \u0434\u0430\u0432\u0445\u0446\u0430\u0436 \u0431\u0430\u0439\u043D\u0430.");
-      }
-      return status("Internal Server Error", "\u0421\u0443\u0432\u0430\u0433 \u0437\u0430\u0441\u0430\u0445\u044D\u0434 \u0430\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430.");
+      return catchDuplicatedError(err2, "nmKey \u0434\u0430\u0432\u0445\u0446\u0430\u0436 \u0431\u0430\u0439\u043D\u0430.");
     }
   };
   NotificationChannelLogic.remove = async (id) => {

package/package.json

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