@things-factory/sales-base 5.0.13 → 6.0.0-alpha.1

package/dist-server/service/manifest/manifest-mutation.js

@@ -2,13 +2,49 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManifestMutation = void 0;
 const tslib_1 = require("tslib");
+const i18next_1 = tslib_1.__importDefault(require("i18next"));
 const type_graphql_1 = require("type-graphql");
+const typeorm_1 = require("typeorm");
 const constants_1 = require("../../constants");
 const utils_1 = require("../../utils");
 const release_good_1 = require("../release-good/release-good");
 const manifest_1 = require("./manifest");
 const manifest_type_1 = require("./manifest-type");
 let ManifestMutation = class ManifestMutation {
+    async updateManifest(manifestId, status, shippingProvider, removeOrders, context) {
+        const { domain, tx } = context.state;
+        const ManifestRepo = tx.getRepository(manifest_1.Manifest);
+        //update status
+        if (status) {
+            if (status == constants_1.MANIFEST_STATUS.OPEN) {
+                //check if there is only one manifest is open, if yes update it to in queue and update current to open
+                let foundOpenOrder = await ManifestRepo.find({
+                    where: { domain: { id: domain.id }, shippingProvider, status: constants_1.MANIFEST_STATUS.OPEN }
+                });
+                if (foundOpenOrder.length == 1) {
+                    await ManifestRepo.update({ id: foundOpenOrder[0].id }, { status: constants_1.MANIFEST_STATUS.IN_QUEUE });
+                }
+                else if (foundOpenOrder.length > 1) {
+                    let manifestNames = foundOpenOrder.map(itm => itm.name);
+                    throw new Error(i18next_1.default.t('error.Manifest(s) (x) already in open status', { x: manifestNames.toString() }));
+                }
+            }
+            await ManifestRepo.update({ id: manifestId }, { status: status });
+        }
+        //remove orders from manifest
+        if ((removeOrders === null || removeOrders === void 0 ? void 0 : removeOrders.length) > 0) {
+            //check if user removing all tracking no, if yes then delete
+            let totalTrackingNo = await tx.getRepository(release_good_1.ReleaseGood).count({ where: { manifest: { id: manifestId } } });
+            await tx
+                .getRepository(release_good_1.ReleaseGood)
+                .update({ domain, refNo: (0, typeorm_1.In)(removeOrders) }, { manifest: null, manifestedBy: null, manifestedAt: null });
+            if (removeOrders.length == totalTrackingNo) {
+                await tx.getRepository(manifest_1.Manifest).delete(manifestId);
+                return false;
+            }
+        }
+        return true;
+    }
     async deleteManifest(name, context) {
         const { domain, tx } = context.state;
         await tx.getRepository(manifest_1.Manifest).delete({ domain, name });
@@ -26,7 +62,7 @@ let ManifestMutation = class ManifestMutation {
             const items = shippingProviderGrouping[transporter];
             const openManifest = await tx
                 .getRepository(manifest_1.Manifest)
-                .findOne({ domain, shippingProvider: transporter, status: manifest_1.ManifestStatus.OPEN });
+                .findOneBy({ domain: { id: domain.id }, shippingProvider: transporter, status: manifest_1.ManifestStatus.OPEN });
             let manifest;
             if (openManifest) {
                 manifest = openManifest;
@@ -42,22 +78,43 @@ let ManifestMutation = class ManifestMutation {
             await Promise.all(items.map(async (item) => {
                 let releaseOrder = await tx
                     .getRepository(release_good_1.ReleaseGood)
-                    .findOne({ domain, refNo: item.refNo, trackingNo: item.trackingNo });
+                    .findOneBy({ domain: { id: domain.id }, refNo: item.refNo, trackingNo: item.trackingNo });
                 releaseOrder.manifest = manifest;
                 releaseOrder.updater = user;
+                releaseOrder.manifestedBy = user;
+                releaseOrder.manifestedAt = new Date();
                 await tx.getRepository(release_good_1.ReleaseGood).save(releaseOrder);
             }));
         }
         return true;
     }
+    async addTrackingNo(manifestId, trackingNo, shippingProvider, context) {
+        const { domain, user, tx } = context.state;
+        const releaseGoodRepo = tx.getRepository(release_good_1.ReleaseGood);
+        //check if order belongs to same shipping provider
+        let foundReleaseOrder = await releaseGoodRepo.findOne({ where: { trackingNo }, relations: ['manifest'] });
+        if (!foundReleaseOrder) {
+            throw new Error(i18next_1.default.t('error.release_order_not_found'));
+        }
+        if (foundReleaseOrder.manifest) {
+            throw new Error(i18next_1.default.t('error.tracking_no_already_scanned_before'));
+        }
+        if (foundReleaseOrder.transporter !== shippingProvider) {
+            throw new Error(i18next_1.default.t('error.tracking_no_belongs_to_x', { x: foundReleaseOrder.transporter }));
+        }
+        await releaseGoodRepo.update({ id: foundReleaseOrder.id }, { manifest: { id: manifestId }, manifestedAt: new Date(), manifestedBy: user });
+        return true;
+    }
     async dispatchManifest(name, patch, context) {
         const { domain, user, tx } = context.state;
         const manifest = await tx.getRepository(manifest_1.Manifest).findOne({
-            where: { domain, name, status: manifest_1.ManifestStatus.OPEN }
+            where: { domain: { id: domain.id }, name, status: (0, typeorm_1.Not)(constants_1.MANIFEST_STATUS.CLOSED) }
         });
         if (!manifest)
             throw new Error(`Unable to find ${name}`);
-        let releaseGoods = await tx.getRepository(release_good_1.ReleaseGood).find({ where: { domain, manifest } });
+        let releaseGoods = await tx
+            .getRepository(release_good_1.ReleaseGood)
+            .find({ where: { domain: { id: domain.id }, manifest: { id: manifest.id } } });
         releaseGoods = await Promise.all(releaseGoods.map((releaseGood) => {
             return Object.assign(Object.assign({}, releaseGood), { dispatchmentStatus: constants_1.DISPATCHMENT_STATUS.DISPATCHED, updater: user });
         }));
@@ -65,6 +122,18 @@ let ManifestMutation = class ManifestMutation {
         return await tx.getRepository(manifest_1.Manifest).save(Object.assign(Object.assign(Object.assign({}, manifest), patch), { status: manifest_1.ManifestStatus.CLOSED, dispatchedAt: new Date(), updater: user }));
     }
 };
+tslib_1.__decorate([
+    (0, type_graphql_1.Directive)('@transaction'),
+    (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To update Manifest' }),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('manifestId', { nullable: true })),
+    tslib_1.__param(1, (0, type_graphql_1.Arg)('status', { nullable: true })),
+    tslib_1.__param(2, (0, type_graphql_1.Arg)('shippingProvider', { nullable: true })),
+    tslib_1.__param(3, (0, type_graphql_1.Arg)('removeOrders', type => [String], { nullable: true })),
+    tslib_1.__param(4, (0, type_graphql_1.Ctx)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, Array, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], ManifestMutation.prototype, "updateManifest", null);
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To delete Manifest' }),
@@ -83,6 +152,17 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [manifest_type_1.NewManifest, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], ManifestMutation.prototype, "generateManifest", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.Directive)('@transaction'),
+    (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To add tracking no into manifest' }),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('manifestId', { nullable: true })),
+    tslib_1.__param(1, (0, type_graphql_1.Arg)('trackingNo', { nullable: true })),
+    tslib_1.__param(2, (0, type_graphql_1.Arg)('shippingProvider', { nullable: true })),
+    tslib_1.__param(3, (0, type_graphql_1.Ctx)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], ManifestMutation.prototype, "addTrackingNo", null);
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Mutation)(returns => manifest_1.Manifest, { description: 'To dispatch Manifest when courier service collect packages' }),

package/dist-server/service/manifest/manifest-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-mutation.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-mutation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'\n\nimport { DISPATCHMENT_STATUS } from '../../constants'\nimport { OrderNoGenerator } from '../../utils'\nimport { ReleaseGood } from '../release-good/release-good'\nimport { Manifest, ManifestStatus } from './manifest'\nimport { ManifestPatch, NewManifest } from './manifest-type'\n\n@Resolver(Manifest)\nexport class ManifestMutation {\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To delete Manifest' })\n  async deleteManifest(@Arg('name') name: string, @Ctx() context: any): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await tx.getRepository(Manifest).delete({ domain, name })\n    return true\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To generate new Manifest' })\n  async generateManifest(@Arg('manifest') manifest: NewManifest, @Ctx() context: any): Promise<boolean> {\n    const { domain, user, tx } = context.state\n    const manifestItems: any[] = manifest.manifestItems\n\n    // regroup array of object by transporter\n    let shippingProviderGrouping: any = manifestItems.reduce((a, b) => {\n      a[b.transporter] = [...(a[b.transporter] || []), b]\n      return a\n    }, {})\n\n    for (const transporter in shippingProviderGrouping) {\n      const items: any[] = shippingProviderGrouping[transporter]\n\n      const openManifest: Manifest = await tx\n        .getRepository(Manifest)\n        .findOne({ domain, shippingProvider: transporter, status: ManifestStatus.OPEN })\n\n      let manifest: Manifest\n\n      if (openManifest) {\n        manifest = openManifest\n      } else {\n        manifest = new Manifest()\n        manifest.domain = domain\n        manifest.shippingProvider = transporter\n        manifest.name = OrderNoGenerator.manifest()\n        manifest.creator = user\n        manifest = await tx.getRepository(Manifest).save(manifest)\n      }\n\n      await Promise.all(\n        items.map(async item => {\n          let releaseOrder: ReleaseGood = await tx\n            .getRepository(ReleaseGood)\n            .findOne({ domain, refNo: item.refNo, trackingNo: item.trackingNo })\n          releaseOrder.manifest = manifest\n          releaseOrder.updater = user\n          await tx.getRepository(ReleaseGood).save(releaseOrder)\n        })\n      )\n    }\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Manifest, { description: 'To dispatch Manifest when courier service collect packages' })\n  async dispatchManifest(\n    @Arg('name') name: string,\n    @Arg('patch') patch: ManifestPatch,\n    @Ctx() context: any\n  ): Promise<Manifest> {\n    const { domain, user, tx } = context.state\n\n    const manifest: Manifest = await tx.getRepository(Manifest).findOne({\n      where: { domain, name, status: ManifestStatus.OPEN }\n    })\n    if (!manifest) throw new Error(`Unable to find ${name}`)\n\n    let releaseGoods: any[] = await tx.getRepository(ReleaseGood).find({ where: { domain, manifest } })\n\n    releaseGoods = await Promise.all(\n      releaseGoods.map((releaseGood: ReleaseGood) => {\n        return {\n          ...releaseGood,\n          dispatchmentStatus: DISPATCHMENT_STATUS.DISPATCHED,\n          updater: user\n        }\n      })\n    )\n    await tx.getRepository(ReleaseGood).save(releaseGoods)\n\n    return await tx.getRepository(Manifest).save({\n      ...manifest,\n      ...patch,\n      status: ManifestStatus.CLOSED,\n      dispatchedAt: new Date(),\n      updater: user\n    })\n  }\n}\n"]}
+{"version":3,"file":"manifest-mutation.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-mutation.ts"],"names":[],"mappings":"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","sourcesContent":["import i18next from 'i18next'\nimport { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'\nimport { In, Not } from 'typeorm'\n\nimport { DISPATCHMENT_STATUS, MANIFEST_STATUS } from '../../constants'\nimport { OrderNoGenerator } from '../../utils'\nimport { ReleaseGood } from '../release-good/release-good'\nimport { Manifest, ManifestStatus } from './manifest'\nimport { ManifestPatch, NewManifest } from './manifest-type'\n\n@Resolver(Manifest)\nexport class ManifestMutation {\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To update Manifest' })\n  async updateManifest(\n    @Arg('manifestId', { nullable: true }) manifestId: string,\n    @Arg('status', { nullable: true }) status: string,\n    @Arg('shippingProvider', { nullable: true }) shippingProvider: string,\n    @Arg('removeOrders', type => [String], { nullable: true }) removeOrders: string[],\n    @Ctx() context: ResolverContext\n  ): Promise<boolean> {\n    const { domain, tx } = context.state\n    const ManifestRepo = tx.getRepository(Manifest)\n    //update status\n    if (status) {\n      if (status == MANIFEST_STATUS.OPEN) {\n        //check if there is only one manifest is open, if yes update it to in queue and update current to open\n\n        let foundOpenOrder = await ManifestRepo.find({\n          where: { domain: { id: domain.id }, shippingProvider, status: MANIFEST_STATUS.OPEN as any }\n        })\n\n        if (foundOpenOrder.length == 1) {\n          await ManifestRepo.update({ id: foundOpenOrder[0].id }, { status: MANIFEST_STATUS.IN_QUEUE as any })\n        } else if (foundOpenOrder.length > 1) {\n          let manifestNames = foundOpenOrder.map(itm => itm.name)\n          throw new Error(i18next.t('error.Manifest(s) (x) already in open status', { x: manifestNames.toString() }))\n        }\n      }\n\n      await ManifestRepo.update({ id: manifestId }, { status: status as any })\n    }\n\n    //remove orders from manifest\n    if (removeOrders?.length > 0) {\n      //check if user removing all tracking no, if yes then delete\n      let totalTrackingNo = await tx.getRepository(ReleaseGood).count({ where: { manifest: { id: manifestId } } })\n      await tx\n        .getRepository(ReleaseGood)\n        .update({ domain, refNo: In(removeOrders) }, { manifest: null, manifestedBy: null, manifestedAt: null })\n      if (removeOrders.length == totalTrackingNo) {\n        await tx.getRepository(Manifest).delete(manifestId)\n        return false\n      }\n    }\n    return true\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To delete Manifest' })\n  async deleteManifest(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await tx.getRepository(Manifest).delete({ domain, name })\n    return true\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To generate new Manifest' })\n  async generateManifest(@Arg('manifest') manifest: NewManifest, @Ctx() context: ResolverContext): Promise<boolean> {\n    const { domain, user, tx } = context.state\n    const manifestItems: any[] = manifest.manifestItems\n\n    // regroup array of object by transporter\n    let shippingProviderGrouping: any = manifestItems.reduce((a, b) => {\n      a[b.transporter] = [...(a[b.transporter] || []), b]\n      return a\n    }, {})\n\n    for (const transporter in shippingProviderGrouping) {\n      const items: any[] = shippingProviderGrouping[transporter]\n\n      const openManifest: Manifest = await tx\n        .getRepository(Manifest)\n        .findOneBy({ domain: { id: domain.id }, shippingProvider: transporter, status: ManifestStatus.OPEN })\n\n      let manifest: Manifest\n\n      if (openManifest) {\n        manifest = openManifest\n      } else {\n        manifest = new Manifest()\n        manifest.domain = domain\n        manifest.shippingProvider = transporter\n        manifest.name = OrderNoGenerator.manifest()\n        manifest.creator = user\n        manifest = await tx.getRepository(Manifest).save(manifest)\n      }\n\n      await Promise.all(\n        items.map(async item => {\n          let releaseOrder: ReleaseGood = await tx\n            .getRepository(ReleaseGood)\n            .findOneBy({ domain: { id: domain.id }, refNo: item.refNo, trackingNo: item.trackingNo })\n          releaseOrder.manifest = manifest\n          releaseOrder.updater = user\n          releaseOrder.manifestedBy = user\n          releaseOrder.manifestedAt = new Date()\n          await tx.getRepository(ReleaseGood).save(releaseOrder)\n        })\n      )\n    }\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To add tracking no into manifest' })\n  async addTrackingNo(\n    @Arg('manifestId', { nullable: true }) manifestId: string,\n    @Arg('trackingNo', { nullable: true }) trackingNo: string,\n    @Arg('shippingProvider', { nullable: true }) shippingProvider: string,\n    @Ctx() context: ResolverContext\n  ): Promise<boolean> {\n    const { domain, user, tx } = context.state\n    const releaseGoodRepo = tx.getRepository(ReleaseGood)\n    //check if order belongs to same shipping provider\n    let foundReleaseOrder = await releaseGoodRepo.findOne({ where: { trackingNo }, relations: ['manifest'] })\n\n    if (!foundReleaseOrder) {\n      throw new Error(i18next.t('error.release_order_not_found'))\n    }\n\n    if (foundReleaseOrder.manifest) {\n      throw new Error(i18next.t('error.tracking_no_already_scanned_before'))\n    }\n\n    if (foundReleaseOrder.transporter !== shippingProvider) {\n      throw new Error(i18next.t('error.tracking_no_belongs_to_x', { x: foundReleaseOrder.transporter }))\n    }\n\n    await releaseGoodRepo.update(\n      { id: foundReleaseOrder.id },\n      { manifest: { id: manifestId }, manifestedAt: new Date(), manifestedBy: user }\n    )\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Manifest, { description: 'To dispatch Manifest when courier service collect packages' })\n  async dispatchManifest(\n    @Arg('name') name: string,\n    @Arg('patch') patch: ManifestPatch,\n    @Ctx() context: ResolverContext\n  ): Promise<Manifest> {\n    const { domain, user, tx } = context.state\n\n    const manifest: Manifest = await tx.getRepository(Manifest).findOne({\n      where: { domain: { id: domain.id }, name, status: Not(MANIFEST_STATUS.CLOSED) as any }\n    })\n    if (!manifest) throw new Error(`Unable to find ${name}`)\n\n    let releaseGoods: any[] = await tx\n      .getRepository(ReleaseGood)\n      .find({ where: { domain: { id: domain.id }, manifest: { id: manifest.id } } })\n\n    releaseGoods = await Promise.all(\n      releaseGoods.map((releaseGood: ReleaseGood) => {\n        return {\n          ...releaseGood,\n          dispatchmentStatus: DISPATCHMENT_STATUS.DISPATCHED,\n          updater: user\n        }\n      })\n    )\n    await tx.getRepository(ReleaseGood).save(releaseGoods)\n\n    return await tx.getRepository(Manifest).save({\n      ...manifest,\n      ...patch,\n      status: ManifestStatus.CLOSED,\n      dispatchedAt: new Date(),\n      updater: user\n    })\n  }\n}\n"]}

