@things-factory/operato-hub 5.0.13 → 6.0.0-alpha.1

package/dist-server/utils/get-warehouses.js

@@ -2,16 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCompanyWarehouses = exports.getMyWarehouses = exports.getPartnerWarehouses = exports.getBizplaceAccessibleWarehouses = void 0;
 const biz_base_1 = require("@things-factory/biz-base");
-const typeorm_1 = require("typeorm");
+const shell_1 = require("@things-factory/shell");
 /**
  * @description: Get bizplace accessible warehouses
  * @param bizplace
  */
 async function getBizplaceAccessibleWarehouses(bizplace) {
     try {
-        bizplace = await (0, typeorm_1.getRepository)(biz_base_1.Bizplace).findOne(bizplace.id, { relations: ['company', 'domain'] });
+        bizplace = await (0, shell_1.getRepository)(biz_base_1.Bizplace).findOne({
+            where: { id: bizplace.id },
+            relations: ['company', 'domain']
+        });
         if (bizplace) {
-            return [...await getPartnerWarehouses(bizplace), ...await getMyWarehouses(bizplace)];
+            return [...(await getPartnerWarehouses(bizplace)), ...(await getMyWarehouses(bizplace))];
         }
         else {
             throw new Error('bizplace not found');
@@ -28,7 +31,7 @@ exports.getBizplaceAccessibleWarehouses = getBizplaceAccessibleWarehouses;
  */
 async function getPartnerWarehouses(bizplace) {
     var _a;
-    const qb = (0, typeorm_1.getRepository)(biz_base_1.Bizplace).createQueryBuilder('biz');
+    const qb = (0, shell_1.getRepository)(biz_base_1.Bizplace).createQueryBuilder('biz');
     qb.innerJoin('biz.company', 'company')
         .innerJoin('Partner', 'partner', 'partner.partner_bizplace_id = biz.id')
         .innerJoinAndSelect('partner.domainBizplace', 'domainBizplace')
@@ -40,15 +43,17 @@ async function getPartnerWarehouses(bizplace) {
     else {
         qb.andWhere('biz.id = :bizplaceId', { bizplaceId: bizplace.id });
     }
-    return (await Promise.all((await qb.getRawMany()).map(async (itm) => {
+    return await Promise.all((await qb.getRawMany()).map(async (itm) => {
         return {
             id: itm.domainBizplace_id,
             name: itm.domainBizplace_name,
             description: itm === null || itm === void 0 ? void 0 : itm.domainBizplace_description,
-            company: await (0, typeorm_1.getRepository)(biz_base_1.Company).findOne(itm.domainBizplace_company_id),
+            company: await (0, shell_1.getRepository)(biz_base_1.Company).findOneBy({
+                id: itm.domainBizplace_company_id
+            }),
             owner: 'partner'
         };
-    })));
+    }));
 }
 exports.getPartnerWarehouses = getPartnerWarehouses;
 /**
@@ -58,10 +63,9 @@ exports.getPartnerWarehouses = getPartnerWarehouses;
 async function getMyWarehouses(bizplace) {
     var _a, _b, _c;
     if (((_a = bizplace === null || bizplace === void 0 ? void 0 : bizplace.domain) === null || _a === void 0 ? void 0 : _a.extType) == 'company' || ((_b = bizplace === null || bizplace === void 0 ? void 0 : bizplace.domain) === null || _b === void 0 ? void 0 : _b.extType) == 'warehouse') {
-        const qb = (0, typeorm_1.getRepository)(biz_base_1.Bizplace).createQueryBuilder('biz');
+        const qb = (0, shell_1.getRepository)(biz_base_1.Bizplace).createQueryBuilder('biz');
         qb.innerJoin('biz.company', 'company');
-        qb.innerJoin('biz.domain', 'domain')
-            .where(`domain.extType = 'warehouse'`);
+        qb.innerJoin('biz.domain', 'domain').where(`domain.extType = 'warehouse'`);
         if (((_c = bizplace === null || bizplace === void 0 ? void 0 : bizplace.domain) === null || _c === void 0 ? void 0 : _c.extType) == 'company') {
             qb.andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id });
         }
@@ -90,7 +94,7 @@ exports.getMyWarehouses = getMyWarehouses;
 async function getCompanyWarehouses(bizplace) {
     var _a;
     if ((_a = bizplace === null || bizplace === void 0 ? void 0 : bizplace.company) === null || _a === void 0 ? void 0 : _a.id) {
-        const qb = (0, typeorm_1.getRepository)(biz_base_1.Bizplace).createQueryBuilder('biz');
+        const qb = (0, shell_1.getRepository)(biz_base_1.Bizplace).createQueryBuilder('biz');
         qb.innerJoin('biz.company', 'company');
         qb.innerJoin('biz.domain', 'domain')
             .where(`domain.extType = 'warehouse'`)

package/dist-server/utils/get-warehouses.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-warehouses.js","sourceRoot":"","sources":["../../server/utils/get-warehouses.ts"],"names":[],"mappings":"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","sourcesContent":["import { Bizplace, Company } from '@things-factory/biz-base'\nimport { getRepository, SelectQueryBuilder } from 'typeorm'\n\n/**\n * @description: Get bizplace accessible warehouses\n * @param bizplace\n */\nexport async function getBizplaceAccessibleWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {\n  try {\n    bizplace = await getRepository(Bizplace).findOne(bizplace.id, { relations: ['company', 'domain'] })\n    if (bizplace) {\n      return [...await getPartnerWarehouses(bizplace), ...await getMyWarehouses(bizplace)]\n    }else{\n      throw new Error('bizplace not found')\n    }    \n  } catch (error) {\n    throw error\n  }\n}\n\n/**\n * @description: Get bizplace accessible partner warehouses\n * @param bizplace\n */\nexport async function getPartnerWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {\n  const qb: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('biz')\n  qb.innerJoin('biz.company', 'company')\n  .innerJoin('Partner', 'partner', 'partner.partner_bizplace_id = biz.id')\n  .innerJoinAndSelect('partner.domainBizplace', 'domainBizplace')\n  .innerJoin('domainBizplace.domain', 'domainBizplaceDomain')\n  .where(`domainBizplaceDomain.extType = 'warehouse'`)\n\n  if(bizplace?.domain?.extType == 'company'){\n    qb.andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id })\n  }else{\n    qb.andWhere('biz.id = :bizplaceId', { bizplaceId: bizplace.id })\n  }  \n\n  return (await Promise.all((await qb.getRawMany()).map(async itm=>{\n    return {\n      id: itm.domainBizplace_id,\n      name: itm.domainBizplace_name,\n      description: itm?.domainBizplace_description,\n      company: await getRepository(Company).findOne(itm.domainBizplace_company_id),\n      owner: 'partner'\n    }\n  })))\n}\n\n/**\n * @description: Get bizplace accessible own warehouses. Company bizplaces can access warehouse under own company, warehouse bizplace can accecss themself.\n * @param bizplace\n */\nexport async function getMyWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {\n  if(bizplace?.domain?.extType == 'company' || bizplace?.domain?.extType == 'warehouse' ) {  \n    const qb: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('biz')\n    qb.innerJoin('biz.company', 'company')\n    qb.innerJoin('biz.domain', 'domain')\n    .where(`domain.extType = 'warehouse'`)\n  \n    if(bizplace?.domain?.extType == 'company'){\n      qb.andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id })\n    }else{\n      qb.andWhere('biz.id = :bizplaceId', { bizplaceId: bizplace.id })\n    }  \n  \n    return (await qb.getMany()).map(itm=>{\n      return {\n        id: itm.id,\n        name: itm.name,\n        description: itm?.description,\n        company: itm?.company,\n        owner: 'self'\n      }\n    })\n  } else {\n    return []\n  }\n}\n\n/**\n * @description: Get company warehouses\n * @param bizplace\n */\nexport async function getCompanyWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {\n  if(bizplace?.company?.id) {  \n    const qb: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('biz')\n    qb.innerJoin('biz.company', 'company')\n    qb.innerJoin('biz.domain', 'domain')\n    .where(`domain.extType = 'warehouse'`)\n    .andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id })\n  \n    return (await qb.getMany()).map(itm=>{\n      return {\n        id: itm.id,\n        name: itm.name,\n        description: itm?.description,\n        company: itm?.company,\n        owner: 'company'\n      }\n    })\n  } else {\n    return []\n  }\n}"]}
+{"version":3,"file":"get-warehouses.js","sourceRoot":"","sources":["../../server/utils/get-warehouses.ts"],"names":[],"mappings":";;;AAEA,uDAA4D;AAC5D,iDAAqD;AAErD;;;GAGG;AACI,KAAK,UAAU,+BAA+B,CAAC,QAAkB;IACtE,IAAI;QACF,QAAQ,GAAG,MAAM,IAAA,qBAAa,EAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;YAC/C,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE;YAC1B,SAAS,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC;SACjC,CAAC,CAAA;QACF,IAAI,QAAQ,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,MAAM,oBAAoB,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;SACzF;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;SACtC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;AAdD,0EAcC;AAED;;;GAGG;AACI,KAAK,UAAU,oBAAoB,CAAC,QAAkB;;IAC3D,MAAM,EAAE,GAAiC,IAAA,qBAAa,EAAC,mBAAQ,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAC1F,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,SAAS,CAAC;SACnC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,sCAAsC,CAAC;SACvE,kBAAkB,CAAC,wBAAwB,EAAE,gBAAgB,CAAC;SAC9D,SAAS,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;SAC1D,KAAK,CAAC,4CAA4C,CAAC,CAAA;IAEtD,IAAI,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,OAAO,KAAI,SAAS,EAAE;QAC1C,EAAE,CAAC,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;KAC/E;SAAM;QACL,EAAE,CAAC,QAAQ,CAAC,sBAAsB,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAA;KACjE;IAED,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,CACE,MAAM,EAAE,CAAC,UAAU,EAAE,CACtB,CAAC,GAAG,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;QAChB,OAAO;YACL,EAAE,EAAE,GAAG,CAAC,iBAAiB;YACzB,IAAI,EAAE,GAAG,CAAC,mBAAmB;YAC7B,WAAW,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,0BAA0B;YAC5C,OAAO,EAAE,MAAM,IAAA,qBAAa,EAAC,kBAAO,CAAC,CAAC,SAAS,CAAC;gBAC9C,EAAE,EAAE,GAAG,CAAC,yBAAyB;aAClC,CAAC;YACF,KAAK,EAAE,SAAS;SACjB,CAAA;IACH,CAAC,CAAC,CACH,CAAA;AACH,CAAC;AA7BD,oDA6BC;AAED;;;GAGG;AACI,KAAK,UAAU,eAAe,CAAC,QAAkB;;IACtD,IAAI,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,OAAO,KAAI,SAAS,IAAI,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,OAAO,KAAI,WAAW,EAAE;QACtF,MAAM,EAAE,GAAiC,IAAA,qBAAa,EAAC,mBAAQ,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;QAC1F,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,SAAS,CAAC,CAAA;QACtC,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAE1E,IAAI,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,OAAO,KAAI,SAAS,EAAE;YAC1C,EAAE,CAAC,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;SAC/E;aAAM;YACL,EAAE,CAAC,QAAQ,CAAC,sBAAsB,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAA;SACjE;QAED,OAAO,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACpC,OAAO;gBACL,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,WAAW,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW;gBAC7B,OAAO,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO;gBACrB,KAAK,EAAE,MAAM;aACd,CAAA;QACH,CAAC,CAAC,CAAA;KACH;SAAM;QACL,OAAO,EAAE,CAAA;KACV;AACH,CAAC;AAxBD,0CAwBC;AAED;;;GAGG;AACI,KAAK,UAAU,oBAAoB,CAAC,QAAkB;;IAC3D,IAAI,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAE,EAAE,EAAE;QACzB,MAAM,EAAE,GAAiC,IAAA,qBAAa,EAAC,mBAAQ,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;QAC1F,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,SAAS,CAAC,CAAA;QACtC,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC;aACjC,KAAK,CAAC,8BAA8B,CAAC;aACrC,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;QAE9E,OAAO,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACpC,OAAO;gBACL,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,WAAW,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW;gBAC7B,OAAO,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO;gBACrB,KAAK,EAAE,SAAS;aACjB,CAAA;QACH,CAAC,CAAC,CAAA;KACH;SAAM;QACL,OAAO,EAAE,CAAA;KACV;AACH,CAAC;AApBD,oDAoBC","sourcesContent":["import { SelectQueryBuilder } from 'typeorm'\n\nimport { Bizplace, Company } from '@things-factory/biz-base'\nimport { getRepository } from '@things-factory/shell'\n\n/**\n * @description: Get bizplace accessible warehouses\n * @param bizplace\n */\nexport async function getBizplaceAccessibleWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {\n  try {\n    bizplace = await getRepository(Bizplace).findOne({\n      where: { id: bizplace.id },\n      relations: ['company', 'domain']\n    })\n    if (bizplace) {\n      return [...(await getPartnerWarehouses(bizplace)), ...(await getMyWarehouses(bizplace))]\n    } else {\n      throw new Error('bizplace not found')\n    }\n  } catch (error) {\n    throw error\n  }\n}\n\n/**\n * @description: Get bizplace accessible partner warehouses\n * @param bizplace\n */\nexport async function getPartnerWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {\n  const qb: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('biz')\n  qb.innerJoin('biz.company', 'company')\n    .innerJoin('Partner', 'partner', 'partner.partner_bizplace_id = biz.id')\n    .innerJoinAndSelect('partner.domainBizplace', 'domainBizplace')\n    .innerJoin('domainBizplace.domain', 'domainBizplaceDomain')\n    .where(`domainBizplaceDomain.extType = 'warehouse'`)\n\n  if (bizplace?.domain?.extType == 'company') {\n    qb.andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id })\n  } else {\n    qb.andWhere('biz.id = :bizplaceId', { bizplaceId: bizplace.id })\n  }\n\n  return await Promise.all(\n    (\n      await qb.getRawMany()\n    ).map(async itm => {\n      return {\n        id: itm.domainBizplace_id,\n        name: itm.domainBizplace_name,\n        description: itm?.domainBizplace_description,\n        company: await getRepository(Company).findOneBy({\n          id: itm.domainBizplace_company_id\n        }),\n        owner: 'partner'\n      }\n    })\n  )\n}\n\n/**\n * @description: Get bizplace accessible own warehouses. Company bizplaces can access warehouse under own company, warehouse bizplace can accecss themself.\n * @param bizplace\n */\nexport async function getMyWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {\n  if (bizplace?.domain?.extType == 'company' || bizplace?.domain?.extType == 'warehouse') {\n    const qb: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('biz')\n    qb.innerJoin('biz.company', 'company')\n    qb.innerJoin('biz.domain', 'domain').where(`domain.extType = 'warehouse'`)\n\n    if (bizplace?.domain?.extType == 'company') {\n      qb.andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id })\n    } else {\n      qb.andWhere('biz.id = :bizplaceId', { bizplaceId: bizplace.id })\n    }\n\n    return (await qb.getMany()).map(itm => {\n      return {\n        id: itm.id,\n        name: itm.name,\n        description: itm?.description,\n        company: itm?.company,\n        owner: 'self'\n      }\n    })\n  } else {\n    return []\n  }\n}\n\n/**\n * @description: Get company warehouses\n * @param bizplace\n */\nexport async function getCompanyWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {\n  if (bizplace?.company?.id) {\n    const qb: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('biz')\n    qb.innerJoin('biz.company', 'company')\n    qb.innerJoin('biz.domain', 'domain')\n      .where(`domain.extType = 'warehouse'`)\n      .andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id })\n\n    return (await qb.getMany()).map(itm => {\n      return {\n        id: itm.id,\n        name: itm.name,\n        description: itm?.description,\n        company: itm?.company,\n        owner: 'company'\n      }\n    })\n  } else {\n    return []\n  }\n}\n"]}

