@things-factory/worksheet-base 4.3.755 → 4.3.756

package/dist-server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.js

@@ -1,179 +1,266 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findSortingReleaseOrdersByTaskNoResolver = void 0;
-const typeorm_1 = require("typeorm");
 const sales_base_1 = require("@things-factory/sales-base");
-const shell_1 = require("@things-factory/shell");
 const auth_base_1 = require("@things-factory/auth-base");
-const warehouse_base_1 = require("@things-factory/warehouse-base");
 const controllers_1 = require("../../../controllers/");
 const setting_base_1 = require("@things-factory/setting-base");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
+// Simple in-memory cache for settings with TTL
+const settingsCache = new Map();
+const SETTINGS_CACHE_TTL = 5 * 60 * 1000; // 5 minutes
+/**
+ * Get setting with caching to avoid repeated database queries
+ */
+async function getCachedSetting(tx, domain, category, name) {
+    const cacheKey = `${domain.id}:${category}:${name}`;
+    const cached = settingsCache.get(cacheKey);
+    if (cached && cached.expiry > Date.now()) {
+        return cached.value;
+    }
+    const setting = await tx.getRepository(setting_base_1.Setting).findOne({
+        where: { domain, category, name }
+    });
+    settingsCache.set(cacheKey, { value: setting || null, expiry: Date.now() + SETTINGS_CACHE_TTL });
+    return setting || null;
+}
+/**
+ * Find worksheet by release good name - returns task info if found
+ */
+async function findWorksheetByReleaseGoodName(tx, domain, taskNo) {
+    const result = await tx
+        .getRepository(entities_1.Worksheet)
+        .createQueryBuilder('ws')
+        .select('ws.task_no', 'taskNo')
+        .addSelect('ws.status', 'wsStatus')
+        .addSelect('rg.name', 'releaseGoodName')
+        .addSelect('rg.status', 'releaseGoodStatus')
+        .innerJoin('worksheet_details', 'wd', `ws.id = wd.worksheet_id`)
+        .innerJoin('order_inventories', 'oi', `wd.target_inventory_id = oi.id AND wd."type" = 'SORTING'`)
+        .innerJoin('release_goods', 'rg', `rg.id = oi.release_good_id`)
+        .where('rg.domain_id = :domainId', { domainId: domain.id })
+        .andWhere('rg.name = :name', { name: taskNo })
+        .andWhere('rg.status IN (:...statuses)', {
+        statuses: [sales_base_1.ORDER_STATUS.READY_TO_SORT, sales_base_1.ORDER_STATUS.SORTING, sales_base_1.ORDER_STATUS.LOADING, sales_base_1.ORDER_STATUS.DONE]
+    })
+        .andWhere('ws.type = :type', { type: constants_1.WORKSHEET_TYPE.SORTING })
+        .getRawOne();
+    if (!result)
+        return null;
+    if (result.releaseGoodStatus === 'LOADING' || result.releaseGoodStatus === 'DONE') {
+        throw new Error(`Release Good already sorted`);
+    }
+    return {
+        taskNo: result.taskNo,
+        selectedReleaseGood: result.releaseGoodName,
+        status: result.wsStatus
+    };
+}
+/**
+ * Find worksheet by taskNo directly - optimized to only load needed relations
+ */
+async function findWorksheetByTaskNo(tx, domain, taskNo, loadWorksheetDetails = false) {
+    const relations = loadWorksheetDetails ? ['bizplace', 'bizplace.domain', 'worksheetDetails'] : ['bizplace', 'bizplace.domain'];
+    return tx.getRepository(entities_1.Worksheet).findOne({
+        where: { taskNo, type: constants_1.WORKSHEET_TYPE.SORTING, domain },
+        relations
+    });
+}
+/**
+ * Find worksheet by bin location - combines location lookup and worksheet query
+ * Returns both taskNo and worksheet status in a single optimized query
+ */
+async function findWorksheetByBinLocation(tx, domain, binName) {
+    // Combined query: location -> order inventory -> worksheet in one go
+    const result = await tx
+        .getRepository(sales_base_1.OrderInventory)
+        .createQueryBuilder('oi')
+        .select('ws2.task_no', 'taskNo')
+        .addSelect('ws2.id', 'worksheetId')
+        .addSelect('ws2.status', 'status')
+        .innerJoin('locations', 'loc', 'oi.bin_location_id = loc.id')
+        .innerJoin('worksheets', 'ws', `oi.ref_worksheet_id = ws.id AND ws.type = 'BATCH_PICKING'`)
+        .innerJoin('worksheets', 'ws2', `ws2.task_no = ws.task_no AND ws2.type = 'SORTING'`)
+        .innerJoin('release_goods', 'rg', 'rg.id = oi.release_good_id')
+        .where('oi.domain_id = :domainId', { domainId: domain.id })
+        .andWhere('loc.domain_id = :domainId', { domainId: domain.id })
+        .andWhere('loc.name = :binName', { binName })
+        .andWhere('oi.status IN (:...orderInventoryStatus)', {
+        orderInventoryStatus: [sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_SORT, sales_base_1.ORDER_INVENTORY_STATUS.SORTING]
+    })
+        .andWhere('rg.status IN (:...statuses)', {
+        statuses: [sales_base_1.ORDER_STATUS.READY_TO_SORT, sales_base_1.ORDER_STATUS.SORTING]
+    })
+        .andWhere('ws2.status IN (:...worksheetStatuses)', {
+        worksheetStatuses: [constants_1.WORKSHEET_STATUS.DEACTIVATED, constants_1.WORKSHEET_STATUS.EXECUTING]
+    })
+        .getRawOne();
+    if (!result) {
+        throw new Error(`Bin do not have any batch picking order.`);
+    }
+    return {
+        taskNo: result.taskNo,
+        worksheetId: result.worksheetId,
+        status: result.status
+    };
+}
+/**
+ * Handle worksheet activation if needed
+ */
+async function handleWorksheetActivation(tx, domain, user, task) {
+    var _a, _b, _c;
+    if (task.status !== 'DEACTIVATED')
+        return;
+    const sortingWSCtrl = new controllers_1.SortingWorksheetController(tx, domain, user);
+    // Use cached settings
+    const directActivateSetting = await getCachedSetting(tx, domain, 'id-rule', 'enable-direct-activate-sorting-worksheet');
+    if (!directActivateSetting || ((_a = directActivateSetting.value) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== 'true') {
+        throw new Error('Kindly go to sorting worksheet page to activate the sorting worksheet');
+    }
+    // Only fetch partner setting if main setting is enabled
+    const partnerSetting = await tx.getRepository(setting_base_1.PartnerSetting).findOne({
+        where: {
+            setting: directActivateSetting,
+            domain: domain,
+            partnerDomain: (_b = task.bizplace) === null || _b === void 0 ? void 0 : _b.domain
+        }
+    });
+    // If partner setting exists and is false, don't activate
+    if (partnerSetting && ((_c = partnerSetting.value) === null || _c === void 0 ? void 0 : _c.toLowerCase()) !== 'true') {
+        throw new Error('Kindly go to sorting worksheet page to activate the sorting worksheet');
+    }
+    // Load worksheet details only when needed for activation
+    if (!task.worksheetDetails) {
+        const taskWithDetails = await tx.getRepository(entities_1.Worksheet).findOne({
+            where: { id: task.id },
+            relations: ['worksheetDetails']
+        });
+        task.worksheetDetails = (taskWithDetails === null || taskWithDetails === void 0 ? void 0 : taskWithDetails.worksheetDetails) || [];
+    }
+    await sortingWSCtrl.activateSorting(task.name, task.worksheetDetails);
+}
+/**
+ * Build and execute release goods query with item counts in a SINGLE query
+ * Optimizations:
+ * - Removed redundant Domain join (filter directly on ws.domain_id)
+ * - Combined release goods + counts into one query using aggregate functions
+ */
+async function getReleaseGoodsWithCounts(tx, domain, taskNo) {
+    // Single query that gets release goods with their counts using aggregation
+    const releaseGoods = await tx
+        .getRepository(entities_1.Worksheet)
+        .createQueryBuilder('ws')
+        .select('rg.id', 'id')
+        .addSelect('rg.name', 'name')
+        .addSelect('rg.refNo', 'refNo')
+        .addSelect('rg.refNo2', 'refNo2')
+        .addSelect('rg.status', 'status')
+        .addSelect('rg.district', 'district')
+        .addSelect('rg.attention_company', 'attentionCompany')
+        .addSelect('rg.delivery_address_1', 'deliveryAddress1')
+        .addSelect('rg.delivery_address_2', 'deliveryAddress2')
+        .addSelect('rg.delivery_address_3', 'deliveryAddress3')
+        .addSelect('rg.delivery_address_4', 'deliveryAddress4')
+        .addSelect('rg.delivery_address_5', 'deliveryAddress5')
+        .addSelect('rg.created_at', 'createdAt')
+        .addSelect('u.name', 'sortedByUser')
+        // Counts computed directly in the same query
+        .addSelect('COUNT(oi.id)', 'totalCount')
+        .addSelect('SUM(CASE WHEN oi.sorted_qty = oi.release_qty THEN 1 ELSE 0 END)', 'completedCount')
+        .innerJoin(entities_1.WorksheetDetail, 'wsd', 'ws.id = wsd.worksheet_id')
+        .innerJoin(sales_base_1.OrderInventory, 'oi', 'oi.id = wsd.target_inventory_id')
+        .innerJoin(sales_base_1.ReleaseGood, 'rg', 'rg.id = oi.release_good_id')
+        .leftJoin(auth_base_1.User, 'u', 'rg.sorted_by_id = u.id')
+        // Filter directly on ws.domain_id - no need to join Domain table
+        .where('ws.domain_id = :domainId', { domainId: domain.id })
+        .andWhere('ws.taskNo = :taskNo', { taskNo })
+        .andWhere('ws.type = :worksheetType', { worksheetType: constants_1.WORKSHEET_TYPE.SORTING })
+        .andWhere('ws.status = :worksheetStatus', { worksheetStatus: constants_1.WORKSHEET_STATUS.EXECUTING })
+        .groupBy('rg.id')
+        .addGroupBy('rg.name')
+        .addGroupBy('rg.refNo')
+        .addGroupBy('rg.refNo2')
+        .addGroupBy('rg.status')
+        .addGroupBy('rg.district')
+        .addGroupBy('rg.attention_company')
+        .addGroupBy('rg.delivery_address_1')
+        .addGroupBy('rg.delivery_address_2')
+        .addGroupBy('rg.delivery_address_3')
+        .addGroupBy('rg.delivery_address_4')
+        .addGroupBy('rg.delivery_address_5')
+        .addGroupBy('rg.created_at')
+        .addGroupBy('u.name')
+        .orderBy('rg.created_at', 'ASC')
+        .getRawMany();
+    // Transform results to include itemCounts
+    return releaseGoods.map(rg => {
+        const total = parseInt(rg.totalCount) || 0;
+        const completed = parseInt(rg.completedCount) || 0;
+        return {
+            id: rg.id,
+            name: rg.name,
+            refNo: rg.refNo,
+            refNo2: rg.refNo2,
+            status: rg.status,
+            district: rg.district,
+            attentionCompany: rg.attentionCompany,
+            deliveryAddress1: rg.deliveryAddress1,
+            deliveryAddress2: rg.deliveryAddress2,
+            deliveryAddress3: rg.deliveryAddress3,
+            deliveryAddress4: rg.deliveryAddress4,
+            deliveryAddress5: rg.deliveryAddress5,
+            sortedByUser: rg.sortedByUser,
+            itemCounts: {
+                total,
+                pending: total - completed
+            }
+        };
+    });
+}
 exports.findSortingReleaseOrdersByTaskNoResolver = {
     async findSortingReleaseOrdersByTaskNo(_, { taskNo }, context) {
-        var _a;
+        const startTime = Date.now();
         const { domain, tx, user } = context.state;
         let selectedReleaseGood = null;
-        let ws = await tx
-            .getRepository(entities_1.Worksheet)
-            .createQueryBuilder('ws')
-            .addSelect('rg.name', 'release_good_name')
-            .addSelect('rg.status', 'release_good_status')
-            .innerJoin('worksheet_details', 'wd', `ws.id = wd.worksheet_id`)
-            .innerJoin('order_inventories', 'oi', `wd.target_inventory_id = oi.id and wd."type" ='SORTING'`)
-            .innerJoin('release_goods', 'rg', `rg.id = oi.release_good_id`)
-            .where('rg.domain_id = :domainId', { domainId: domain.id })
-            .andWhere('rg.name = :name', { name: taskNo })
-            .andWhere('rg.status IN (:...statuses)', {
-            statuses: [sales_base_1.ORDER_STATUS.READY_TO_SORT, sales_base_1.ORDER_STATUS.SORTING, sales_base_1.ORDER_STATUS.LOADING, sales_base_1.ORDER_STATUS.DONE]
-        })
-            .andWhere('ws.type = :type', { type: constants_1.WORKSHEET_TYPE.SORTING })
-            .getRawOne();
-        if (ws) {
-            if (ws.release_good_status == 'LOADING' || ws.release_good_status == 'DONE') {
-                throw new Error(`Release Good already sorted`);
-            }
-            selectedReleaseGood = ws.release_good_name;
-            taskNo = ws.ws_task_no;
+        let task = null;
+        let resolvedTaskNo = taskNo;
+        // Step 1: Try to find by release good name first (most common case)
+        const releaseGoodResult = await findWorksheetByReleaseGoodName(tx, domain, taskNo);
+        if (releaseGoodResult) {
+            selectedReleaseGood = releaseGoodResult.selectedReleaseGood;
+            resolvedTaskNo = releaseGoodResult.taskNo;
+            // Only load worksheetDetails if we need them for activation
+            const needsActivation = releaseGoodResult.status === 'DEACTIVATED';
+            task = await findWorksheetByTaskNo(tx, domain, resolvedTaskNo, needsActivation);
         }
-        let task = await tx.getRepository(entities_1.Worksheet).findOne({
-            where: { taskNo, type: constants_1.WORKSHEET_TYPE.SORTING, domain },
-            relations: ['bizplace', 'bizplace.domain', 'worksheetDetails']
-        });
-        // Find Task based on Bin
+        // Step 2: Try to find by worksheet taskNo directly
+        if (!task) {
+            task = await findWorksheetByTaskNo(tx, domain, taskNo, false);
+        }
+        // Step 3: Try to find by bin location
         if (!task) {
-            const binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
-                where: { domain, name: taskNo }
-            });
-            if (binLocation) {
-                const qb = tx
-                    .getRepository(sales_base_1.OrderInventory)
-                    .createQueryBuilder('orderInventory');
-                qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
-                    .innerJoinAndSelect('worksheets', 'ws', `orderInventory.ref_worksheet_id = ws.id AND ws.type = 'BATCH_PICKING'`)
-                    .innerJoinAndSelect('worksheets', 'ws2', `ws2.task_no = ws.task_no AND ws2.type = 'SORTING'`)
-                    .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
-                    .innerJoinAndSelect('bizplace.domain', 'domain')
-                    .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
-                    .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
-                    orderInventoryStatus: [sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_SORT, sales_base_1.ORDER_INVENTORY_STATUS.SORTING]
-                })
-                    .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
-                    .andWhere('releaseGood.status IN (:...statuses)', {
-                    statuses: [sales_base_1.ORDER_STATUS.READY_TO_SORT, sales_base_1.ORDER_STATUS.SORTING]
-                });
-                const orderInventoryByBin = await qb.getRawOne();
-                if (orderInventoryByBin === null || orderInventoryByBin === void 0 ? void 0 : orderInventoryByBin.releaseGood_id) {
-                    taskNo = orderInventoryByBin.ws_task_no;
-                    task = await tx.getRepository(entities_1.Worksheet).findOne({
-                        where: {
-                            taskNo,
-                            status: (0, typeorm_1.In)([constants_1.WORKSHEET_STATUS.DEACTIVATED, constants_1.WORKSHEET_STATUS.EXECUTING]),
-                            type: constants_1.WORKSHEET_TYPE.SORTING,
-                            domain
-                        },
-                        relations: ['worksheetDetails']
-                    });
-                }
-                else {
-                    throw new Error(`Bin do not have any batch picking order.`);
-                }
+            const binResult = await findWorksheetByBinLocation(tx, domain, taskNo);
+            if (binResult) {
+                resolvedTaskNo = binResult.taskNo;
+                // Only load worksheetDetails if we need them for activation
+                const needsActivation = binResult.status === 'DEACTIVATED';
+                task = await findWorksheetByTaskNo(tx, domain, resolvedTaskNo, needsActivation);
             }
         }
-        if (!task)
+        if (!task) {
             throw new Error('Unable to find task no.');
-        if (task.status === 'DEACTIVATED') {
-            const sortingWSCtrl = new controllers_1.SortingWorksheetController(tx, domain, user);
-            const directActivateSortingWorksheet = await tx.getRepository(setting_base_1.Setting).findOne({
-                where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-sorting-worksheet' }
-            });
-            const partnerDirectActivateSortingWorksheetSetting = await tx
-                .getRepository(setting_base_1.PartnerSetting)
-                .findOne({
-                where: {
-                    setting: directActivateSortingWorksheet,
-                    domain: domain,
-                    partnerDomain: (_a = task.bizplace) === null || _a === void 0 ? void 0 : _a.domain
-                }
-            });
-            if (directActivateSortingWorksheet != undefined && directActivateSortingWorksheet.value.toLowerCase() == 'true') {
-                if (partnerDirectActivateSortingWorksheetSetting != undefined) {
-                    if (partnerDirectActivateSortingWorksheetSetting.value.toLowerCase() == 'true')
-                        await sortingWSCtrl.activateSorting(task.name, task.worksheetDetails);
-                }
-                else {
-                    await sortingWSCtrl.activateSorting(task.name, task.worksheetDetails);
-                }
-            }
-            else {
-                throw new Error('Kindly go to sorting worksheet page to activate the sorting worksheet');
-            }
         }
-        const qb = tx
-            .getRepository(entities_1.Worksheet)
-            .createQueryBuilder('ws')
-            .select('rg.id as id')
-            .addSelect('rg.name as name')
-            .addSelect('rg.refNo as "refNo"')
-            .addSelect('rg.refNo2 as "refNo2"')
-            .addSelect('rg.status as status')
-            .addSelect('rg.district as "district"')
-            .addSelect('rg.attention_company as "attentionCompany"')
-            .addSelect('rg.delivery_address_1 as "deliveryAddress1"')
-            .addSelect('rg.delivery_address_2 as "deliveryAddress2"')
-            .addSelect('rg.delivery_address_3 as "deliveryAddress3"')
-            .addSelect('rg.delivery_address_4 as "deliveryAddress4"')
-            .addSelect('rg.delivery_address_5 as "deliveryAddress5"')
-            .addSelect('user.name as "sortedByUser"')
-            .innerJoin(shell_1.Domain, 'domain', 'ws.domain_id = domain.id')
-            .innerJoin(entities_1.WorksheetDetail, 'wsd', 'ws.id = wsd.worksheet_id')
-            .innerJoin(sales_base_1.OrderInventory, 'oi', 'oi.id = wsd.target_inventory_id')
-            .innerJoin(sales_base_1.ReleaseGood, 'rg', 'rg.id = oi.release_good_id')
-            .leftJoin(auth_base_1.User, 'user', 'rg.sorted_by_id = user.id')
-            .where('domain.id = :domainId', { domainId: domain.id })
-            .andWhere('ws.taskNo = :taskNo', { taskNo: taskNo })
-            .andWhere('ws.type = :worksheetType', { worksheetType: constants_1.WORKSHEET_TYPE.SORTING })
-            .andWhere('ws.status = :worksheetStatus', { worksheetStatus: constants_1.WORKSHEET_STATUS.EXECUTING })
-            .groupBy('rg.id')
-            .addGroupBy('rg.name')
-            .addGroupBy('rg.status')
-            .addGroupBy('user.name')
-            .orderBy('rg.createdAt', 'ASC');
-        const releaseGoods = await qb.getRawMany();
-        if (releaseGoods.length > 0) {
-            // Get counts for all release goods in a single query (avoids N+1 problem)
-            const releaseGoodIds = releaseGoods.map(rg => rg.id);
-            const countsResult = await tx
-                .getRepository(sales_base_1.OrderInventory)
-                .createQueryBuilder('orderInventory')
-                .innerJoin(entities_1.WorksheetDetail, 'wsd', 'orderInventory.id = wsd.target_inventory_id')
-                .innerJoin(entities_1.Worksheet, 'ws', 'wsd.worksheet_id = ws.id')
-                .select('orderInventory.release_good_id', 'releaseGoodId')
-                .addSelect('COUNT(*)', 'total')
-                .addSelect('SUM(CASE WHEN orderInventory.sortedQty = orderInventory.releaseQty THEN 1 ELSE 0 END)', 'completed')
-                .where('orderInventory.release_good_id IN (:...releaseGoodIds)', { releaseGoodIds })
-                .andWhere('orderInventory.domain_id = :domainId', { domainId: domain.id })
-                .andWhere('ws.taskNo = :taskNo', { taskNo: taskNo })
-                .andWhere('ws.type = :worksheetType', { worksheetType: constants_1.WORKSHEET_TYPE.SORTING })
-                .andWhere('ws.status = :worksheetStatus', { worksheetStatus: constants_1.WORKSHEET_STATUS.EXECUTING })
-                .groupBy('orderInventory.release_good_id')
-                .getRawMany();
-            // Build a map for quick lookup
-            const countsById = new Map(countsResult.map(c => [
-                c.releaseGoodId,
-                { total: parseInt(c.total) || 0, completed: parseInt(c.completed) || 0 }
-            ]));
-            // Assign itemCounts to each release good
-            for (const releaseGood of releaseGoods) {
-                const counts = countsById.get(releaseGood.id) || { total: 0, completed: 0 };
-                releaseGood['itemCounts'] = {
-                    total: counts.total,
-                    pending: counts.total - counts.completed
-                };
-            }
+        // Step 4: Handle activation if needed
+        await handleWorksheetActivation(tx, domain, user, task);
+        // Step 5: Get release goods with counts
+        const releaseGoods = await getReleaseGoodsWithCounts(tx, domain, resolvedTaskNo);
+        // Performance logging (only in development/debug mode)
+        const elapsed = Date.now() - startTime;
+        if (elapsed > 1000) {
+            console.warn(`[PERF] findSortingReleaseOrdersByTaskNo took ${elapsed}ms for taskNo: ${taskNo}`);
         }
-        return { releaseGoods, taskNo, selectedReleaseGood };
+        return { releaseGoods, taskNo: resolvedTaskNo, selectedReleaseGood };
     }
 };
 //# sourceMappingURL=find-sorting-release-orders-by-task-no.js.map

package/dist-server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-sorting-release-orders-by-task-no.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"find-sorting-release-orders-by-task-no.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.755",
+  "version": "4.3.756",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -46,5 +46,5 @@
     "puppeteer": "21.0.3",
     "uuid": "^9.0.0"
   },