package/dist-server/service/manifest/manifest-query.js

@@ -1,20 +1,35 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManifestQuery = void 0;
 const tslib_1 = require("tslib");
 const type_graphql_1 = require("type-graphql");
-const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const shell_1 = require("@things-factory/shell");
 const release_good_1 = require("../release-good/release-good");
 const manifest_1 = require("./manifest");
 const manifest_type_1 = require("./manifest-type");
 let ManifestQuery = class ManifestQuery {
-    async manifest(name, context) {
+    async manifest(name, context, sortings) {
+        const phoneSort = sortings.findIndex(sort => sort.name === 'phone');
+        if (phoneSort >= 0) {
+            sortings[phoneSort].name = 'phone1';
+        }
+        const deliveryAddressSort = sortings.findIndex(sort => sort.name === 'deliveryAddress');
+        if (deliveryAddressSort >= 0) {
+            sortings[deliveryAddressSort].name = 'deliveryAddress1';
+        }
+        const orderRemarkSort = sortings.findIndex(sort => sort.name === 'orderRemark');
+        if (orderRemarkSort >= 0) {
+            sortings[orderRemarkSort].name = 'remark';
+        }
+        const orderStatusSort = sortings.findIndex(sort => sort.name === 'orderStatus');
+        if (orderStatusSort >= 0) {
+            sortings[orderStatusSort].name = 'status';
+        }
+        const convertedParams = (0, shell_1.convertListParams)({ sortings });
         const { domain, tx } = context.state;
-        const manifest = await (0, typeorm_1.getRepository)(manifest_1.Manifest).findOne({ where: { domain, name } });
-        const releaseGoods = await (0, typeorm_1.getRepository)(release_good_1.ReleaseGood).find({ where: { manifest } });
+        const manifest = await (0, shell_1.getRepository)(manifest_1.Manifest).findOne({ where: { domain: { id: domain.id }, name } });
+        const releaseGoods = await (0, shell_1.getRepository)(release_good_1.ReleaseGood).find(Object.assign(Object.assign({}, convertedParams), { where: { manifest: { id: manifest.id } } }));
         const trackingNos = releaseGoods.map(releaseGood => {
             return {
                 trackingNo: releaseGood.trackingNo,
@@ -24,13 +39,27 @@ let ManifestQuery = class ManifestQuery {
                 postalCode: releaseGood.postalCode,
                 city: releaseGood.city,
                 phone: releaseGood.phone1,
-                dispatchmentStatus: releaseGood.dispatchmentStatus
+                dispatchmentStatus: releaseGood.dispatchmentStatus,
+                orderStatus: releaseGood.status,
+                orderRemark: releaseGood.remark
             };
         });
         return Object.assign(Object.assign({}, manifest), { trackingNos });
     }
     async manifests(params, context) {
         const { domain } = context.state;
+        let orderInfoFilter;
+        const orderInfoParamIdx = params.filters.findIndex(param => param.name === 'orderInfo');
+        if (orderInfoParamIdx >= 0) {
+            orderInfoFilter = params.filters[orderInfoParamIdx].value.toLowerCase().split(',').join('|');
+            params.filters.splice(orderInfoParamIdx, 1);
+        }
+        let trackingNoFilter;
+        const trackingNoParamIdx = params.filters.findIndex(param => param.name === 'trackingNo');
+        if (trackingNoParamIdx >= 0) {
+            trackingNoFilter = params.filters[trackingNoParamIdx].value;
+            params.filters.splice(trackingNoParamIdx, 1);
+        }
         const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
         if (fromDateParamIdx >= 0) {
             let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
@@ -53,32 +82,36 @@ let ManifestQuery = class ManifestQuery {
                 relation: false
             });
         }
-        params.filters.push({
-            name: 'domain',
-            operator: 'eq',
-            value: domain.id,
-            relation: true
-        });
-        const convertedParams = (0, shell_1.convertListParams)(params);
-        const [items, total] = await (0, typeorm_1.getRepository)(manifest_1.Manifest).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['domain', 'creator', 'updater'] }));
+        const qb = (0, shell_1.getRepository)(manifest_1.Manifest).createQueryBuilder('mf');
+        (0, shell_1.buildQuery)(qb, params, context);
+        qb.innerJoin('release_goods', 'rg', 'rg.manifest_id = mf.id');
+        orderInfoFilter
+            ? qb.andWhere('(rg.name ~* :orderInfoFilter or rg.ref_no ~* :orderInfoFilter or rg.ref_no_2 ~* :orderInfoFilter or rg.ref_no_3 ~* :orderInfoFilter)', { orderInfoFilter })
+            : '';
+        trackingNoFilter ? qb.andWhere('rg.tracking_no ilike :trackingNo', { trackingNo: trackingNoFilter }) : '';
+        const [items, total] = await qb.getManyAndCount();
+        await Promise.all(items.map(async (item) => {
+            item.totalTrackingNo = await (0, shell_1.getRepository)(release_good_1.ReleaseGood).count({ where: { manifest: { id: item.id } } });
+        }));
         return { items, total };
     }
     async domain(manifest) {
-        return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(manifest.domainId);
+        return await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: manifest.domainId });
     }
     async updater(manifest) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(manifest.updaterId);