package/openapi/unstable/product.yaml

@@ -6,6 +6,9 @@ definitions:
       - 'name'
       - 'type'
     properties:
+      id:
+        type: 'uuid'
+        example: '4550ba8e-5702-4337-bfa6-5e2718468724'
       sku:
         type: 'string'
         example: 'LB-18'
@@ -30,6 +33,9 @@ definitions:
         example: 'COLGATE MINT'
       isRequiredCheckExpiry:
         type: 'boolean'
+      pickingStrategy:
+        type: 'string'
+        example: 'FIFO'
       expirationPeriod:
         type: 'integer'
         description: 'value should be in days (eg:300 and half day)'
@@ -213,9 +219,9 @@ paths:
           content:
             application/json:
               schema:
-              type: 'array'
-              items:
-                $ref: '#/definitions/Product'
+                type: 'array'
+                items:
+                  $ref: '#/definitions/Product'
         '400':
           description: 'Bad request is sent'
         '401':

package/openapi/v1/product.yaml

@@ -6,6 +6,9 @@ definitions:
       - 'name'
       - 'type'
     properties:
+      id:
+        type: 'uuid'
+        example: '4550ba8e-5702-4337-bfa6-5e2718468724'
       sku:
         type: 'string'
         example: 'LB-18'
@@ -30,6 +33,9 @@ definitions:
         example: 'COLGATE MINT'
       isRequiredCheckExpiry:
         type: 'boolean'