-  "gitHead": "7cd08ee86623f4ab057bd7bbc63f0f2d1be6659b"
+  "gitHead": "b16ce3a1cde77139646a0812c3b198a854e48a19"
 }

package/server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.ts

@@ -8,199 +8,330 @@ import {
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
-import { Location } from '@things-factory/warehouse-base'
 import { SortingWorksheetController } from '../../../controllers/'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet as WorksheetEntity, WorksheetDetail as WorksheetDetailEntity } from '../../../entities'
 
+// Simple in-memory cache for settings with TTL
+const settingsCache = new Map<string, { value: Setting | null; expiry: number }>()
+const SETTINGS_CACHE_TTL = 5 * 60 * 1000 // 5 minutes
+
+/**
+ * Get setting with caching to avoid repeated database queries
+ */
+async function getCachedSetting(
+  tx: EntityManager,
+  domain: Domain,
+  category: string,
+  name: string
+): Promise<Setting | null> {
+  const cacheKey = `${domain.id}:${category}:${name}`
+  const cached = settingsCache.get(cacheKey)
+
+  if (cached && cached.expiry > Date.now()) {
+    return cached.value
+  }
+
+  const setting = await tx.getRepository(Setting).findOne({
+    where: { domain, category, name }
+  })
+
+  settingsCache.set(cacheKey, { value: setting || null, expiry: Date.now() + SETTINGS_CACHE_TTL })
+  return setting || null
+}
+
+/**
+ * Find worksheet by release good name - returns task info if found
+ */
+async function findWorksheetByReleaseGoodName(
+  tx: EntityManager,
+  domain: Domain,
+  taskNo: string
+): Promise<{ taskNo: string; selectedReleaseGood: string; status: string } | null> {
+  const result = await tx
+    .getRepository(WorksheetEntity)
+    .createQueryBuilder('ws')
+    .select('ws.task_no', 'taskNo')
+    .addSelect('ws.status', 'wsStatus')
+    .addSelect('rg.name', 'releaseGoodName')
+    .addSelect('rg.status', 'releaseGoodStatus')
+    .innerJoin('worksheet_details', 'wd', `ws.id = wd.worksheet_id`)
+    .innerJoin('order_inventories', 'oi', `wd.target_inventory_id = oi.id AND wd."type" = 'SORTING'`)
+    .innerJoin('release_goods', 'rg', `rg.id = oi.release_good_id`)
+    .where('rg.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('rg.name = :name', { name: taskNo })
+    .andWhere('rg.status IN (:...statuses)', {
+      statuses: [ORDER_STATUS.READY_TO_SORT, ORDER_STATUS.SORTING, ORDER_STATUS.LOADING, ORDER_STATUS.DONE]
+    })
+    .andWhere('ws.type = :type', { type: WORKSHEET_TYPE.SORTING })
+    .getRawOne()
+
+  if (!result) return null
+
+  if (result.releaseGoodStatus === 'LOADING' || result.releaseGoodStatus === 'DONE') {
+    throw new Error(`Release Good already sorted`)
+  }
+
+  return {
+    taskNo: result.taskNo,
+    selectedReleaseGood: result.releaseGoodName,
+    status: result.wsStatus
+  }
+}
+
+/**
+ * Find worksheet by taskNo directly - optimized to only load needed relations
+ */
+async function findWorksheetByTaskNo(
+  tx: EntityManager,
+  domain: Domain,
+  taskNo: string,
+  loadWorksheetDetails: boolean = false
+): Promise<WorksheetEntity | null> {
+  const relations = loadWorksheetDetails ? ['bizplace', 'bizplace.domain', 'worksheetDetails'] : ['bizplace', 'bizplace.domain']
+
+  return tx.getRepository(WorksheetEntity).findOne({
+    where: { taskNo, type: WORKSHEET_TYPE.SORTING, domain },
+    relations
+  })
+}
+
+/**
+ * Find worksheet by bin location - combines location lookup and worksheet query
+ * Returns both taskNo and worksheet status in a single optimized query
+ */
+async function findWorksheetByBinLocation(
+  tx: EntityManager,
+  domain: Domain,
+  binName: string
+): Promise<{ taskNo: string; worksheetId: string; status: string } | null> {
+  // Combined query: location -> order inventory -> worksheet in one go
+  const result = await tx
+    .getRepository(OrderInventoryEntity)
+    .createQueryBuilder('oi')
+    .select('ws2.task_no', 'taskNo')
+    .addSelect('ws2.id', 'worksheetId')
+    .addSelect('ws2.status', 'status')
+    .innerJoin('locations', 'loc', 'oi.bin_location_id = loc.id')
+    .innerJoin('worksheets', 'ws', `oi.ref_worksheet_id = ws.id AND ws.type = 'BATCH_PICKING'`)
+    .innerJoin('worksheets', 'ws2', `ws2.task_no = ws.task_no AND ws2.type = 'SORTING'`)
+    .innerJoin('release_goods', 'rg', 'rg.id = oi.release_good_id')
+    .where('oi.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('loc.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('loc.name = :binName', { binName })
+    .andWhere('oi.status IN (:...orderInventoryStatus)', {
+      orderInventoryStatus: [ORDER_INVENTORY_STATUS.READY_TO_SORT, ORDER_INVENTORY_STATUS.SORTING]
+    })
+    .andWhere('rg.status IN (:...statuses)', {
+      statuses: [ORDER_STATUS.READY_TO_SORT, ORDER_STATUS.SORTING]
+    })
+    .andWhere('ws2.status IN (:...worksheetStatuses)', {
+      worksheetStatuses: [WORKSHEET_STATUS.DEACTIVATED, WORKSHEET_STATUS.EXECUTING]
+    })
+    .getRawOne()
+
+  if (!result) {
+    throw new Error(`Bin do not have any batch picking order.`)
+  }
+
+  return {
+    taskNo: result.taskNo,
+    worksheetId: result.worksheetId,
+    status: result.status
+  }
+}
+
+/**
+ * Handle worksheet activation if needed
+ */
+async function handleWorksheetActivation(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  task: WorksheetEntity
+): Promise<void> {
+  if (task.status !== 'DEACTIVATED') return
+
+  const sortingWSCtrl = new SortingWorksheetController(tx, domain, user)
+
+  // Use cached settings
+  const directActivateSetting = await getCachedSetting(
+    tx,
+    domain,
+    'id-rule',
+    'enable-direct-activate-sorting-worksheet'
+  )
+
+  if (!directActivateSetting || directActivateSetting.value?.toLowerCase() !== 'true') {
+    throw new Error('Kindly go to sorting worksheet page to activate the sorting worksheet')
+  }
+
+  // Only fetch partner setting if main setting is enabled
+  const partnerSetting: PartnerSetting | null = await tx.getRepository(PartnerSetting).findOne({
+    where: {
+      setting: directActivateSetting,
+      domain: domain,
+      partnerDomain: task.bizplace?.domain
+    }
+  })
+
+  // If partner setting exists and is false, don't activate
+  if (partnerSetting && (partnerSetting.value as string)?.toLowerCase() !== 'true') {
+    throw new Error('Kindly go to sorting worksheet page to activate the sorting worksheet')
+  }
+
+  // Load worksheet details only when needed for activation
+  if (!task.worksheetDetails) {
+    const taskWithDetails = await tx.getRepository(WorksheetEntity).findOne({
+      where: { id: task.id },
+      relations: ['worksheetDetails']
+    })
+    task.worksheetDetails = taskWithDetails?.worksheetDetails || []
+  }
+
+  await sortingWSCtrl.activateSorting(task.name, task.worksheetDetails)
+}
+
+/**
+ * Build and execute release goods query with item counts in a SINGLE query
+ * Optimizations:
+ * - Removed redundant Domain join (filter directly on ws.domain_id)
+ * - Combined release goods + counts into one query using aggregate functions
+ */
+async function getReleaseGoodsWithCounts(
+  tx: EntityManager,
+  domain: Domain,
+  taskNo: string
+): Promise<ReleaseGoodEntity[]> {
+  // Single query that gets release goods with their counts using aggregation
+  const releaseGoods: any[] = await tx
+    .getRepository(WorksheetEntity)
+    .createQueryBuilder('ws')
+    .select('rg.id', 'id')
+    .addSelect('rg.name', 'name')
+    .addSelect('rg.refNo', 'refNo')
+    .addSelect('rg.refNo2', 'refNo2')
+    .addSelect('rg.status', 'status')
+    .addSelect('rg.district', 'district')
+    .addSelect('rg.attention_company', 'attentionCompany')
+    .addSelect('rg.delivery_address_1', 'deliveryAddress1')
+    .addSelect('rg.delivery_address_2', 'deliveryAddress2')
+    .addSelect('rg.delivery_address_3', 'deliveryAddress3')
+    .addSelect('rg.delivery_address_4', 'deliveryAddress4')
+    .addSelect('rg.delivery_address_5', 'deliveryAddress5')
+    .addSelect('rg.created_at', 'createdAt')
+    .addSelect('u.name', 'sortedByUser')
+    // Counts computed directly in the same query
+    .addSelect('COUNT(oi.id)', 'totalCount')
+    .addSelect('SUM(CASE WHEN oi.sorted_qty = oi.release_qty THEN 1 ELSE 0 END)', 'completedCount')
+    .innerJoin(WorksheetDetailEntity, 'wsd', 'ws.id = wsd.worksheet_id')
+    .innerJoin(OrderInventoryEntity, 'oi', 'oi.id = wsd.target_inventory_id')
+    .innerJoin(ReleaseGoodEntity, 'rg', 'rg.id = oi.release_good_id')
+    .leftJoin(User, 'u', 'rg.sorted_by_id = u.id')
+    // Filter directly on ws.domain_id - no need to join Domain table
+    .where('ws.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('ws.taskNo = :taskNo', { taskNo })
+    .andWhere('ws.type = :worksheetType', { worksheetType: WORKSHEET_TYPE.SORTING })
+    .andWhere('ws.status = :worksheetStatus', { worksheetStatus: WORKSHEET_STATUS.EXECUTING })
+    .groupBy('rg.id')
+    .addGroupBy('rg.name')
+    .addGroupBy('rg.refNo')
+    .addGroupBy('rg.refNo2')
+    .addGroupBy('rg.status')
+    .addGroupBy('rg.district')
+    .addGroupBy('rg.attention_company')
+    .addGroupBy('rg.delivery_address_1')
+    .addGroupBy('rg.delivery_address_2')
+    .addGroupBy('rg.delivery_address_3')
+    .addGroupBy('rg.delivery_address_4')
+    .addGroupBy('rg.delivery_address_5')
+    .addGroupBy('rg.created_at')
+    .addGroupBy('u.name')
+    .orderBy('rg.created_at', 'ASC')
+    .getRawMany()
+
+  // Transform results to include itemCounts
+  return releaseGoods.map(rg => {
+    const total = parseInt(rg.totalCount) || 0
+    const completed = parseInt(rg.completedCount) || 0
+    return {
+      id: rg.id,
+      name: rg.name,
+      refNo: rg.refNo,
+      refNo2: rg.refNo2,
+      status: rg.status,
+      district: rg.district,
+      attentionCompany: rg.attentionCompany,
+      deliveryAddress1: rg.deliveryAddress1,
+      deliveryAddress2: rg.deliveryAddress2,
+      deliveryAddress3: rg.deliveryAddress3,
+      deliveryAddress4: rg.deliveryAddress4,
+      deliveryAddress5: rg.deliveryAddress5,
+      sortedByUser: rg.sortedByUser,
+      itemCounts: {
+        total,
+        pending: total - completed
+      }
+    }
+  }) as ReleaseGoodEntity[]
+}
+
 export const findSortingReleaseOrdersByTaskNoResolver = {
   async findSortingReleaseOrdersByTaskNo(_: any, { taskNo }, context: any) {
+    const startTime = Date.now()
     const { domain, tx, user }: { domain: Domain; tx: EntityManager; user: User } = context.state
 
-    let selectedReleaseGood = null
-    let ws = await tx
-      .getRepository(WorksheetEntity)
-      .createQueryBuilder('ws')
-      .addSelect('rg.name', 'release_good_name')
-      .addSelect('rg.status', 'release_good_status')
-      .innerJoin('worksheet_details', 'wd', `ws.id = wd.worksheet_id`)
-      .innerJoin('order_inventories', 'oi', `wd.target_inventory_id = oi.id and wd."type" ='SORTING'`)
-      .innerJoin('release_goods', 'rg', `rg.id = oi.release_good_id`)
-      .where('rg.domain_id = :domainId', { domainId: domain.id })
-      .andWhere('rg.name = :name', { name: taskNo })
-      .andWhere('rg.status IN (:...statuses)', {
-        statuses: [ORDER_STATUS.READY_TO_SORT, ORDER_STATUS.SORTING, ORDER_STATUS.LOADING, ORDER_STATUS.DONE]
-      })
-      .andWhere('ws.type = :type', { type: WORKSHEET_TYPE.SORTING })
-      .getRawOne()
-
-    if (ws) {
-      if (ws.release_good_status == 'LOADING' || ws.release_good_status == 'DONE') {
-        throw new Error(`Release Good already sorted`)
-      }
+    let selectedReleaseGood: string | null = null
+    let task: WorksheetEntity | null = null
+    let resolvedTaskNo = taskNo
+
+    // Step 1: Try to find by release good name first (most common case)
+    const releaseGoodResult = await findWorksheetByReleaseGoodName(tx, domain, taskNo)
 
-      selectedReleaseGood = ws.release_good_name
-      taskNo = ws.ws_task_no
+    if (releaseGoodResult) {
+      selectedReleaseGood = releaseGoodResult.selectedReleaseGood
+      resolvedTaskNo = releaseGoodResult.taskNo
+
+      // Only load worksheetDetails if we need them for activation
+      const needsActivation = releaseGoodResult.status === 'DEACTIVATED'
+      task = await findWorksheetByTaskNo(tx, domain, resolvedTaskNo, needsActivation)
     }
 
-    let task = await tx.getRepository(WorksheetEntity).findOne({
-      where: { taskNo, type: WORKSHEET_TYPE.SORTING, domain },
-      relations: ['bizplace', 'bizplace.domain', 'worksheetDetails']
-    })
+    // Step 2: Try to find by worksheet taskNo directly
+    if (!task) {
+      task = await findWorksheetByTaskNo(tx, domain, taskNo, false)
+    }
 
-    // Find Task based on Bin
+    // Step 3: Try to find by bin location
     if (!task) {
-      const binLocation: Location = await tx.getRepository(Location).findOne({
-        where: { domain, name: taskNo }
-      })
-
-      if (binLocation) {
-        const qb: SelectQueryBuilder<OrderInventoryEntity> = tx
-          .getRepository(OrderInventoryEntity)
-          .createQueryBuilder('orderInventory')
-
-        qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
-          .innerJoinAndSelect(
-            'worksheets',
-            'ws',
-            `orderInventory.ref_worksheet_id = ws.id AND ws.type = 'BATCH_PICKING'`
-          )
-          .innerJoinAndSelect('worksheets', 'ws2', `ws2.task_no = ws.task_no AND ws2.type = 'SORTING'`)
-          .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
-          .innerJoinAndSelect('bizplace.domain', 'domain')
-          .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
-          .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
-            orderInventoryStatus: [ORDER_INVENTORY_STATUS.READY_TO_SORT, ORDER_INVENTORY_STATUS.SORTING]
-          })
-          .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
-          .andWhere('releaseGood.status IN (:...statuses)', {
-            statuses: [ORDER_STATUS.READY_TO_SORT, ORDER_STATUS.SORTING]
-          })
-
-        const orderInventoryByBin = await qb.getRawOne()
-        if (orderInventoryByBin?.releaseGood_id) {
-          taskNo = orderInventoryByBin.ws_task_no
-          task = await tx.getRepository(WorksheetEntity).findOne({
-            where: {
-              taskNo,
-              status: In([WORKSHEET_STATUS.DEACTIVATED, WORKSHEET_STATUS.EXECUTING]),
-              type: WORKSHEET_TYPE.SORTING,
-              domain
-            },
-            relations: ['worksheetDetails']
-          })
-        } else {
-          throw new Error(`Bin do not have any batch picking order.`)
-        }
+      const binResult = await findWorksheetByBinLocation(tx, domain, taskNo)
+
+      if (binResult) {
+        resolvedTaskNo = binResult.taskNo
+        // Only load worksheetDetails if we need them for activation
+        const needsActivation = binResult.status === 'DEACTIVATED'
+        task = await findWorksheetByTaskNo(tx, domain, resolvedTaskNo, needsActivation)
       }
     }
 
-    if (!task) throw new Error('Unable to find task no.')
-
-    if (task.status === 'DEACTIVATED') {
-      const sortingWSCtrl: SortingWorksheetController = new SortingWorksheetController(tx, domain, user)
-
-      const directActivateSortingWorksheet: Setting = await tx.getRepository(Setting).findOne({
-        where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-sorting-worksheet' }
-      })
-
-      const partnerDirectActivateSortingWorksheetSetting: PartnerSetting = await tx
-        .getRepository(PartnerSetting)
-        .findOne({
-          where: {
-            setting: directActivateSortingWorksheet,
-            domain: domain,
-            partnerDomain: task.bizplace?.domain
-          }
-        })
-
-      if (directActivateSortingWorksheet != undefined && directActivateSortingWorksheet.value.toLowerCase() == 'true') {
-        if (partnerDirectActivateSortingWorksheetSetting != undefined) {
-          if (partnerDirectActivateSortingWorksheetSetting.value.toLowerCase() == 'true')
-            await sortingWSCtrl.activateSorting(task.name, task.worksheetDetails)
-        } else {
-          await sortingWSCtrl.activateSorting(task.name, task.worksheetDetails)
-        }
-      } else {
-        throw new Error('Kindly go to sorting worksheet page to activate the sorting worksheet')
-      }
+    if (!task) {
+      throw new Error('Unable to find task no.')
     }
 
-    const qb: SelectQueryBuilder<WorksheetEntity> = tx
-      .getRepository(WorksheetEntity)
-      .createQueryBuilder('ws')
-      .select('rg.id as id')
-      .addSelect('rg.name as name')
-      .addSelect('rg.refNo as "refNo"')
-      .addSelect('rg.refNo2 as "refNo2"')
-      .addSelect('rg.status as status')
-      .addSelect('rg.district as "district"')
-      .addSelect('rg.attention_company as "attentionCompany"')
-      .addSelect('rg.delivery_address_1 as "deliveryAddress1"')
-      .addSelect('rg.delivery_address_2 as "deliveryAddress2"')
-      .addSelect('rg.delivery_address_3 as "deliveryAddress3"')
-      .addSelect('rg.delivery_address_4 as "deliveryAddress4"')
-      .addSelect('rg.delivery_address_5 as "deliveryAddress5"')
-      .addSelect('user.name as "sortedByUser"')
-      .innerJoin(Domain, 'domain', 'ws.domain_id = domain.id')
-      .innerJoin(WorksheetDetailEntity, 'wsd', 'ws.id = wsd.worksheet_id')
-      .innerJoin(OrderInventoryEntity, 'oi', 'oi.id = wsd.target_inventory_id')
-      .innerJoin(ReleaseGoodEntity, 'rg', 'rg.id = oi.release_good_id')
-      .leftJoin(User, 'user', 'rg.sorted_by_id = user.id')
-      .where('domain.id = :domainId', { domainId: domain.id })
-      .andWhere('ws.taskNo = :taskNo', { taskNo: taskNo })
-      .andWhere('ws.type = :worksheetType', { worksheetType: WORKSHEET_TYPE.SORTING })
-      .andWhere('ws.status = :worksheetStatus', { worksheetStatus: WORKSHEET_STATUS.EXECUTING })
-      .groupBy('rg.id')
-      .addGroupBy('rg.name')
-      .addGroupBy('rg.status')
-      .addGroupBy('user.name')
-      .orderBy('rg.createdAt', 'ASC')
-
-    const releaseGoods: ReleaseGoodEntity[] = await qb.getRawMany()
-
-    if (releaseGoods.length > 0) {
-      // Get counts for all release goods in a single query (avoids N+1 problem)
-      const releaseGoodIds = releaseGoods.map(rg => rg.id)
-      const countsResult = await tx
-        .getRepository(OrderInventoryEntity)
-        .createQueryBuilder('orderInventory')
-        .innerJoin(WorksheetDetailEntity, 'wsd', 'orderInventory.id = wsd.target_inventory_id')
-        .innerJoin(WorksheetEntity, 'ws', 'wsd.worksheet_id = ws.id')
-        .select('orderInventory.release_good_id', 'releaseGoodId')
-        .addSelect('COUNT(*)', 'total')
-        .addSelect(
-          'SUM(CASE WHEN orderInventory.sortedQty = orderInventory.releaseQty THEN 1 ELSE 0 END)',
-          'completed'
-        )
-        .where('orderInventory.release_good_id IN (:...releaseGoodIds)', { releaseGoodIds })
-        .andWhere('orderInventory.domain_id = :domainId', { domainId: domain.id })
-        .andWhere('ws.taskNo = :taskNo', { taskNo: taskNo })
-        .andWhere('ws.type = :worksheetType', { worksheetType: WORKSHEET_TYPE.SORTING })
-        .andWhere('ws.status = :worksheetStatus', { worksheetStatus: WORKSHEET_STATUS.EXECUTING })
-        .groupBy('orderInventory.release_good_id')
-        .getRawMany()
-
-      // Build a map for quick lookup
-      const countsById = new Map(
-        countsResult.map(c => [
-          c.releaseGoodId,
-          { total: parseInt(c.total) || 0, completed: parseInt(c.completed) || 0 }
-        ])
-      )
-
-      // Assign itemCounts to each release good
-      for (const releaseGood of releaseGoods) {
-        const counts = countsById.get(releaseGood.id) || { total: 0, completed: 0 }
-        releaseGood['itemCounts'] = {
-          total: counts.total,
-          pending: counts.total - counts.completed
-        }
-      }
+    // Step 4: Handle activation if needed
+    await handleWorksheetActivation(tx, domain, user, task)
+
+    // Step 5: Get release goods with counts
+    const releaseGoods = await getReleaseGoodsWithCounts(tx, domain, resolvedTaskNo)
+
+    // Performance logging (only in development/debug mode)
+    const elapsed = Date.now() - startTime
+    if (elapsed > 1000) {
+      console.warn(`[PERF] findSortingReleaseOrdersByTaskNo took ${elapsed}ms for taskNo: ${taskNo}`)
     }
 
-    return { releaseGoods, taskNo, selectedReleaseGood }
+    return { releaseGoods, taskNo: resolvedTaskNo, selectedReleaseGood }
   }
 }