+        return await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: manifest.updaterId });
     }
     async creator(manifest) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(manifest.creatorId);
+        return await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: manifest.creatorId });
     }
 };
 tslib_1.__decorate([
     (0, type_graphql_1.Query)(returns => manifest_1.Manifest, { description: 'To fetch a Manifest' }),
     tslib_1.__param(0, (0, type_graphql_1.Arg)('name')),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(2, (0, type_graphql_1.Arg)('sortings', type => [shell_1.Sorting], { nullable: true })),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, Object, Array]),
     tslib_1.__metadata("design:returntype", Promise)
 ], ManifestQuery.prototype, "manifest", null);
 tslib_1.__decorate([
@@ -86,7 +119,7 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Args)()),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], ManifestQuery.prototype, "manifests", null);
 tslib_1.__decorate([

package/dist-server/service/manifest/manifest-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-query.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'\nimport { getRepository } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { convertListParams, Domain, ListParam } from '@things-factory/shell'\n\nimport { ReleaseGood } from '../release-good/release-good'\nimport { Manifest } from './manifest'\nimport { ManifestList } from './manifest-type'\n\n@Resolver(Manifest)\nexport class ManifestQuery {\n  @Query(returns => Manifest, { description: 'To fetch a Manifest' })\n  async manifest(@Arg('name') name: string, @Ctx() context: any): Promise<Manifest> {\n    const { domain, tx } = context.state\n    const manifest: Manifest = await getRepository(Manifest).findOne({ where: { domain, name } })\n\n    const releaseGoods: ReleaseGood[] = await getRepository(ReleaseGood).find({ where: { manifest } })\n\n    const trackingNos: any[] = releaseGoods.map(releaseGood => {\n      return {\n        trackingNo: releaseGood.trackingNo,\n        refNo: releaseGood.refNo,\n        deliveryAddress: releaseGood.deliveryAddress1,\n        attentionTo: releaseGood.attentionTo,\n        postalCode: releaseGood.postalCode,\n        city: releaseGood.city,\n        phone: releaseGood.phone1,\n        dispatchmentStatus: releaseGood.dispatchmentStatus\n      }\n    })\n\n    return {\n      ...manifest,\n      trackingNos\n    }\n  }\n\n  @Query(returns => ManifestList, { description: 'To fetch multiple Manifests' })\n  async manifests(@Args() params: ListParam, @Ctx() context: any): Promise<ManifestList> {\n    const { domain } = context.state\n\n    const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')\n    if (fromDateParamIdx >= 0) {\n      let fromDateVal = new Date(params.filters[fromDateParamIdx].value)\n      params.filters.splice(fromDateParamIdx, 1)\n\n      params.filters.push({\n        name: 'createdAt',\n        operator: 'gte',\n        value: fromDateVal.toISOString(),\n        relation: false\n      })\n    }\n\n    const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')\n    if (toDateParamIdx >= 0) {\n      let toDateVal = new Date(params.filters[toDateParamIdx].value)\n      params.filters.splice(toDateParamIdx, 1)\n\n      params.filters.push({\n        name: 'createdAt',\n        operator: 'lt',\n        value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),\n        relation: false\n      })\n    }\n\n    params.filters.push({\n      name: 'domain',\n      operator: 'eq',\n      value: domain.id,\n      relation: true\n    })\n\n    const convertedParams = convertListParams(params)\n    const [items, total] = await getRepository(Manifest).findAndCount({\n      ...convertedParams,\n      relations: ['domain', 'creator', 'updater']\n    })\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => Domain)\n  async domain(@Root() manifest: Manifest): Promise<Domain> {\n    return await getRepository(Domain).findOne(manifest.domainId)\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() manifest: Manifest): Promise<User> {\n    return await getRepository(User).findOne(manifest.updaterId)\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() manifest: Manifest): Promise<User> {\n    return await getRepository(User).findOne(manifest.creatorId)\n  }\n}\n"]}
+{"version":3,"file":"manifest-query.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'\nimport { SelectQueryBuilder } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { buildQuery, convertListParams, Domain, getRepository, ListParam, Sorting } from '@things-factory/shell'\n\nimport { ReleaseGood } from '../release-good/release-good'\nimport { Manifest } from './manifest'\nimport { ManifestList } from './manifest-type'\n\n@Resolver(Manifest)\nexport class ManifestQuery {\n  @Query(returns => Manifest, { description: 'To fetch a Manifest' })\n  async manifest(\n    @Arg('name') name: string,\n    @Ctx() context: ResolverContext,\n    @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[]\n  ): Promise<Manifest> {\n    const phoneSort = sortings.findIndex(sort => sort.name === 'phone')\n    if (phoneSort >= 0) {\n      sortings[phoneSort].name = 'phone1'\n    }\n\n    const deliveryAddressSort = sortings.findIndex(sort => sort.name === 'deliveryAddress')\n    if (deliveryAddressSort >= 0) {\n      sortings[deliveryAddressSort].name = 'deliveryAddress1'\n    }\n\n    const orderRemarkSort = sortings.findIndex(sort => sort.name === 'orderRemark')\n    if (orderRemarkSort >= 0) {\n      sortings[orderRemarkSort].name = 'remark'\n    }\n\n    const orderStatusSort = sortings.findIndex(sort => sort.name === 'orderStatus')\n    if (orderStatusSort >= 0) {\n      sortings[orderStatusSort].name = 'status'\n    }\n    const convertedParams = convertListParams({ sortings })\n    const { domain, tx } = context.state\n    const manifest: Manifest = await getRepository(Manifest).findOne({ where: { domain: { id: domain.id }, name } })\n\n    const releaseGoods: ReleaseGood[] = await getRepository(ReleaseGood).find({\n      ...convertedParams,\n      where: { manifest: { id: manifest.id } }\n    })\n\n    const trackingNos: any[] = releaseGoods.map(releaseGood => {\n      return {\n        trackingNo: releaseGood.trackingNo,\n        refNo: releaseGood.refNo,\n        deliveryAddress: releaseGood.deliveryAddress1,\n        attentionTo: releaseGood.attentionTo,\n        postalCode: releaseGood.postalCode,\n        city: releaseGood.city,\n        phone: releaseGood.phone1,\n        dispatchmentStatus: releaseGood.dispatchmentStatus,\n        orderStatus: releaseGood.status,\n        orderRemark: releaseGood.remark\n      }\n    })\n\n    return {\n      ...manifest,\n      trackingNos\n    }\n  }\n\n  @Query(returns => ManifestList, { description: 'To fetch multiple Manifests' })\n  async manifests(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ManifestList> {\n    const { domain } = context.state\n\n    let orderInfoFilter\n    const orderInfoParamIdx = params.filters.findIndex(param => param.name === 'orderInfo')\n    if (orderInfoParamIdx >= 0) {\n      orderInfoFilter = params.filters[orderInfoParamIdx].value.toLowerCase().split(',').join('|')\n\n      params.filters.splice(orderInfoParamIdx, 1)\n    }\n\n    let trackingNoFilter\n    const trackingNoParamIdx = params.filters.findIndex(param => param.name === 'trackingNo')\n    if (trackingNoParamIdx >= 0) {\n      trackingNoFilter = params.filters[trackingNoParamIdx].value\n\n      params.filters.splice(trackingNoParamIdx, 1)\n    }\n\n    const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')\n    if (fromDateParamIdx >= 0) {\n      let fromDateVal = new Date(params.filters[fromDateParamIdx].value)\n      params.filters.splice(fromDateParamIdx, 1)\n\n      params.filters.push({\n        name: 'createdAt',\n        operator: 'gte',\n        value: fromDateVal.toISOString(),\n        relation: false\n      })\n    }\n\n    const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')\n    if (toDateParamIdx >= 0) {\n      let toDateVal = new Date(params.filters[toDateParamIdx].value)\n      params.filters.splice(toDateParamIdx, 1)\n\n      params.filters.push({\n        name: 'createdAt',\n        operator: 'lt',\n        value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),\n        relation: false\n      })\n    }\n\n    const qb: SelectQueryBuilder<Manifest> = getRepository(Manifest).createQueryBuilder('mf')\n    buildQuery(qb, params, context)\n    qb.innerJoin('release_goods', 'rg', 'rg.manifest_id = mf.id')\n    orderInfoFilter\n      ? qb.andWhere(\n          '(rg.name ~* :orderInfoFilter or rg.ref_no ~* :orderInfoFilter or rg.ref_no_2 ~* :orderInfoFilter or rg.ref_no_3 ~* :orderInfoFilter)',\n          { orderInfoFilter }\n        )\n      : ''\n    trackingNoFilter ? qb.andWhere('rg.tracking_no ilike :trackingNo', { trackingNo: trackingNoFilter }) : ''\n\n    const [items, total] = await qb.getManyAndCount()\n\n    await Promise.all(\n      items.map(async item => {\n        item.totalTrackingNo = await getRepository(ReleaseGood).count({ where: { manifest: { id: item.id } } })\n      })\n    )\n    return { items, total }\n  }\n\n  @FieldResolver(type => Domain)\n  async domain(@Root() manifest: Manifest): Promise<Domain> {\n    return await getRepository(Domain).findOneBy({ id: manifest.domainId })\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() manifest: Manifest): Promise<User> {\n    return await getRepository(User).findOneBy({ id: manifest.updaterId })\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() manifest: Manifest): Promise<User> {\n    return await getRepository(User).findOneBy({ id: manifest.creatorId })\n  }\n}\n"]}