+      pickingStrategy:
+        type: 'string'
+        example: 'FIFO'
       expirationPeriod:
         type: 'integer'
         description: 'value should be in days (eg:300 and half day)'
@@ -213,9 +219,9 @@ paths:
           content:
             application/json:
               schema:
-              type: 'array'
-              items:
-                $ref: '#/definitions/Product'
+                type: 'array'
+                items:
+                  $ref: '#/definitions/Product'
         '400':
           description: 'Bad request is sent'
         '401':

package/openapi/v2/product.yaml

@@ -6,6 +6,9 @@ definitions:
       - 'name'
       - 'type'
     properties:
+      id:
+        type: 'uuid'
+        example: '4550ba8e-5702-4337-bfa6-5e2718468724'
       sku:
         type: 'string'
         example: 'LB-18'
@@ -30,6 +33,9 @@ definitions:
         example: 'COLGATE MINT'
       isRequiredCheckExpiry:
         type: 'boolean'
+      pickingStrategy:
+        type: 'string'
+        example: 'FIFO'
       expirationPeriod:
         type: 'integer'
         description: 'value should be in days (eg:300 and half day)'
@@ -213,9 +219,9 @@ paths:
           content:
             application/json:
               schema:
-              type: 'array'
-              items:
-                $ref: '#/definitions/Product'
+                type: 'array'
+                items:
+                  $ref: '#/definitions/Product'
         '400':
           description: 'Bad request is sent'
         '401':

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "5.0.13",
+  "version": "6.0.0-alpha.1",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
   "license": "MIT",
