@things-factory/sales-base 4.0.42 → 4.1.0

package/server/service/release-good/release-good-mutation.ts

@@ -133,7 +133,7 @@ export class ReleaseGoodMutation {
           context,
           tx
         )
-      } catch (error) {}
+      } catch (error) { }
 
     if (errorsCaught.length)
       throw new ValidationError({
@@ -196,12 +196,12 @@ export class ReleaseGoodMutation {
   ): Promise<ReleaseGood> {
     const { tx, domain, user } = context.state
     let foundReleaseGood = await tx.getRepository(ReleaseGood).findOne({
-      where: { name: releaseGood.name, domain },
+      where: { id: releaseGood.id, domain },
       relations: ['shippingOrder']
     })
 
     if (!foundReleaseGood) {
-      throw new Error(`Release order ${releaseGood.name} is not found.`)
+      throw new Error(`Release order ${releaseGood.id} is not found.`)
     }
 
     // case to update existing shippingOrder
@@ -362,16 +362,11 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
     await tx.getRepository(OrderVas).delete({ id: In(vasIds) })
   }
 
-  // 4. if there is SO, delete SO
-  if (foundSO) {
-    await tx.getRepository(ShippingOrder).delete({ domain, id: foundSO.id })
-  }
-
   if (foundAttachment) {
     await tx.getRepository(Attachment).delete({ domain, id: foundAttachment.id })
   }
 
-  // 5. Remove relation with GAN if it's cross docking
+  // 4. Remove relation with GAN if it's cross docking
   if (foundReleaseOrder.crossDocking && foundReleaseOrder.arrivalNotice?.id) {
     let arrivalNotice: ArrivalNotice = foundReleaseOrder.arrivalNotice
     arrivalNotice.releaseGood = null
@@ -382,6 +377,11 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
   } else {
     await tx.getRepository(ReleaseGood).delete({ domain, name })
   }
+
+  // 5. if there is SO, delete SO
+  if (foundSO) {
+    await tx.getRepository(ShippingOrder).delete({ domain, id: foundSO.id })
+  }
   return true
 }
 
@@ -741,26 +741,25 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
 
   let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
     where: { name, status: ORDER_STATUS.PENDING },
-    relations: [
-      'domain',
-      'bizplace',
-      'bizplace.domain',
-      'bizplace.company',
-      'bizplace.company.domain',
-      'orderProducts',
-      'orderProducts.product',
-      'orderProducts.product.productDetails',
-      'orderInventories',
-      'orderInventories.product',
-      'orderVass'
-    ]
+    relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain', 'orderVass']
   })
 
   if (!foundReleaseGood) throw new Error(`Release good order doesn't exists.`)
-  let foundOIs: OrderInventory[] = foundReleaseGood.orderInventories
+
+  // query orderInventories separately from releaseGood to reduce resource usage
+  let foundOIs: OrderInventory[] = await tx.getRepository(OrderInventory).find({
+    where: { domain, releaseGood: foundReleaseGood },
+    relations: ['product']
+  })
+
+  // query orderProducts separately from releaseGood to reduce resource usage
+  let foundOPs: OrderProduct[] = await tx.getRepository(OrderProduct).find({
+    where: { domain, releaseGood: foundReleaseGood },
+    relations: ['product', 'product.productDetails']
+  })
+
   let foundBundleInfo: any[] = JSON.parse(foundReleaseGood.bundleInfo)
   let foundOVs: OrderVas[] = foundReleaseGood.orderVass
-  let foundOPs: OrderProduct[] = foundReleaseGood.orderProducts
   let customerBizplace: Bizplace = foundReleaseGood.bizplace
   const companyDomain: Domain = customerBizplace?.company.domain
   const sellercraft: Sellercraft = await tx
