@rxdrag/website-lib-core 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -23,9 +23,9 @@
     "@types/react-dom": "^19.1.0",
     "eslint": "^9.39.2",
     "typescript": "^5",
-    "@rxdrag/tiptap-preview": "0.1.0",
+    "@rxdrag/tsconfig": "0.3.0",
     "@rxdrag/eslint-config-custom": "0.3.0",
-    "@rxdrag/tsconfig": "0.3.0"
+    "@rxdrag/tiptap-preview": "0.1.0"
   },
   "dependencies": {
     "@iconify/utils": "^3.0.2",

package/src/entify/lib/queryAllProducts.ts

@@ -11,47 +11,62 @@ import { EnvVariables } from "../types";
 import { ListResult } from "@rxdrag/entify-lib";
 import { TProduct } from "../view-model";
 import { queryEntityList } from "./queryEntityList";
+import { queryProductCategories } from "./queryProductCategories";
+import { queryProducts } from "./queryProducts";
 
 const PAGE_SIZE = 500;
 
 export async function queryAllProducts(envVariables: EnvVariables, langAbbr: string) {
+  const products = new Map<string, TProduct>();
+  const result = await queryPagedProducts(envVariables, langAbbr);
+  addProducts(products, result?.items);
+
+  const categories = flattenCategories(await queryProductCategories(envVariables, langAbbr));
+  for (const category of categories) {
+    if (!category.slug) continue;
+
+    const categoryResult = await queryPagedProducts(envVariables, langAbbr, String(category.slug));
+    addProducts(products, categoryResult?.items);
+  }
+
+  return {
+    ...result,
+    total: products.size,
+    items: Array.from(products.values()),
+  } as ListResult<TProduct>;
+}
+
+async function queryPagedProducts(
+  envVariables: EnvVariables,
+  langAbbr: string,
+  category?: string,
+) {
   const items: TProduct[] = [];
   let offset = 0;
+  let lastResult: ListResult<TProduct> | undefined;
 
   while (true) {
-    const queryOptions = new ProductQueryOptions([ProductFields.id, ProductFields.slug], {
-      offset,
-      limit: PAGE_SIZE,
-      where: {
-        [ProductFields.status]: {
-          _eq: PublishableStatus.published,
+    const result = category
+      ? await queryProducts(
+        {
+          category,
+          page: offset / PAGE_SIZE + 1,
+          pageSize: PAGE_SIZE,
         },
-        _or: [
-          { [ProductFields.isDeleted]: { _eq: false } },
-          { [ProductFields.isDeleted]: { _isNull: true } },
-        ],
-        lang: {
-          abbr: {
-            _eq: langAbbr,
-          },
-        },
-      },
-      orderBy: [{ [ProductFields.seqValue]: "asc" }],
-    });
-
-    const result = await queryEntityList<
-      Product,
-      ProductBoolExp,
-      ProductOrderBy,
-      ProductDistinctExp
-    >(queryOptions, envVariables) as ListResult<TProduct> | undefined;
+        undefined,
+        envVariables,
+        ["slug"],
+        langAbbr,
+      )
+      : await queryProductSlugPage(envVariables, langAbbr, offset);
 
+    lastResult = result;
     const pageItems = result?.items || [];
     items.push(...pageItems);
 
     if (pageItems.length < PAGE_SIZE) {
       return {
-        ...result,
+        ...lastResult,
         items,
       } as ListResult<TProduct>;
     }
@@ -59,3 +74,56 @@ export async function queryAllProducts(envVariables: EnvVariables, langAbbr: str
     offset += PAGE_SIZE;
   }
 }
+
+async function queryProductSlugPage(
+  envVariables: EnvVariables,
+  langAbbr: string,
+  offset: number,
+) {
+  const queryOptions = new ProductQueryOptions([ProductFields.id, ProductFields.slug], {
+    offset,
+    limit: PAGE_SIZE,
+    where: {
+      [ProductFields.status]: {
+        _eq: PublishableStatus.published,
+      },
+      _or: [
+        { [ProductFields.isDeleted]: { _eq: false } },
+        { [ProductFields.isDeleted]: { _isNull: true } },
+      ],
+      lang: {
+        abbr: {
+          _eq: langAbbr,
+        },
+      },
+    },
+    orderBy: [
+      { [ProductFields.seqValue]: "asc" },
+      { [ProductFields.updatedAt]: "desc" },
+    ],
+  });
+
+  return await queryEntityList<
+    Product,
+    ProductBoolExp,
+    ProductOrderBy,
+    ProductDistinctExp
+  >(queryOptions, envVariables) as ListResult<TProduct> | undefined;
+}
+
+function addProducts(products: Map<string, TProduct>, items?: TProduct[]) {
+  items?.forEach((product) => {
+    if (product.slug) {
+      products.set(product.slug, product);
+    }
+  });
+}
+
+function flattenCategories(categories: unknown): Array<{ slug?: string | null; children?: unknown }> {
+  if (!Array.isArray(categories)) return [];
+
+  return categories.flatMap((category) => [
+    category,
+    ...flattenCategories(category?.children),
+  ]);
+}