-  "author": "heartyoh",
+  "author": "heartyoh <heartyoh@hatiolab.com>",
   "description": "Operato Business Hub - business, application register and integration",
   "publishConfig": {
     "access": "public",
@@ -63,55 +63,55 @@
     "@operato/scene-tab": "^1.0.0",
     "@operato/scene-table": "^1.0.0",
     "@operato/scene-wheel-sorter": "^1.0.0",
-    "@things-factory/api": "^5.0.11",
-    "@things-factory/apptool-ui": "^5.0.11",
-    "@things-factory/attachment-base": "^5.0.11",
-    "@things-factory/auth-base": "^5.0.11",
-    "@things-factory/auth-ui": "^5.0.11",
-    "@things-factory/biz-base": "^5.0.11",
-    "@things-factory/biz-ui": "^5.0.11",
-    "@things-factory/board-service": "^5.0.11",
-    "@things-factory/board-ui": "^5.0.11",
-    "@things-factory/code-ui": "^5.0.11",
-    "@things-factory/component-ui": "^5.0.11",
-    "@things-factory/context-ui": "^5.0.11",
-    "@things-factory/document-template-ui": "^5.0.11",
-    "@things-factory/env": "^5.0.0",
-    "@things-factory/export-ui": "^5.0.11",
-    "@things-factory/export-ui-csv": "^5.0.11",
-    "@things-factory/export-ui-excel": "^5.0.11",
-    "@things-factory/grist-ui": "^5.0.11",
-    "@things-factory/help": "^5.0.11",
-    "@things-factory/i18n-base": "^5.0.11",
-    "@things-factory/import-ui": "^5.0.11",
-    "@things-factory/import-ui-excel": "^5.0.11",
-    "@things-factory/integration-accounting": "^5.0.11",
-    "@things-factory/integration-fulfillment": "^5.0.11",
-    "@things-factory/integration-lmd": "^5.0.11",
-    "@things-factory/integration-marketplace": "^5.0.11",
-    "@things-factory/integration-pos": "^5.0.11",
-    "@things-factory/integration-sellercraft": "^5.0.11",
-    "@things-factory/integration-sftp": "^5.0.11",
-    "@things-factory/lite-menu": "^5.0.11",
-    "@things-factory/more-ui": "^5.0.11",
-    "@things-factory/notification": "^5.0.11",
-    "@things-factory/pdf": "^5.0.11",
-    "@things-factory/product-ui": "^5.0.11",
-    "@things-factory/resource-ui": "^5.0.11",
-    "@things-factory/sales-base": "^5.0.13",
-    "@things-factory/scene-google-map": "^5.0.0",
-    "@things-factory/scene-visualizer": "^5.0.0",
-    "@things-factory/setting-ui": "^5.0.11",
-    "@things-factory/shell": "^5.0.11",
-    "@things-factory/system-ui": "^5.0.11",
-    "@things-factory/warehouse-base": "^5.0.12",
-    "@things-factory/worksheet-base": "^5.0.13",
+    "@things-factory/api": "^6.0.0-alpha.0",
+    "@things-factory/apptool-ui": "^6.0.0-alpha.0",
+    "@things-factory/attachment-base": "^6.0.0-alpha.0",
+    "@things-factory/auth-base": "^6.0.0-alpha.0",
+    "@things-factory/auth-ui": "^6.0.0-alpha.1",
+    "@things-factory/biz-base": "^6.0.0-alpha.0",
+    "@things-factory/biz-ui": "^6.0.0-alpha.0",
+    "@things-factory/board-service": "^6.0.0-alpha.0",
+    "@things-factory/board-ui": "^6.0.0-alpha.0",
+    "@things-factory/code-ui": "^6.0.0-alpha.0",
+    "@things-factory/component-ui": "^6.0.0-alpha.0",
+    "@things-factory/context-ui": "^6.0.0-alpha.0",
+    "@things-factory/document-template-ui": "^6.0.0-alpha.0",
+    "@things-factory/env": "^6.0.0-alpha.0",
+    "@things-factory/export-ui": "^6.0.0-alpha.0",
+    "@things-factory/export-ui-csv": "^6.0.0-alpha.0",
+    "@things-factory/export-ui-excel": "^6.0.0-alpha.0",
+    "@things-factory/grist-ui": "^6.0.0-alpha.0",
+    "@things-factory/help": "^6.0.0-alpha.0",
+    "@things-factory/i18n-base": "^6.0.0-alpha.0",
+    "@things-factory/import-ui": "^6.0.0-alpha.0",
+    "@things-factory/import-ui-excel": "^6.0.0-alpha.0",
+    "@things-factory/integration-accounting": "^6.0.0-alpha.1",
+    "@things-factory/integration-fulfillment": "^6.0.0-alpha.1",
+    "@things-factory/integration-lmd": "^6.0.0-alpha.1",
+    "@things-factory/integration-marketplace": "^6.0.0-alpha.1",
+    "@things-factory/integration-pos": "^6.0.0-alpha.1",
+    "@things-factory/integration-sellercraft": "^6.0.0-alpha.1",
+    "@things-factory/integration-sftp": "^6.0.0-alpha.1",
+    "@things-factory/lite-menu": "^6.0.0-alpha.0",
+    "@things-factory/more-ui": "^6.0.0-alpha.0",
+    "@things-factory/notification": "^6.0.0-alpha.0",
+    "@things-factory/pdf": "^6.0.0-alpha.0",
+    "@things-factory/product-ui": "^6.0.0-alpha.0",
+    "@things-factory/resource-ui": "^6.0.0-alpha.1",
+    "@things-factory/sales-base": "^6.0.0-alpha.1",
+    "@things-factory/scene-google-map": "^6.0.0-alpha.0",
+    "@things-factory/scene-visualizer": "^6.0.0-alpha.0",
+    "@things-factory/setting-ui": "^6.0.0-alpha.0",
+    "@things-factory/shell": "^6.0.0-alpha.0",
+    "@things-factory/system-ui": "^6.0.0-alpha.0",
+    "@things-factory/warehouse-base": "^6.0.0-alpha.1",
+    "@things-factory/worksheet-base": "^6.0.0-alpha.1",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {
-    "@things-factory/builder": "^5.0.8"
+    "@things-factory/builder": "^6.0.0-alpha.0"
   },
-  "gitHead": "72dfd33e398eab9872600e91d1b13fef0595c174"
+  "gitHead": "b978f296de5c8be4a3f3450929821e5554855438"
 }