@@ -770,7 +769,7 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
   if (foundReleaseGood.type == 'b2c') {
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
+      foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...foundReleaseGood, orderProducts: foundOPs })
     } else {
       // find for any existing marketplace store connections
       let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({

package/dist-server/service/delivery-order/delivery-order-summary-report.js

@@ -1,145 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeliveryOrderSummaryReport = void 0;
-const type_graphql_1 = require("type-graphql");
-const typeorm_1 = require("typeorm");
-const biz_base_1 = require("@things-factory/biz-base");
-const shell_1 = require("@things-factory/shell");
-const release_good_1 = require("../release-good/release-good");
-const delivery_order_1 = require("./delivery-order");
-const delivery_order_types_1 = require("./delivery-order-types");
-const debug = require('debug')('things-factory:sales-base:delivery-orders');
-let DeliveryOrderSummaryReport = class DeliveryOrderSummaryReport {
-    async deliveryOrderSummaryReport(context, params) {
-        try {
-            const { domain, user } = context.state;
-            const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId');
-            if (!bizplaceFilter) {
-                params.filters.push({
-                    name: 'bizplaceId',
-                    operator: 'in',
-                    value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
-                    relation: false
-                });
-            }
-            const releaseGoodParam = params.filters.find(param => param.name === 'releaseGoodNo');
-            if (releaseGoodParam) {
-                let arrFilters = [];
-                params.filters.splice(params.filters.findIndex(item => item.name == 'releaseGoodNo'), 1);
-                arrFilters.push(Object.assign(Object.assign({}, releaseGoodParam), { name: 'name' }));
-                const foundReleaseGoods = await (0, typeorm_1.getRepository)(release_good_1.ReleaseGood).find(Object.assign({}, (0, shell_1.convertListParams)({ filters: arrFilters })));
-                if (foundReleaseGoods && foundReleaseGoods.length) {
-                    params.filters.push({
-                        name: 'releaseGoodId',
-                        operator: 'in',
-                        value: foundReleaseGoods.map((releaseGood) => releaseGood.id),
-                        relation: false
-                    });
-                }
-            }
-            const tzOffsetIdx = params.filters.findIndex(param => param.name === 'tzoffset');
-            let tzOffset = 0;
-            if (tzOffsetIdx >= 0) {
-                tzOffset = params.filters[tzOffsetIdx].value;
-                params.filters.splice(tzOffsetIdx, 1);
-            }
-            const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
-            if (fromDateParamIdx >= 0) {
-                let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
-                params.filters.splice(fromDateParamIdx, 1);
-                params.filters.push({
-                    name: 'createdAt',
-                    operator: 'gte',
-                    value: fromDateVal.toISOString(),
-                    relation: false
-                });
-            }
-            const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
-            if (toDateParamIdx >= 0) {
-                let toDateVal = new Date(params.filters[toDateParamIdx].value);
-                params.filters.splice(toDateParamIdx, 1);
-                params.filters.push({
-                    name: 'createdAt',
-                    operator: 'lt',
-                    value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
-                    relation: false
-                });
-            }
-            let refNoFilter = params.filters.find(x => x.name == 'refNo');
-            let refNo2Filter = params.filters.find(x => x.name == 'refNo2');
-            let refNo3Filter = params.filters.find(x => x.name == 'refNo3');
-            params.filters = params.filters.filter(x => x.name != 'refNo' && x.name != 'refNo2' && x.name != 'refNo3');
-            const qb = (0, typeorm_1.getRepository)(delivery_order_1.DeliveryOrder).createQueryBuilder('do');
-            (0, shell_1.buildQuery)(qb, params, context);
-            qb.addSelect('COALESCE("cc".rank, 99999)', 'rank');
-            qb.leftJoinAndSelect('do.domain', 'domain');
-            qb.leftJoinAndSelect('do.bizplace', 'bizplace');
-            qb.leftJoinAndSelect('do.releaseGood', 'releaseGood');
-            qb.leftJoinAndSelect('do.transportDriver', 'td');
-            qb.leftJoinAndSelect('do.transportVehicle', 'th');
-            qb.leftJoinAndSelect('do.orderInventories', 'oi');
-            qb.leftJoinAndSelect('oi.inventory', 'inv');
-            qb.leftJoinAndSelect('inv.product', 'prd');
-            qb.leftJoinAndSelect('do.creator', 'creator');
-            qb.leftJoinAndSelect('do.updater', 'updater');
-            qb.leftJoin(subQuery => {
-                return subQuery
-                    .select(`ccd.rank`, 'rank')
-                    .addSelect(`ccd.name`, 'status')
-                    .from(`common_code_details`, 'ccd')
-                    .innerJoin(`ccd.commonCode`, 'cc')
-                    .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
-                    .andWhere(`cc.name = 'DELIVERY_STATUS'`);
-            }, 'cc', 'cc.status = do.status');
-            if (refNoFilter === null || refNoFilter === void 0 ? void 0 : refNoFilter.value) {
-                qb.andWhere('releaseGood.ref_no ilike :refNo', { refNo: refNoFilter.value });
-            }
-            if (refNo2Filter === null || refNo2Filter === void 0 ? void 0 : refNo2Filter.value) {
-                qb.andWhere('releaseGood.ref_no_2 ilike :refNo2', { refNo2: refNo2Filter.value });
-            }
-            if (refNo3Filter === null || refNo3Filter === void 0 ? void 0 : refNo3Filter.value) {
-                qb.andWhere('releaseGood.ref_no_3 ilike :refNo3', { refNo3: refNo3Filter.value });
-            }
-            const arrChildSortData = ['refNo', 'refNo2', 'refNo3'];
-            const arrNameSortData = ['bizplace', 'releaseGood', 'updater'];
-            const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0
-                    ? 'releaseGood.' + sort.name
-                    : arrNameSortData.indexOf(sort.name) >= 0
-                        ? sort.name + '.name'
-                        : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC' })), params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {});
-            qb.orderBy(sort);
-            const [items, total] = await qb.getManyAndCount();
-            return { items, total };
-        }
-        catch (error) {
-            debug('deliveryOrders', error.toString());
-            throw error;
-        }
-    }
-};
-__decorate([
-    (0, type_graphql_1.Query)(returns => delivery_order_types_1.DeliveryOrderList),
-    __param(0, (0, type_graphql_1.Ctx)()),
-    __param(1, (0, type_graphql_1.Args)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object]),
-    __metadata("design:returntype", Promise)
-], DeliveryOrderSummaryReport.prototype, "deliveryOrderSummaryReport", null);
-DeliveryOrderSummaryReport = __decorate([
-    (0, type_graphql_1.Resolver)(delivery_order_1.DeliveryOrder)
-], DeliveryOrderSummaryReport);
-exports.DeliveryOrderSummaryReport = DeliveryOrderSummaryReport;
-//# sourceMappingURL=delivery-order-summary-report.js.map

package/dist-server/service/delivery-order/delivery-order-summary-report.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"delivery-order-summary-report.js","sourceRoot":"","sources":["../../../server/service/delivery-order/delivery-order-summary-report.ts"],"names":[],"mappings":"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"}

package/server/service/delivery-order/delivery-order-summary-report.ts

@@ -1,152 +0,0 @@
-import { Args, Ctx, Query, Resolver } from 'type-graphql'
-import { getRepository } from 'typeorm'
-
-import { User } from '@things-factory/auth-base'
-import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { buildQuery, convertListParams, Domain, ListParam } from '@things-factory/shell'
-
-import { ReleaseGood } from '../release-good/release-good'
-import { DeliveryOrder } from './delivery-order'
-import { DeliveryOrderList } from './delivery-order-types'
-
-const debug = require('debug')('things-factory:sales-base:delivery-orders')
-
-@Resolver(DeliveryOrder)
-export class DeliveryOrderSummaryReport {
-  @Query(returns => DeliveryOrderList)
-  async deliveryOrderSummaryReport(@Ctx() context: any, @Args() params: ListParam): Promise<DeliveryOrderList> {
-    try {
-      const { domain, user }: { domain: Domain; user: User } = context.state
-
-      const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
-      if (!bizplaceFilter) {
-        params.filters.push({
-          name: 'bizplaceId',
-          operator: 'in',
-          value: await getPermittedBizplaceIds(domain, user),
-          relation: false
-        })
-      }
-
-      const releaseGoodParam = params.filters.find(param => param.name === 'releaseGoodNo')
-      if (releaseGoodParam) {
-        let arrFilters = []
-        params.filters.splice(
-          params.filters.findIndex(item => item.name == 'releaseGoodNo'),
-          1
-        )
-        arrFilters.push({ ...releaseGoodParam, name: 'name' })
-
-        const foundReleaseGoods: ReleaseGood[] = await getRepository(ReleaseGood).find({
-          ...convertListParams({ filters: arrFilters })
-        })
-
-        if (foundReleaseGoods && foundReleaseGoods.length) {
-          params.filters.push({
-            name: 'releaseGoodId',
-            operator: 'in',
-            value: foundReleaseGoods.map((releaseGood: ReleaseGood) => releaseGood.id),
-            relation: false
-          })
-        }
-      }
-
-      const tzOffsetIdx = params.filters.findIndex(param => param.name === 'tzoffset')
-      let tzOffset = 0
-      if (tzOffsetIdx >= 0) {
-        tzOffset = params.filters[tzOffsetIdx].value
-        params.filters.splice(tzOffsetIdx, 1)
-      }
-
-      const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
-      if (fromDateParamIdx >= 0) {
-        let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
-        params.filters.splice(fromDateParamIdx, 1)
-
-        params.filters.push({
-          name: 'createdAt',
-          operator: 'gte',
-          value: fromDateVal.toISOString(),
-          relation: false
-        })
-      }
-      const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
-      if (toDateParamIdx >= 0) {
-        let toDateVal = new Date(params.filters[toDateParamIdx].value)
-        params.filters.splice(toDateParamIdx, 1)
-
-        params.filters.push({
-          name: 'createdAt',
-          operator: 'lt',
-          value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
-          relation: false
-        })
-      }
-
-      let refNoFilter = params.filters.find(x => x.name == 'refNo')
-      let refNo2Filter = params.filters.find(x => x.name == 'refNo2')
-      let refNo3Filter = params.filters.find(x => x.name == 'refNo3')
-
-      params.filters = params.filters.filter(x => x.name != 'refNo' && x.name != 'refNo2' && x.name != 'refNo3')
-
-      const qb: any = getRepository(DeliveryOrder).createQueryBuilder('do')
-      buildQuery(qb, params, context)
-      qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
-      qb.leftJoinAndSelect('do.domain', 'domain')
-      qb.leftJoinAndSelect('do.bizplace', 'bizplace')
-      qb.leftJoinAndSelect('do.releaseGood', 'releaseGood')
-      qb.leftJoinAndSelect('do.transportDriver', 'td')
-      qb.leftJoinAndSelect('do.transportVehicle', 'th')
-      qb.leftJoinAndSelect('do.orderInventories', 'oi')
-      qb.leftJoinAndSelect('oi.inventory', 'inv')
-      qb.leftJoinAndSelect('inv.product', 'prd')
-      qb.leftJoinAndSelect('do.creator', 'creator')
-      qb.leftJoinAndSelect('do.updater', 'updater')
-      qb.leftJoin(
-        subQuery => {
-          return subQuery
-            .select(`ccd.rank`, 'rank')
-            .addSelect(`ccd.name`, 'status')
-            .from(`common_code_details`, 'ccd')
-            .innerJoin(`ccd.commonCode`, 'cc')
-            .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
-            .andWhere(`cc.name = 'DELIVERY_STATUS'`)
-        },
-        'cc',
-        'cc.status = do.status'
-      )
-
-      if (refNoFilter?.value) {
-        qb.andWhere('releaseGood.ref_no ilike :refNo', { refNo: refNoFilter.value })
-      }
-      if (refNo2Filter?.value) {
-        qb.andWhere('releaseGood.ref_no_2 ilike :refNo2', { refNo2: refNo2Filter.value })
-      }
-      if (refNo3Filter?.value) {
-        qb.andWhere('releaseGood.ref_no_3 ilike :refNo3', { refNo3: refNo3Filter.value })
-      }
-
-      const arrChildSortData = ['refNo', 'refNo2', 'refNo3']
-      const arrNameSortData = ['bizplace', 'releaseGood', 'updater']
-      const sort = (params.sortings || []).reduce(
-        (acc, sort) => ({
-          ...acc,
-          [arrChildSortData.indexOf(sort.name) >= 0
-            ? 'releaseGood.' + sort.name
-            : arrNameSortData.indexOf(sort.name) >= 0
-            ? sort.name + '.name'
-            : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
-        }),
-        params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {}
-      )
-
-      qb.orderBy(sort)
-
-      const [items, total] = await qb.getManyAndCount()
-      return { items, total }
-    } catch (error) {
-      debug('deliveryOrders', error.toString())
-      throw error
-    }
-  }
-}