package/dist-server/service/manifest/manifest-type.js

@@ -110,6 +110,14 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     tslib_1.__metadata("design:type", String)
 ], TrackingNo.prototype, "city", void 0);
+tslib_1.__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], TrackingNo.prototype, "orderStatus", void 0);
+tslib_1.__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], TrackingNo.prototype, "orderRemark", void 0);
 TrackingNo = tslib_1.__decorate([
     (0, type_graphql_1.ObjectType)()
 ], TrackingNo);

package/dist-server/service/manifest/manifest-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-type.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-type.ts"],"names":[],"mappings":";;;;AAAA,+CAAoE;AAEpE,yCAAqD;AAGrD,IAAa,WAAW,GAAxB,MAAa,WAAW;CAGvB,CAAA;AADC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;;kDACD;AAFlB,WAAW;IADvB,IAAA,wBAAS,GAAE;GACC,WAAW,CAGvB;AAHY,kCAAW;AAMxB,IAAa,aAAa,GAA1B,MAAa,aAAa;CAkBzB,CAAA;AAhBC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC3B;AAGX;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACD;AAGzB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGvB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACC;AAG3B;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,yBAAc,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAC3B;AAjBZ,aAAa;IADzB,IAAA,wBAAS,GAAE;GACC,aAAa,CAkBzB;AAlBY,sCAAa;AAqB1B,IAAa,YAAY,GAAzB,MAAa,YAAY;CASxB,CAAA;AAPC;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACP;AAGnB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACZ;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACN;AART,YAAY;IADxB,IAAA,wBAAS,GAAE;GACC,YAAY,CASxB;AATY,oCAAY;AAYzB,IAAa,YAAY,GAAzB,MAAa,YAAY;CAMxB,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,mBAAQ,CAAC,CAAC;;2CACT;AAGjB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;2CACN;AALF,YAAY;IADxB,IAAA,yBAAU,GAAE;GACA,YAAY,CAMxB;AANY,oCAAY;AASzB,IAAa,UAAU,GAAvB,MAAa,UAAU;CAwBtB,CAAA;AAtBC;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACP;AAGnB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACZ;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACC;AAG3B;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACF;AAGxB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACP;AAGnB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACZ;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACb;AAvBF,UAAU;IADtB,IAAA,yBAAU,GAAE;GACA,UAAU,CAwBtB;AAxBY,gCAAU","sourcesContent":["import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'\n\nimport { Manifest, ManifestStatus } from './manifest'\n\n@InputType()\nexport class NewManifest {\n  @Field(type => [ManifestItem])\n  manifestItems: ManifestItem[]\n}\n\n@InputType()\nexport class ManifestPatch {\n  @Field(type => ID, { nullable: true })\n  id?: string\n\n  @Field({ nullable: true })\n  name?: string\n\n  @Field({ nullable: true })\n  shippingProvider?: string\n\n  @Field({ nullable: true })\n  dispatcherName?: string\n\n  @Field({ nullable: true })\n  dispatcherIdentity?: string\n\n  @Field(type => ManifestStatus, { nullable: true })\n  status?: ManifestStatus\n}\n\n@InputType()\nexport class ManifestItem {\n  @Field({ nullable: true })\n  trackingNo?: string\n\n  @Field({ nullable: true })\n  refNo?: string\n\n  @Field({ nullable: true })\n  transporter?: string\n}\n\n@ObjectType()\nexport class ManifestList {\n  @Field(type => [Manifest])\n  items: Manifest[]\n\n  @Field(type => Int)\n  total: number\n}\n\n@ObjectType()\nexport class TrackingNo {\n  @Field({ nullable: true })\n  trackingNo?: string\n\n  @Field({ nullable: true })\n  refNo?: string\n\n  @Field({ nullable: true })\n  dispatchmentStatus?: string\n\n  @Field({ nullable: true })\n  deliveryAddress?: string\n\n  @Field({ nullable: true })\n  attentionTo?: string\n\n  @Field({ nullable: true })\n  postalCode?: string\n\n  @Field({ nullable: true })\n  phone?: string\n\n  @Field({ nullable: true })\n  city?: string\n}\n"]}
+{"version":3,"file":"manifest-type.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest-type.ts"],"names":[],"mappings":"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","sourcesContent":["import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'\n\nimport { Manifest, ManifestStatus } from './manifest'\n\n@InputType()\nexport class NewManifest {\n  @Field(type => [ManifestItem])\n  manifestItems: ManifestItem[]\n}\n\n@InputType()\nexport class ManifestPatch {\n  @Field(type => ID, { nullable: true })\n  id?: string\n\n  @Field({ nullable: true })\n  name?: string\n\n  @Field({ nullable: true })\n  shippingProvider?: string\n\n  @Field({ nullable: true })\n  dispatcherName?: string\n\n  @Field({ nullable: true })\n  dispatcherIdentity?: string\n\n  @Field(type => ManifestStatus, { nullable: true })\n  status?: ManifestStatus\n}\n\n@InputType()\nexport class ManifestItem {\n  @Field({ nullable: true })\n  trackingNo?: string\n\n  @Field({ nullable: true })\n  refNo?: string\n\n  @Field({ nullable: true })\n  transporter?: string\n}\n\n@ObjectType()\nexport class ManifestList {\n  @Field(type => [Manifest])\n  items: Manifest[]\n\n  @Field(type => Int)\n  total: number\n}\n\n@ObjectType()\nexport class TrackingNo {\n  @Field({ nullable: true })\n  trackingNo?: string\n\n  @Field({ nullable: true })\n  refNo?: string\n\n  @Field({ nullable: true })\n  dispatchmentStatus?: string\n\n  @Field({ nullable: true })\n  deliveryAddress?: string\n\n  @Field({ nullable: true })\n  attentionTo?: string\n\n  @Field({ nullable: true })\n  postalCode?: string\n\n  @Field({ nullable: true })\n  phone?: string\n\n  @Field({ nullable: true })\n  city?: string\n\n  @Field({ nullable: true })\n  orderStatus?: string\n\n  @Field({ nullable: true })\n  orderRemark?: string\n}\n"]}