package/server/controllers/bizplace-initializer/dataset/codes.ts

@@ -202,6 +202,15 @@ export const CODES = {
         { name: 'ACTIVE', description: 'ACTIVE' }
       ]
     },
+    {
+      name: 'MANIFEST_STATUS',
+      description: 'manifest status',
+      details: [
+        { name: 'OPEN', description: 'OPEN' },
+        { name: 'IN_QUEUE', description: 'IN_QUEUE' },
+        { name: 'CLOSED', description: 'CLOSED' }
+      ]
+    },
     {
       name: 'TOTE_STATUS',
       description: 'tote status',

package/server/controllers/bizplace-initializer/dataset/settings.ts

@@ -79,6 +79,11 @@ export const SETTINGS = {
       name: 'minimum-seal-number',
       description: 'set the minimum of seal numbers need to be scanned',
       category: 'id-rule'
+    },
+    {
+      name: 'gan-order-processing',
+      description: 'shorten inbound order processing. 0 - default, 1 - Confirm gan to assign warehouse, 2 - Receive gan to assign warehouse',
+      category: 'id-rule'
     }
   ],
   retail: [],

package/server/controllers/bizplace-initializer/generate-bizplace-domain-roles.ts

@@ -1,6 +1,8 @@
+import { EntityManager } from 'typeorm'
+
 import { Privilege, Role } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-import { EntityManager, getRepository } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
