autosync_backend2 1.2.11 → 1.2.12

package/dist/index.d.ts

@@ -994,6 +994,7 @@ export declare const app: Elysia<"", {
                         warehouseId?: string | undefined;
                         safetyStock?: number | undefined;
                         shelfNumber?: string | undefined;
+                        isSafetyStock?: boolean | undefined;
                         pagination: {
                             size: number;
                             page: number;
@@ -1011,6 +1012,8 @@ export declare const app: Elysia<"", {
                                     quantity: number;
                                     safetyStock: number;
                                     shelfNumber: string | null;
+                                    description: string | null;
+                                    isOrdered: boolean;
                                     id: string;
                                     createdAt: string;
                                     updatedAt: string;
@@ -1066,8 +1069,10 @@ export declare const app: Elysia<"", {
                 post: {
                     body: {
                         oldId?: number | null | undefined;
+                        description?: string | null | undefined;
                         quantity?: number | undefined;
                         shelfNumber?: string | null | undefined;
+                        isOrdered?: boolean | undefined;
                         productId: string;
                         warehouseId: string;
                         safetyStock: number;
@@ -1082,11 +1087,13 @@ export declare const app: Elysia<"", {
                             updatedAt: string;
                             deletedAt: string | null;
                             oldId: number | null;
+                            description: string | null;
                             quantity: number;
                             productId: string;
                             warehouseId: string;
                             safetyStock: number;
                             shelfNumber: string | null;
+                            isOrdered: boolean;
                         };
                         422: {
                             type: "validation";
@@ -1106,8 +1113,10 @@ export declare const app: Elysia<"", {
                     post: {
                         body: {
                             oldId?: number | null | undefined;
+                            description?: string | null | undefined;
                             quantity?: number | undefined;
                             shelfNumber?: string | null | undefined;
+                            isOrdered?: boolean | undefined;
                             productId: string;
                             warehouseId: string;
                             safetyStock: number;
@@ -1199,6 +1208,8 @@ export declare const app: Elysia<"", {
                                         quantity: number;
                                         safetyStock: number;
                                         shelfNumber: string | null;
+                                        description: string | null;
+                                        isOrdered: boolean;
                                         id: string;
                                         createdAt: string;
                                         updatedAt: string;
@@ -1270,6 +1281,8 @@ export declare const app: Elysia<"", {
                                 quantity: number;
                                 safetyStock: number;
                                 shelfNumber: string | null;
+                                description: string | null;
+                                isOrdered: boolean;
                                 id: string;
                                 createdAt: string;
                                 updatedAt: string;
@@ -1297,10 +1310,12 @@ export declare const app: Elysia<"", {
                     put: {
                         body: {
                             oldId?: number | null | undefined;
+                            description?: string | null | undefined;
                             productId?: string | undefined;
                             warehouseId?: string | undefined;
                             safetyStock?: number | undefined;
                             shelfNumber?: string | null | undefined;
+                            isOrdered?: boolean | undefined;
                         };
                         params: {
                             id: string;
@@ -1314,6 +1329,8 @@ export declare const app: Elysia<"", {
                                 quantity: number;
                                 safetyStock: number;
                                 shelfNumber: string | null;
+                                description: string | null;
+                                isOrdered: boolean;
                                 id: string;
                                 createdAt: string;
                                 updatedAt: string;

package/dist/index.js

@@ -151617,7 +151617,9 @@ var warehouseItemTable = warehouseSchema.table("item", {
   productId: uuid8().notNull(),
   quantity: numeric({ mode: "number" }).notNull().default(0),
   safetyStock: numeric({ mode: "number" }).notNull(),
-  shelfNumber: varchar()
+  shelfNumber: varchar(),
+  description: text(),
+  isOrdered: boolean4().notNull().default(false)
 }, (t2) => [unique().on(t2.warehouseId, t2.productId)]);
 var warehouseTransactionTypeEnum = warehouseSchema.enum("transaction_type", ["IN", "OUT"]);
 var warehouseTransactionKindEnum = warehouseSchema.enum("transaction_kind", ["TRANSFER", "RETURN", "ADJUSTMENT", "REJECTION", "ORDER", "SALES"]);
@@ -154541,17 +154543,14 @@ var secondaryStorage = {
   }
 };
 var auth2 = betterAuth({
-  database: drizzleAdapter(db_default, {
-    provider: "pg"
-  }),
-  emailAndPassword: {
-    enabled: true
-  },
-  plugins: [openAPI(), bearer()],
-  basePath: "/api",
-  secondaryStorage,
   user: {
     additionalFields: {
+      branchId: {
+        type: "string"
+      },
+      companyId: {
+        type: "string"
+      },
       kind: {
         type: userKindEnum.enumValues,
         defaultValue: "CUSTOMER"
@@ -154559,15 +154558,18 @@ var auth2 = betterAuth({
       employeeId: {
         type: "string",
         required: false
-      },
-      branchId: {
-        type: "string"
-      },
-      companyId: {
-        type: "string"
       }
     }
   },
+  database: drizzleAdapter(db_default, {
+    provider: "pg"
+  }),
+  emailAndPassword: {
+    enabled: true
+  },
+  plugins: [openAPI(), bearer()],
+  basePath: "/api",
+  secondaryStorage,
   logger: {
     log(level, ...args) {
       if (level === "error" && args[0] === "Error" && args.length === 2 && args[1] instanceof Error && args[1].message === "NOT_FOUND")
@@ -154575,17 +154577,7 @@ var auth2 = betterAuth({
       console[level](...args);
     }
   },
-  telemetry: {
-    enabled: false
-  },
-  trustedOrigins: ["https://user.autosync.mn", "https://admin.autosync.mn"],
-  advanced: {
-    defaultCookieAttributes: {
-      sameSite: "None",
-      secure: true,
-      httpOnly: true
-    }
-  }
+  trustedOrigins: ["https://user.autosync.mn", "https://admin.autosync.mn"]
 });
 var _schema;
 var getSchema2 = async () => _schema ??= auth2.api.generateOpenAPISchema();
@@ -155738,7 +155730,7 @@ 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 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), lte(warehouseItemTable.safetyStock, warehouseItemTable.quantity).if(query.isSafetyStock), ilike(warehouseItemTable.shelfNumber, `%${query.shelfNumber}%`).if(query.shelfNumber), eq(warehouseItemTable.warehouseId, query.warehouseId).if(query.warehouseId));
     const baseQuery = db_default.select({
       item: warehouseItemTable,
       supplier: techdocSupplierTable,
@@ -161881,13 +161873,35 @@ var userRoutes = new Elysia({
   query: selectUserSchema,
   userKind: "COMPANY_ADMIN"
 }).get("/me", async ({ user: user2 }) => {
-  const company2 = await service3.get({
-    id: user2.companyId,
-    pagination: { size: 1, page: 1 }
+  const cacheKey = `user_company_${user2.companyId}`;
+  const cached4 = await redis_client_default.get(cacheKey);
+  if (cached4) {
+    return {
+      ...user2,
+      company: cached4
+    };
+  }
+  const company2 = await db_default.query.companyCompanyTable.findFirst({
+    where: (t2, { eq: eq2 }) => eq2(t2.id, user2.companyId),
+    columns: {
+      id: true,
+      name: true,
+      logoUrl: true,
+      regNumber: true,
+      province: true,
+      district: true,
+      khoroo: true,
+      street: true,
+      email: true,
+      phone: true
+    }
   });
+  if (company2) {
+    await redis_client_default.set(cacheKey, company2);
+  }
   return {
     ...user2,
-    company: company2.result[0]
+    company: company2
   };
 }).post("/", async ({ body, user: user2 }) => logic_default23.registerUser(body, user2), {
   body: createUserSchema,
@@ -161941,7 +161955,8 @@ var WarehouseItemModel;
       warehouseId: t.String({ format: "uuid" }),
       isActive: t.Boolean({
         default: true
-      })
+      }),
+      isSafetyStock: t.Boolean()
     }))
   ]);
   WarehouseItemModel.selectTransaction = t.Composite([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autosync_backend2",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "module": "src/index.ts",
   "type": "module",
   "main": "dist/index.js",
@@ -22,13 +22,13 @@
     "@bogeychan/elysia-logger": "^0.1.10",
     "@elysiajs/cors": "^1.4.0",
     "@elysiajs/cron": "^1.4.1",
-    "@elysiajs/eden": "^1.4.3",
+    "@elysiajs/eden": "^1.4.4",
     "@elysiajs/openapi": "^1.4.11",
     "@elysiajs/swagger": "^1.3.1",
     "@react-email/components": "^0.0.41",
     "@sinclair/typebox": "^0.34.40",
     "@upstash/redis": "^1.35.4",
-    "better-auth": "^1.3.18",
+    "better-auth": "^1.3.27",
     "drizzle-orm": "^0.44.4",
     "drizzle-typebox": "^0.3.3",
     "elysia": "1.4.11",