package/dist-server/service/manifest/manifest.js

@@ -1,5 +1,4 @@
 "use strict";
-var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Manifest = exports.ManifestStatus = void 0;
 const tslib_1 = require("tslib");
@@ -15,6 +14,7 @@ var ManifestStatus;
 (function (ManifestStatus) {
     ManifestStatus["OPEN"] = "OPEN";
     ManifestStatus["CLOSED"] = "CLOSED";
+    ManifestStatus["IN_QUEUE"] = "IN_QUEUE";
 })(ManifestStatus = exports.ManifestStatus || (exports.ManifestStatus = {}));
 (0, type_graphql_1.registerEnumType)(ManifestStatus, {
     name: 'ManifestStatus',
@@ -30,7 +30,7 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, typeorm_1.ManyToOne)(type => shell_1.Domain),
     (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", typeof (_a = typeof shell_1.Domain !== "undefined" && shell_1.Domain) === "function" ? _a : Object)
+    tslib_1.__metadata("design:type", shell_1.Domain)
 ], Manifest.prototype, "domain", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.RelationId)((manifest) => manifest.domain),
@@ -78,6 +78,10 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)(type => [manifest_type_1.TrackingNo], { nullable: true }),
     tslib_1.__metadata("design:type", Array)
 ], Manifest.prototype, "trackingNos", void 0);