+
 import { ROLES_PRIVILEGES } from './dataset'
 
 export async function generateBizplaceDomainRoles(domain: Domain, tx?: EntityManager): Promise<Role[]> {

package/server/controllers/bizplace-initializer/generate-bizplace-domain.ts

@@ -1,11 +1,12 @@
+import { EntityManager, Repository } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Domain } from '@things-factory/shell'
 import { slugger } from '@things-factory/utils'
-import { EntityManager, Repository } from 'typeorm'
 
 export async function generateBizplaceDomain(bizplaceId: String, user: User, tx?: EntityManager) {
-  const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne(bizplaceId)
+  const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({ id: bizplaceId })
 
   if (!bizplace) {
     throw new Error('bizplace not found')
@@ -13,7 +14,7 @@ export async function generateBizplaceDomain(bizplaceId: String, user: User, tx?
 
   const domainName: string = bizplace.name
   const subdomain: string = slugger(domainName)
-  let domain: Domain = await tx.getRepository(Domain).findOne({ subdomain })
+  let domain: Domain = await tx.getRepository(Domain).findOneBy({ subdomain })
 
   if (domain) {
     throw new Error('domain is duplicated')

package/server/controllers/bizplace-initializer/menus.ts

@@ -1,7 +1,9 @@
+import { EntityManager, In } from 'typeorm'
+
 import { Role } from '@things-factory/auth-base'
 import { Menu } from '@things-factory/menu-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager, In } from 'typeorm'
+
 import { MENUS } from './dataset'
 
 export async function initMenus(tx: EntityManager, domain: Domain) {
@@ -28,7 +30,7 @@ export async function initMenus(tx: EntityManager, domain: Domain) {
 
         if (childMenu.roles) {
           const roleNames: string[] = childMenu.roles
-          newChildMenu.roles = await roleRepo.find({ where: { domain, name: In(roleNames) } })
+          newChildMenu.roles = await roleRepo.find({ where: { domain: { id: domain.id }, name: In(roleNames) } })
         }
 
         return newChildMenu

package/server/controllers/company-initializer/business-register.ts

@@ -1,8 +1,10 @@
-import { Domain } from '@things-factory/shell'
-import { Bizplace, Company } from '@things-factory/biz-base'
+import { EntityManager, Repository } from 'typeorm'
+
 import { Role, User } from '@things-factory/auth-base'
+import { Bizplace, Company } from '@things-factory/biz-base'
+import { Domain, getRepository } from '@things-factory/shell'
 import { slugger } from '@things-factory/utils'
-import { getRepository, Repository, EntityManager } from 'typeorm'
+
 import { generateBusinessRoles } from '../../controllers/company-initializer'
 
 export async function businessRegister(domain: Domain, companyInput: Company, user: User, tx?: EntityManager) {

package/server/controllers/company-initializer/generate-company-roles.ts

@@ -1,6 +1,7 @@
+import { EntityManager } from 'typeorm'
+
 import { Privilege, Role } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-import { EntityManager, getRepository } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
 
 const COMPANY_ROLES_PRIVILEGES = [
   {
@@ -109,7 +110,7 @@ export async function generateBusinessRoles(domain: Domain, tx?: EntityManager):
       role.domain = domain
       role.name = rp.name
       if (rp.privileges?.length) {
-        role.privileges = await privilegeRepo.find(rp.privileges)
+        role.privileges = await privilegeRepo.findBy(rp.privileges) /* CONFIRMME regarding TYPEORM */
       }
 
       return await roleRepo.save(role)

package/server/controllers/invitation.ts

@@ -1,8 +1,10 @@
+import { URL } from 'url'
+
 import { Invitation, User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { sendEmail } from '@things-factory/email-base'
-import { getRepository } from 'typeorm'
-import { URL } from 'url'
+import { getRepository } from '@things-factory/shell'
+
 import { getInvitationEmailForm } from '../templates/invitation-email'
 import { makeInvitationToken } from './utils/make-invitation-token'
 import { saveInvitationToken } from './utils/save-invitation-token'
@@ -19,7 +21,9 @@ export async function invite(attrs, withEmailInvitation?: Boolean) {
   // - 초대장 전송
 
   const repository = getRepository(User)
-  var user: User = await repository.findOne({ where: { email }, relations: ['bizplaces'] })
+  var user = (await repository.findOne({ where: { email }, relations: ['bizplaces'] })) as User & {
+    bizplaces: Bizplace[]
+  }
 
   if (user) {
     if (type == 'company') {
@@ -27,7 +31,7 @@ export async function invite(attrs, withEmailInvitation?: Boolean) {
         throw new Error('user already a member of the company.')
       }
     } else if (type == 'bizplace') {
-      var bizplace: Bizplace = await getRepository(Bizplace).findOne(reference)
+      var bizplace: Bizplace = await getRepository(Bizplace).findOneBy({ id: reference })
 
       if (!bizplace) {
         throw new Error('invalid bizplace.')
@@ -41,7 +45,7 @@ export async function invite(attrs, withEmailInvitation?: Boolean) {
   }
 
   // invitation 레코드에 동일한 invitation이 있는 지 확인
-  var invitation = await getRepository(Invitation).findOne({
+  var invitation = await getRepository(Invitation).findOneBy({
     email,
     reference,
     type
@@ -76,7 +80,7 @@ export async function invite(attrs, withEmailInvitation?: Boolean) {
 }
 
 export async function acceptInvitation(token) {
-  var invitation = await getRepository(Invitation).findOne({
+  var invitation = await getRepository(Invitation).findOneBy({
     token
   })
 
@@ -112,7 +116,7 @@ export async function sendInvitationEmail({ invitation, context }) {
 }
 
 export async function resendInvitationEmail({ email, reference, type }, context) {
-  var invitation = await getRepository(Invitation).findOne({
+  var invitation = await getRepository(Invitation).findOneBy({
     email,
     reference,
     type

package/server/controllers/utils/save-invitation-token.ts

@@ -1,5 +1,5 @@
-import { getRepository } from 'typeorm'
 import { Invitation } from '@things-factory/auth-base'
+import { getRepository } from '@things-factory/shell'
 
 export async function saveInvitationToken(id, token) {
   return await getRepository(Invitation).save({

package/server/graphql/resolvers/generators/generate-bizplace.ts

@@ -5,7 +5,7 @@ import { Bizplace } from '@things-factory/biz-base'
 import { generateBizplaceDomain } from '../../../controllers/bizplace-initializer/generate-bizplace-domain'
 
 export const generateBizplace = {
-  async generateBizplace(_: any, { bizplaceInput }, context: any) {
+  async generateBizplace(_: any, { bizplaceInput }, context: ResolverContext) {
     const { tx, business: company, user } = context.state
     const { name, description, address, postalCode, latlng } = bizplaceInput
 

package/server/graphql/resolvers/generators/generate-company.ts

@@ -7,7 +7,7 @@ import { initGroups } from '../../../controllers/bizplace-initializer'
 import { generateBusinessRoles } from '../../../controllers/company-initializer/generate-company-roles'
 
 export const generateCompany = {
-  async generateCompany(_: any, { companyInput }, context: any) {
+  async generateCompany(_: any, { companyInput }, context: ResolverContext) {
     const { tx, user } = context.state
     const { name, description, address, postalCode, latlng } = companyInput
 
@@ -50,9 +50,10 @@ export const generateCompany = {
       domain
     })
 
-    const userHavingRoles: User = await tx
-      .getRepository(User)
-      .findOne({ email: user.email }, { relations: ['domains', 'roles'] })
+    const userHavingRoles: User = await tx.getRepository(User).findOne({
+      where: { email: user.email },
+      relations: ['domains', 'roles']
+    })
 
     user.domains = [...user.domains, domain]
     user.roles = [...userHavingRoles.roles, domainRoles.find(r => r.name === 'BUSINESS-OWNER')]

package/server/graphql/resolvers/generators/update-domain-extType.ts

@@ -1,12 +1,14 @@
-import { Domain } from '@things-factory/shell'
-import { User, Role, Privilege } from '@things-factory/auth-base'
 import { EntityManager, Repository } from 'typeorm'
+
+import { Privilege, Role, User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
 import { initCodes, initGroups, initMenus, initSettings } from '../../../controllers/bizplace-initializer'
 import { generateBizplaceDomainRoles } from '../../../controllers/bizplace-initializer/generate-bizplace-domain-roles'
 
 export const updateDomainExtType = {
-  async updateDomainType(_: any, { domainTypeInput }, context: any) {
-    const { tx, user }: { tx: EntityManager; user: User } = context.state
+  async updateDomainType(_: any, { domainTypeInput }, context: ResolverContext) {
+    const { tx, user } = context.state
     const { id, extType }: { id: string; extType: string } = domainTypeInput
 
     let domain: Domain = await tx.getRepository(Domain).findOne({ where: { id } })
@@ -36,7 +38,7 @@ async function createRelations(tx: EntityManager, domain: Domain, email: string)
   const roleRepo: Repository<Role> = tx.getRepository(Role)
   const role: Role = await roleRepo.findOne({ where: { domain } })
   const privilegeRepo: Repository<Privilege> = tx.getRepository(Privilege)
-  const privileges: Privilege = await privilegeRepo.find()
+  const privileges: Privilege[] = await privilegeRepo.find()
 
   const domains: Domain[] = user.domains
   domains.push(domain)

package/server/graphql/resolvers/invitations/partner-invitation.ts

@@ -1,11 +1,11 @@
-import { User } from '@things-factory/auth-base'
+import { Raw } from 'typeorm'
+
 import { Bizplace, Partner } from '@things-factory/biz-base'
-import { Domain } from '@things-factory/shell'
-import { getRepository, Raw } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
 
 export const partnerInvitationResolver = {
-  async partnerInvitation(_: any, { bizplaceName }: { bizplaceName: string }, context: any): Promise<void> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async partnerInvitation(_: any, { bizplaceName }: { bizplaceName: string }, context: ResolverContext): Promise<void> {
+    const { domain, user } = context.state
 
     // Check whether bizplace exists or not
     const partnerBizplace: Bizplace = await getRepository(Bizplace).findOne({

package/server/graphql/resolvers/oauth2/company-roles-by-scope.ts

@@ -1,6 +1,5 @@
 import { getUserDomains, Role, User } from '@things-factory/auth-base'
-import { getRepository } from 'typeorm'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 type CompanyRole = {
   domain: Domain
@@ -8,12 +7,15 @@ type CompanyRole = {
 }
 
 export const companyRolesByScopeResolver = {
-  async companyRolesByScope(_: void, { scope }: { scope: string[] }, context: any): Promise<CompanyRole[]> {
-    let { user }: { user: User } = context.state
+  async companyRolesByScope(_: void, { scope }: { scope: string[] }, context: ResolverContext): Promise<CompanyRole[]> {
+    let { user } = context.state
     const userDomains: Domain[] = await getUserDomains(user)
-    const availableDomains: Domain = userDomains.filter((domain: Domain) => scope.indexOf(domain.extType) >= 0)
+    const availableDomains: Domain[] = userDomains.filter((domain: Domain) => scope.indexOf(domain.extType) >= 0)
     const availableDomainIDs: string[] = availableDomains.map((domain: Domain) => domain.id)
-    user = await getRepository(User).findOne(user.id, { relations: ['roles', 'roles.domain'] })
+    user = await getRepository(User).findOne({
+      where: { id: user.id },
+      relations: ['roles', 'roles.domain']
+    })
 
     const availableRoles: Role[] = user.roles.filter((role: Role) => availableDomainIDs.indexOf(role.domain.id) >= 0)