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

package/server/routers/api/restful-apis/v2/get-partners.ts

@@ -1,12 +1,14 @@
+import { In } from 'typeorm'
+
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace, Partner } from '@things-factory/biz-base'
-import { getRepository, In } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 const debug = require('debug')('things-factory:operato-hub:restful-api:v2:get-partners')
 
 router.get('/v2/partners/:bizplaceId', async (context, next) => {
   const { bizplaceId } = context.params
-  const bizplace: Bizplace = await getRepository(Bizplace).findOne(bizplaceId)
+  const bizplace: Bizplace = await getRepository(Bizplace).findOneBy({ id: bizplaceId })
   const partners: Partner[] = await getRepository(Partner).find({
     where: { partnerBizplace: bizplace },
     relations: ['domainBizplace']

package/server/routers/api/restful-apis/v2/get-products.ts

@@ -40,6 +40,7 @@ router.get(
                   brandSku
                   isRequiredCheckExpiry
                   expirationPeriod
+                  pickingStrategy
                   auxUnit1
                   auxValue1
                   auxUnit2

package/server/routers/api/restful-apis/v2/get-warehouses.ts

@@ -1,6 +1,7 @@
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace } from '@things-factory/biz-base'
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { getBizplaceAccessibleWarehouses } from '../../../../utils'
 
 const debug = require('debug')('things-factory:operato-hub:restful-api:v2:get-partners')
@@ -8,7 +9,7 @@ const debug = require('debug')('things-factory:operato-hub:restful-api:v2:get-pa
 router.get('/v2/get-warehouses/:bizplaceId', async (context, next) => {
   try {
     const { bizplaceId } = context.params
-    const bizplace: Bizplace = await getRepository(Bizplace).findOne(bizplaceId)
+    const bizplace: Bizplace = await getRepository(Bizplace).findOneBy({ id: bizplaceId })
     context.body = {
       result: await getBizplaceAccessibleWarehouses(bizplace)
     }

package/server/routers/api/restful-apis/v2/update-release-order-details.ts

@@ -1,8 +1,8 @@
 import gql from 'graphql-tag'
-import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace } from '@things-factory/biz-base'
+import { getRepository } from '@things-factory/shell'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'

package/server/routers/auth-invitation-router.ts

@@ -1,6 +1,6 @@
 import Router from 'koa-router'
-import { getRepository } from 'typeorm'
-import { User, resendInvitationEmail, acceptInvitation } from '@things-factory/auth-base'
+
+import { acceptInvitation } from '../controllers/invitation'
 
 const debug = require('debug')('things-factory:auth-base:auth-invitation-router')
 

package/server/routers/business/bizplace-register-router.ts

@@ -1,7 +1,9 @@
 import Router from 'koa-router'
-import { getRepository } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
+import { getRepository } from '@things-factory/shell'
+
 import { businessMiddleware } from '../../middlewares/business-middleware'
 
 const debug = require('debug')('things-factory:operato-hub:bizplace-register-router')

package/server/utils/get-warehouses.ts

@@ -1,5 +1,7 @@
+import { SelectQueryBuilder } from 'typeorm'
+
 import { Bizplace, Company } from '@things-factory/biz-base'
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 /**
  * @description: Get bizplace accessible warehouses
@@ -7,12 +9,15 @@ import { getRepository, SelectQueryBuilder } from 'typeorm'
  */
 export async function getBizplaceAccessibleWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {
   try {
-    bizplace = await getRepository(Bizplace).findOne(bizplace.id, { relations: ['company', 'domain'] })
+    bizplace = await getRepository(Bizplace).findOne({
+      where: { id: bizplace.id },
+      relations: ['company', 'domain']
+    })
     if (bizplace) {
-      return [...await getPartnerWarehouses(bizplace), ...await getMyWarehouses(bizplace)]
-    }else{
+      return [...(await getPartnerWarehouses(bizplace)), ...(await getMyWarehouses(bizplace))]
+    } else {
       throw new Error('bizplace not found')
-    }    
+    }
   } catch (error) {
     throw error
   }
@@ -25,26 +30,32 @@ export async function getBizplaceAccessibleWarehouses(bizplace: Bizplace): Promi
 export async function getPartnerWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {
   const qb: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('biz')
   qb.innerJoin('biz.company', 'company')
-  .innerJoin('Partner', 'partner', 'partner.partner_bizplace_id = biz.id')
-  .innerJoinAndSelect('partner.domainBizplace', 'domainBizplace')
-  .innerJoin('domainBizplace.domain', 'domainBizplaceDomain')
-  .where(`domainBizplaceDomain.extType = 'warehouse'`)
+    .innerJoin('Partner', 'partner', 'partner.partner_bizplace_id = biz.id')
+    .innerJoinAndSelect('partner.domainBizplace', 'domainBizplace')
+    .innerJoin('domainBizplace.domain', 'domainBizplaceDomain')
+    .where(`domainBizplaceDomain.extType = 'warehouse'`)
 
-  if(bizplace?.domain?.extType == 'company'){
+  if (bizplace?.domain?.extType == 'company') {
     qb.andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id })
-  }else{
+  } else {
     qb.andWhere('biz.id = :bizplaceId', { bizplaceId: bizplace.id })
-  }  
+  }
 
-  return (await Promise.all((await qb.getRawMany()).map(async itm=>{
-    return {
-      id: itm.domainBizplace_id,
-      name: itm.domainBizplace_name,
-      description: itm?.domainBizplace_description,
-      company: await getRepository(Company).findOne(itm.domainBizplace_company_id),
-      owner: 'partner'
-    }
-  })))
+  return await Promise.all(
+    (
+      await qb.getRawMany()
+    ).map(async itm => {
+      return {
+        id: itm.domainBizplace_id,
+        name: itm.domainBizplace_name,
+        description: itm?.domainBizplace_description,
+        company: await getRepository(Company).findOneBy({
+          id: itm.domainBizplace_company_id
+        }),
+        owner: 'partner'
+      }
+    })
+  )
 }
 
 /**
@@ -52,19 +63,18 @@ export async function getPartnerWarehouses(bizplace: Bizplace): Promise<Bizplace
  * @param bizplace
  */
 export async function getMyWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {
-  if(bizplace?.domain?.extType == 'company' || bizplace?.domain?.extType == 'warehouse' ) {  
+  if (bizplace?.domain?.extType == 'company' || bizplace?.domain?.extType == 'warehouse') {
     const qb: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('biz')
     qb.innerJoin('biz.company', 'company')
-    qb.innerJoin('biz.domain', 'domain')
-    .where(`domain.extType = 'warehouse'`)
-  
-    if(bizplace?.domain?.extType == 'company'){
+    qb.innerJoin('biz.domain', 'domain').where(`domain.extType = 'warehouse'`)
+
+    if (bizplace?.domain?.extType == 'company') {
       qb.andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id })
-    }else{
+    } else {
       qb.andWhere('biz.id = :bizplaceId', { bizplaceId: bizplace.id })
-    }  
-  
-    return (await qb.getMany()).map(itm=>{
+    }
+
+    return (await qb.getMany()).map(itm => {
       return {
         id: itm.id,
         name: itm.name,
@@ -83,14 +93,14 @@ export async function getMyWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {
  * @param bizplace
  */
 export async function getCompanyWarehouses(bizplace: Bizplace): Promise<Bizplace[]> {
-  if(bizplace?.company?.id) {  
+  if (bizplace?.company?.id) {
     const qb: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('biz')
     qb.innerJoin('biz.company', 'company')
     qb.innerJoin('biz.domain', 'domain')
-    .where(`domain.extType = 'warehouse'`)
-    .andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id })
-  
-    return (await qb.getMany()).map(itm=>{
+      .where(`domain.extType = 'warehouse'`)
+      .andWhere('biz.company_id = :companyId', { companyId: bizplace.company.id })
+
+    return (await qb.getMany()).map(itm => {
       return {
         id: itm.id,
         name: itm.name,
@@ -102,4 +112,4 @@ export async function getCompanyWarehouses(bizplace: Bizplace): Promise<Bizplace
   } else {
     return []
   }
-}
+}