+tslib_1.__decorate([
+    (0, type_graphql_1.Field)(type => type_graphql_1.Int, { nullable: true }),
+    tslib_1.__metadata("design:type", Number)
+], Manifest.prototype, "totalTrackingNo", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.CreateDateColumn)(),
     (0, type_graphql_1.Field)({ nullable: true }),
@@ -91,7 +95,7 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", typeof (_b = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _b : Object)
+    tslib_1.__metadata("design:type", auth_base_1.User)
 ], Manifest.prototype, "creator", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.RelationId)((manifest) => manifest.creator),
@@ -100,7 +104,7 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", typeof (_c = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _c : Object)
+    tslib_1.__metadata("design:type", auth_base_1.User)
 ], Manifest.prototype, "updater", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.RelationId)((manifest) => manifest.creator),

package/dist-server/service/manifest/manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest.ts"],"names":[],"mappings":"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","sourcesContent":["import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'\nimport {\n  Column,\n  CreateDateColumn,\n  Entity,\n  Index,\n  ManyToOne,\n  PrimaryGeneratedColumn,\n  RelationId,\n  UpdateDateColumn\n} from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { config } from '@things-factory/env'\nimport { Domain } from '@things-factory/shell'\n\nimport { TrackingNo } from './manifest-type'\n\nconst ORMCONFIG = config.get('ormconfig', {})\nconst DATABASE_TYPE = ORMCONFIG.type\n\nexport enum ManifestStatus {\n  OPEN = 'OPEN',\n  CLOSED = 'CLOSED'\n}\n\nregisterEnumType(ManifestStatus, {\n  name: 'ManifestStatus',\n  description: 'state enumeration of a manifest'\n})\n\n@Entity()\n@Index('ix_manifest_0', (manifest: Manifest) => [manifest.domain, manifest.name], { unique: true })\n@ObjectType({ description: 'Entity for Manifest' })\nexport class Manifest {\n  @PrimaryGeneratedColumn('uuid')\n  @Field(type => ID)\n  readonly id: string\n\n  @ManyToOne(type => Domain)\n  @Field({ nullable: true })\n  domain?: Domain\n\n  @RelationId((manifest: Manifest) => manifest.domain)\n  domainId?: string\n\n  @Column()\n  @Field()\n  name: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  shippingProvider: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  dispatcherName: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  dispatcherIdentity: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  dispatchedAt: Date\n\n  @Column({\n    type:\n      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'\n        ? 'enum'\n        : DATABASE_TYPE == 'oracle'\n        ? 'varchar2'\n        : 'smallint',\n    enum: ManifestStatus,\n    default: ManifestStatus.OPEN\n  })\n  @Field()\n  status: ManifestStatus\n\n  @Field(type => [TrackingNo], { nullable: true })\n  trackingNos?: TrackingNo[]\n\n  @CreateDateColumn()\n  @Field({ nullable: true })\n  createdAt?: Date\n\n  @UpdateDateColumn()\n  @Field({ nullable: true })\n  updatedAt?: Date\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field({ nullable: true })\n  creator?: User\n\n  @RelationId((manifest: Manifest) => manifest.creator)\n  creatorId?: string\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field({ nullable: true })\n  updater?: User\n\n  @RelationId((manifest: Manifest) => manifest.creator)\n  updaterId?: string\n}\n"]}
+{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../server/service/manifest/manifest.ts"],"names":[],"mappings":"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","sourcesContent":["import { Field, ID, ObjectType, registerEnumType, Int } from 'type-graphql'\nimport {\n  Column,\n  CreateDateColumn,\n  Entity,\n  Index,\n  ManyToOne,\n  PrimaryGeneratedColumn,\n  RelationId,\n  UpdateDateColumn\n} from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { config } from '@things-factory/env'\nimport { Domain } from '@things-factory/shell'\n\nimport { TrackingNo } from './manifest-type'\n\nconst ORMCONFIG = config.get('ormconfig', {})\nconst DATABASE_TYPE = ORMCONFIG.type\n\nexport enum ManifestStatus {\n  OPEN = 'OPEN',\n  CLOSED = 'CLOSED',\n  IN_QUEUE = 'IN_QUEUE'\n}\n\nregisterEnumType(ManifestStatus, {\n  name: 'ManifestStatus',\n  description: 'state enumeration of a manifest'\n})\n\n@Entity()\n@Index('ix_manifest_0', (manifest: Manifest) => [manifest.domain, manifest.name], { unique: true })\n@ObjectType({ description: 'Entity for Manifest' })\nexport class Manifest {\n  @PrimaryGeneratedColumn('uuid')\n  @Field(type => ID)\n  readonly id: string\n\n  @ManyToOne(type => Domain)\n  @Field({ nullable: true })\n  domain?: Domain\n\n  @RelationId((manifest: Manifest) => manifest.domain)\n  domainId?: string\n\n  @Column()\n  @Field()\n  name: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  shippingProvider: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  dispatcherName: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  dispatcherIdentity: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  dispatchedAt: Date\n\n  @Column({\n    type:\n      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'\n        ? 'enum'\n        : DATABASE_TYPE == 'oracle'\n        ? 'varchar2'\n        : 'smallint',\n    enum: ManifestStatus,\n    default: ManifestStatus.OPEN\n  })\n  @Field()\n  status: ManifestStatus\n\n  @Field(type => [TrackingNo], { nullable: true })\n  trackingNos?: TrackingNo[]\n\n  @Field(type => Int, { nullable: true })\n  totalTrackingNo?: number\n\n  @CreateDateColumn()\n  @Field({ nullable: true })\n  createdAt?: Date\n\n  @UpdateDateColumn()\n  @Field({ nullable: true })\n  updatedAt?: Date\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field({ nullable: true })\n  creator?: User\n\n  @RelationId((manifest: Manifest) => manifest.creator)\n  creatorId?: string\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field({ nullable: true })\n  updater?: User\n\n  @RelationId((manifest: Manifest) => manifest.creator)\n  updaterId?: string\n}\n"]}

package/dist-server/service/order-inventory/order-inventory-mutation.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderInventoryMutation = void 0;
 const tslib_1 = require("tslib");
-const order_inventory_types_1 = require("./order-inventory-types");
 const type_graphql_1 = require("type-graphql");
 const typeorm_1 = require("typeorm");
 const order_inventory_1 = require("./order-inventory");
+const order_inventory_types_1 = require("./order-inventory-types");
 let OrderInventoryMutation = class OrderInventoryMutation {
     async deleteOrderInventory(name, context) {
         const { tx, domain } = context.state;
@@ -15,7 +15,7 @@ let OrderInventoryMutation = class OrderInventoryMutation {
     async deleteOrderInventories(names, context) {
         const { tx, domain } = context.state;
         await tx.getRepository(order_inventory_1.OrderInventory).delete({
-            domain,
+            domain: { id: domain.id },
             name: (0, typeorm_1.In)(names)
         });
         return true;
@@ -24,7 +24,7 @@ let OrderInventoryMutation = class OrderInventoryMutation {
         try {
             const { tx, domain } = context.state;
             let foundOI = await tx.getRepository(order_inventory_1.OrderInventory).findOne({
-                where: { domain, id: orderInventory.id }
+                where: { domain: { id: domain.id }, id: orderInventory.id }
             });
             foundOI.serialNumber = orderInventory.serialNumber;
             foundOI = await tx.getRepository(order_inventory_1.OrderInventory).save(foundOI);

package/dist-server/service/order-inventory/order-inventory-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-inventory-mutation.js","sourceRoot":"","sources":["../../../server/service/order-inventory/order-inventory-mutation.ts"],"names":[],"mappings":";;;;AAAA,mEAA6D;AAC7D,+CAAsE;AACtE,qCAA2C;AAI3C,uDAAkD;AAGlD,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAGjC,KAAK,CAAC,oBAAoB,CAAc,IAAY,EAAS,OAAY;QACvE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/D,OAAO,IAAI,CAAA;IACb,CAAC;IAID,KAAK,CAAC,sBAAsB,CAAiC,KAAe,EAAS,OAAY;QAC/F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,MAAM,CAAC;YAC5C,MAAM;YACN,IAAI,EAAE,IAAA,YAAE,EAAC,KAAK,CAAC;SAChB,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAID,KAAK,CAAC,gCAAgC,CAC7B,OAAY,EACqD,cAAoC;QAE5G,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;YAE3E,IAAI,OAAO,GAAmB,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,OAAO,CAAC;gBAC3E,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE;aACzC,CAAC,CAAA;YAEF,OAAO,CAAC,YAAY,GAAG,cAAc,CAAC,YAAY,CAAA;YAClD,OAAO,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAE9D,OAAO,OAAO,CAAA;SACf;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA;AAxCC;IAFC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC;IAC5B,IAAA,wBAAS,EAAC,cAAc,CAAC;IACE,mBAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IAAgB,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;kEAK3D;AAID;IAFC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC;IAC5B,IAAA,wBAAS,EAAC,cAAc,CAAC;IACI,mBAAA,IAAA,kBAAG,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;IAAmB,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;oEAQnF;AAID;IAFC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,gCAAc,CAAC;IACnC,IAAA,wBAAS,EAAC,cAAc,CAAC;IAEvB,mBAAA,IAAA,kBAAG,GAAE,CAAA;IACL,mBAAA,IAAA,kBAAG,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC,2CAAmB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;;qDAAkB,2CAAmB;;8EAgB7G;AA1CU,sBAAsB;IADlC,IAAA,uBAAQ,EAAC,gCAAc,CAAC;GACZ,sBAAsB,CA2ClC;AA3CY,wDAAsB","sourcesContent":["import { OrderInventoryPatch } from './order-inventory-types'\nimport { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'\nimport { EntityManager, In } from 'typeorm'\n\nimport { Domain } from '@things-factory/shell'\n\nimport { OrderInventory } from './order-inventory'\n\n@Resolver(OrderInventory)\nexport class OrderInventoryMutation {\n  @Mutation(returns => Boolean)\n  @Directive('@transaction')\n  async deleteOrderInventory(@Arg('name') name: string, @Ctx() context: any): Promise<boolean> {\n    const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state\n\n    await tx.getRepository(OrderInventory).delete({ domain, name })\n    return true\n  }\n\n  @Mutation(returns => Boolean)\n  @Directive('@transaction')\n  async deleteOrderInventories(@Arg('names', type => [String]) names: string[], @Ctx() context: any): Promise<boolean> {\n    const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state\n\n    await tx.getRepository(OrderInventory).delete({\n      domain,\n      name: In(names)\n    })\n    return true\n  }\n\n  @Mutation(returns => OrderInventory)\n  @Directive('@transaction')\n  async updateOrderInventorySerialNumber(\n    @Ctx() context: any,\n    @Arg('orderInventory', type => OrderInventoryPatch, { nullable: true }) orderInventory?: OrderInventoryPatch\n  ): Promise<OrderInventory> {\n    try {\n      const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state\n\n      let foundOI: OrderInventory = await tx.getRepository(OrderInventory).findOne({\n        where: { domain, id: orderInventory.id }\n      })\n\n      foundOI.serialNumber = orderInventory.serialNumber\n      foundOI = await tx.getRepository(OrderInventory).save(foundOI)\n\n      return foundOI\n    } catch (error) {\n      throw error\n    }\n  }\n}\n"]}
+{"version":3,"file":"order-inventory-mutation.js","sourceRoot":"","sources":["../../../server/service/order-inventory/order-inventory-mutation.ts"],"names":[],"mappings":";;;;AAAA,+CAAsE;AACtE,qCAA4B;AAE5B,uDAAkD;AAClD,mEAA6D;AAG7D,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAGjC,KAAK,CAAC,oBAAoB,CAAc,IAAY,EAAS,OAAwB;QACnF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/D,OAAO,IAAI,CAAA;IACb,CAAC;IAID,KAAK,CAAC,sBAAsB,CACM,KAAe,EACxC,OAAwB;QAE/B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,MAAM,CAAC;YAC5C,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE;YACzB,IAAI,EAAE,IAAA,YAAE,EAAC,KAAK,CAAC;SAChB,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAID,KAAK,CAAC,gCAAgC,CAC7B,OAAwB,EACyC,cAAoC;QAE5G,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;YAEpC,IAAI,OAAO,GAAmB,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,OAAO,CAAC;gBAC3E,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE;aAC5D,CAAC,CAAA;YAEF,OAAO,CAAC,YAAY,GAAG,cAAc,CAAC,YAAY,CAAA;YAClD,OAAO,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAE9D,OAAO,OAAO,CAAA;SACf;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA;AA3CC;IAFC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC;IAC5B,IAAA,wBAAS,EAAC,cAAc,CAAC;IACE,mBAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IAAgB,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;kEAK3D;AAID;IAFC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC;IAC5B,IAAA,wBAAS,EAAC,cAAc,CAAC;IAEvB,mBAAA,IAAA,kBAAG,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;IAC9B,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;oEASP;AAID;IAFC,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,gCAAc,CAAC;IACnC,IAAA,wBAAS,EAAC,cAAc,CAAC;IAEvB,mBAAA,IAAA,kBAAG,GAAE,CAAA;IACL,mBAAA,IAAA,kBAAG,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC,2CAAmB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;;qDAAkB,2CAAmB;;8EAgB7G;AA7CU,sBAAsB;IADlC,IAAA,uBAAQ,EAAC,gCAAc,CAAC;GACZ,sBAAsB,CA8ClC;AA9CY,wDAAsB","sourcesContent":["import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'\nimport { In } from 'typeorm'\n\nimport { OrderInventory } from './order-inventory'\nimport { OrderInventoryPatch } from './order-inventory-types'\n\n@Resolver(OrderInventory)\nexport class OrderInventoryMutation {\n  @Mutation(returns => Boolean)\n  @Directive('@transaction')\n  async deleteOrderInventory(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<boolean> {\n    const { tx, domain } = context.state\n\n    await tx.getRepository(OrderInventory).delete({ domain, name })\n    return true\n  }\n\n  @Mutation(returns => Boolean)\n  @Directive('@transaction')\n  async deleteOrderInventories(\n    @Arg('names', type => [String]) names: string[],\n    @Ctx() context: ResolverContext\n  ): Promise<boolean> {\n    const { tx, domain } = context.state\n\n    await tx.getRepository(OrderInventory).delete({\n      domain: { id: domain.id },\n      name: In(names)\n    })\n    return true\n  }\n\n  @Mutation(returns => OrderInventory)\n  @Directive('@transaction')\n  async updateOrderInventorySerialNumber(\n    @Ctx() context: ResolverContext,\n    @Arg('orderInventory', type => OrderInventoryPatch, { nullable: true }) orderInventory?: OrderInventoryPatch\n  ): Promise<OrderInventory> {\n    try {\n      const { tx, domain } = context.state\n\n      let foundOI: OrderInventory = await tx.getRepository(OrderInventory).findOne({\n        where: { domain: { id: domain.id }, id: orderInventory.id }\n      })\n\n      foundOI.serialNumber = orderInventory.serialNumber\n      foundOI = await tx.getRepository(OrderInventory).save(foundOI)\n\n      return foundOI\n    } catch (error) {\n      throw error\n    }\n  }\n}\n"]}