@things-factory/operato-hub 4.3.237 → 4.3.239

package/server/routers/api/restful-apis/unstable/add-release-order.ts

@@ -816,29 +816,32 @@ async function massageOrderItems(
           const foundProductBundle: ProductBundle = await qb.getOne()
 
           if (foundProductBundle) {
-            let orderProduct = {
-              productBundle: foundProductBundle,
-              refCode,
-              packingType: foundProductBundle.packingType,
-              packingSize: packingSize || 1,
-              uom: inputOrderItem?.uom,
-              releaseQty: inputOrderItem.releaseQty,
-              releaseUomValue: inputOrderItem.releaseQty,
-              packQty: 0,
-              actualPackQty: 0,
-              palletQty: 0,
-              actualPalletQty: 0,
-              orderInventories: [],
-              type: 'RELEASE_OF_GOODS',
-              status: ORDER_PRODUCT_STATUS.ASSIGNED,
-              batchId: '-',
-              sellingPrice: inputOrderItem?.sellingPrice
-                ? inputOrderItem.sellingPrice
-                : avgPaidAmount * inputOrderItem.releaseQty,
-              paidAmount: inputOrderItem?.paidAmount
-                ? inputOrderItem.paidAmount
-                : avgPaidAmount * inputOrderItem.releaseQty
-            }
+            let orderProduct: OrderProduct
+
+            // to be further enhanced
+            // let orderProduct = {
+            //   productBundle: foundProductBundle,
+            //   refCode,
+            //   packingType: foundProductBundle.packingType,
+            //   packingSize: packingSize || 1,
+            //   uom: inputOrderItem?.uom,
+            //   releaseQty: inputOrderItem.releaseQty,
+            //   releaseUomValue: inputOrderItem.releaseQty,
+            //   packQty: 0,
+            //   actualPackQty: 0,
+            //   palletQty: 0,
+            //   actualPalletQty: 0,
+            //   orderInventories: [],
+            //   type: 'RELEASE_OF_GOODS',
+            //   status: ORDER_PRODUCT_STATUS.ASSIGNED,
+            //   batchId: '-',
+            //   sellingPrice: inputOrderItem?.sellingPrice
+            //     ? inputOrderItem.sellingPrice
+            //     : avgPaidAmount * inputOrderItem.releaseQty,
+            //   paidAmount: inputOrderItem?.paidAmount
+            //     ? inputOrderItem.paidAmount
+            //     : avgPaidAmount * inputOrderItem.releaseQty
+            // }
 
             const bundleProductSettings: any[] = foundProductBundle.productBundleSettings
             bundleProductSettings.map(bundleProductSetting => {
@@ -864,9 +867,22 @@ async function massageOrderItems(
                 status: ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
               }
 
+              orderProduct = Object.assign(new OrderProduct(), newOrderInventory)
+
+              orderProduct = {
+                ...orderProduct,
+                refCode,
+                packingType: foundProductBundle.packingType,
+                packingSize: packingSize || 1,
+                orderInventories: [],
+                status: ORDER_PRODUCT_STATUS.ASSIGNED,
+                batchId: '-'
+              }
+
               orderProduct.orderInventories.push(newOrderInventory)
+
+              orderProducts.push(orderProduct)
             })
-            orderProducts.push(orderProduct)
           } else {
             if (sku && refCode) {
               context.throw(404, t(`error.sku ${sku} and refCode ${refCode} not exist in product / bundle master`))

package/server/routers/api/restful-apis/v1/warehouse/add-release-order.ts

@@ -699,23 +699,26 @@ async function massageOrderItems(
         const foundProductBundle: ProductBundle = await qb.getOne()
 
         if (foundProductBundle) {
-          let orderProduct = {
-            productBundle: foundProductBundle,
-            refCode,
-            packingType: foundProductBundle.packingType,
-            packingSize: packingSize || 1,
-            uom: inputOrderItem?.uom,
-            releaseQty: inputOrderItem.releaseQty,
-            releaseUomValue: inputOrderItem.releaseQty,
-            packQty: 0,
-            actualPackQty: 0,
-            palletQty: 0,
-            actualPalletQty: 0,
-            orderInventories: [],
-            type: 'RELEASE_OF_GOODS',
-            status: ORDER_PRODUCT_STATUS.ASSIGNED,
-            batchId: '-'
-          }
+          let orderProduct: OrderProduct
+
+          // to be further enhanced
+          // let orderProduct = {
+          //   productBundle: foundProductBundle,
+          //   refCode,
+          //   packingType: foundProductBundle.packingType,
+          //   packingSize: packingSize || 1,
+          //   uom: inputOrderItem?.uom,
+          //   releaseQty: inputOrderItem.releaseQty,
+          //   releaseUomValue: inputOrderItem.releaseQty,
+          //   packQty: 0,
+          //   actualPackQty: 0,
+          //   palletQty: 0,
+          //   actualPalletQty: 0,
+          //   orderInventories: [],
+          //   type: 'RELEASE_OF_GOODS',
+          //   status: ORDER_PRODUCT_STATUS.ASSIGNED,
+          //   batchId: '-'
+          // }
 
           const bundleProductSettings: any[] = foundProductBundle.productBundleSettings
           bundleProductSettings.map(bundleProductSetting => {
@@ -741,9 +744,22 @@ async function massageOrderItems(
               status: ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
             }
 
+            orderProduct = Object.assign(new OrderProduct(), newOrderInventory)
+
+            orderProduct = {
+              ...orderProduct,
+              refCode,
+              packingType: foundProductBundle.packingType,
+              packingSize: packingSize || 1,
+              orderInventories: [],
+              status: ORDER_PRODUCT_STATUS.ASSIGNED,
+              batchId: '-'
+            }
+
             orderProduct.orderInventories.push(newOrderInventory)
+
+            orderProducts.push(orderProduct)
           })
-          orderProducts.push(orderProduct)
         } else {
           if (sku && refCode) {
             throw new ApiError('E04', t(`error.sku ${sku} and refCode ${refCode} not exist in product / bundle master`))

package/server/routers/internal/apis/create-bizplace.ts

@@ -16,24 +16,25 @@ import { ApiError } from '../utils/error-util'
 
 export async function createBizplace(request, context, tx) {
   const { data: bizplace } = request
-  const company: Company = await tx.getRepository(Company).findOne({ where: { refCompanyId: bizplace.refCompanyId } })
+  const company: Company = await tx.getRepository(Company).findOne({ where: { id: bizplace.companyId } })
 
   if (!company) {
-    throw new ApiError('E04', `${bizplace.refCompanyId} not found`)
+    throw new ApiError('E04', `${bizplace.companyId} not found`)
   }
 
   const oldBizplace = await tx.getRepository(Bizplace).findOne({
     where: {
-      refBizplaceId: bizplace.refBizplaceId
+      id: bizplace.id
     }
   })
   if (oldBizplace) {
-    throw new ApiError('E04', `${bizplace.name} is duplicated`)
+    throw new ApiError('E04', `${bizplace.id} is duplicated`)
   }
 
-  let foundUser: User = await tx.getRepository(User).findOne({ where: { email: bizplace.userEmail } })
+  let foundUser: User = await tx.getRepository(User).findOne({ where: { id: bizplace.userId } })
 
   let createdBizplace: Bizplace = await tx.getRepository(Bizplace).save({
+    id: bizplace.id,
     name: bizplace.name,
     description: bizplace?.description || null,
     address: bizplace?.address || '',
@@ -56,7 +57,7 @@ export async function createBizplace(request, context, tx) {
     await initGroups(tx, domain)
 
     const userRepo: Repository<User> = tx.getRepository(User)
-    const user: User = await userRepo.findOne({ where: { email: bizplace.userEmail }, relations: ['domains', 'roles'] })
+    const user: User = await userRepo.findOne({ where: { id: bizplace.userId }, relations: ['domains', 'roles'] })
     const roleRepo: Repository<Role> = tx.getRepository(Role)
     const role: Role = await roleRepo.findOne({ where: { domain } })
     const privilegeRepo: Repository<Privilege> = tx.getRepository(Privilege)

package/server/routers/internal/apis/create-company.ts

@@ -7,24 +7,22 @@ import { generateBusinessRoles } from '../../../controllers/company-initializer'
 import { ApiError } from '../utils/error-util'
 
 export async function createCompany(request, context, tx) {
-  const { name, description, brn, address, postalCode, countryCode, type, status, userEmail, refCompanyId } =
+  const { id, name, description, brn, address, postalCode, countryCode, type, status, userId, refCompanyId } =
     request.data
 
-  let foundUser: User = await tx
-    .getRepository(User)
-    .findOne({ where: { email: userEmail }, relations: ['domains', 'roles'] })
+  let foundUser: User = await tx.getRepository(User).findOne({ where: { id: userId }, relations: ['domains', 'roles'] })
 
   const subdomain = slugger(name)
 
   //check for existing company
   const oldCompany = await tx.getRepository(Company).findOne({
     where: {
-      refCompanyId
+      id
     }
   })
 
   if (oldCompany) {
-    throw new ApiError('E04', `${name} is duplicated`)
+    throw new ApiError('E04', `${id} is duplicated`)
   }
 
   const oldDomain = await tx.getRepository(Domain).findOne({
@@ -48,6 +46,7 @@ export async function createCompany(request, context, tx) {
   })
 
   const company: Company = await tx.getRepository(Company).save({
+    id,
     name,
     description,
     brn,

package/server/routers/internal/apis/create-partner.ts

@@ -4,22 +4,22 @@ import { Bizplace } from '@things-factory/biz-base'
 import { ApiError } from '../utils/error-util'
 
 export async function createPartner(request, context, tx) {
-  const { refBizplaceId, partnerRefBizplaceId, userEmail } = request.data
+  const { bizplaceId, partnerBizplaceId, userId } = request.data
 
   const bizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { refBizplaceId }, relations: ['domain'] })
+    .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
 
   if (!bizplace) {
-    throw new ApiError('E04', `${refBizplaceId} does not exist`)
+    throw new ApiError('E04', `${bizplaceId} does not exist`)
   }
 
   const partnerBizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { refBizplaceId: partnerRefBizplaceId }, relations: ['domain'] })
+    .findOne({ where: { id: partnerBizplaceId }, relations: ['domain'] })
 
   if (!partnerBizplace) {
-    throw new ApiError('E04', `${partnerRefBizplaceId} does not exist`)
+    throw new ApiError('E04', `${partnerBizplaceId} does not exist`)
   }
 
   const isExistingCustomer: boolean = Boolean(
@@ -29,10 +29,10 @@ export async function createPartner(request, context, tx) {
   )
 
   if (isExistingCustomer) {
-    throw new ApiError('E04', `${partnerRefBizplaceId} already registered as partner`)
+    throw new ApiError('E04', `${partnerBizplaceId} already registered as partner`)
   }
 
-  let user: User = await tx.getRepository(User).findOne({ where: { email: userEmail } })
+  let user: User = await tx.getRepository(User).findOne({ where: { id: userId } })
 
   await tx.getRepository(Partner).save({
     domain: bizplace.domain,
@@ -42,8 +42,8 @@ export async function createPartner(request, context, tx) {
   })
 
   let data = {
-    refBizplaceId,
-    partnerRefBizplaceId
+    bizplaceId,
+    partnerBizplaceId
   }
 
   return data

package/server/routers/internal/apis/create-user.ts

@@ -4,10 +4,10 @@ import { ApiError } from '../utils/error-util'
 
 export async function createUser(request, context, tx) {
   let user: NewUser = request?.data || {}
-  const { email } = user
+  const { id, email } = user
   user.email = email.trim()
 
-  const oldUser: User = await tx.getRepository(User).findOne({ where: { email: user.email } })
+  const oldUser: User = await tx.getRepository(User).findOne(id)
   if (oldUser) {
     throw new ApiError('E04', context.t('error.x already exists in y', { x: context.t('field.user'), y: 'operato' }))
   }

package/server/routers/internal/apis/invite-user.ts

@@ -5,20 +5,20 @@ import { Domain } from '@things-factory/shell'
 import { ApiError } from '../utils/error-util'
 
 export async function inviteUser(request, context, tx) {
-  const { userEmail, refBizplaceId } = request.data
+  const { userId, bizplaceId } = request.data
 
-  const user: User = await tx.getRepository(User).findOne({ where: { email: userEmail }, relations: ['domains'] })
+  const user: User = await tx.getRepository(User).findOne({ where: { id: userId }, relations: ['domains'] })
 
   if (!user) {
-    throw new ApiError('E04', `${userEmail} does not exist`)
+    throw new ApiError('E04', `${userId} does not exist`)
   }
 
   const bizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { refBizplaceId }, relations: ['domain'] })
+    .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
 
   if (!bizplace) {
-    throw new ApiError('E04', `${refBizplaceId} does not exist`)
+    throw new ApiError('E04', `${bizplaceId} does not exist`)
   }
 
   const existingDomains: Domain[] = user.domains
@@ -30,8 +30,8 @@ export async function inviteUser(request, context, tx) {
   await tx.getRepository(User).save(user)
 
   let data = {
-    refBizplaceId,
-    userEmail
+    bizplaceId,
+    userId
   }
 
   return data

package/server/routers/internal/apis/terminate-partner.ts

@@ -4,22 +4,22 @@ import { Bizplace } from '@things-factory/biz-base'
 import { ApiError } from '../utils/error-util'
 
 export async function terminatePartner(request, context, tx) {
-  const { refBizplaceId, partnerRefBizplaceId } = request.data
+  const { bizplaceId, partnerBizplaceId } = request.data
 
   const bizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { refBizplaceId }, relations: ['domain'] })
+    .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
 
   if (!bizplace) {
-    throw new ApiError('E04', `${refBizplaceId} does not exist`)
+    throw new ApiError('E04', `${bizplaceId} does not exist`)
   }
 
   const partnerBizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { refBizplaceId: partnerRefBizplaceId }, relations: ['domain'] })
+    .findOne({ where: { id: partnerBizplaceId }, relations: ['domain'] })
 
   if (!partnerBizplace) {
-    throw new ApiError('E04', `${partnerRefBizplaceId} does not exist`)
+    throw new ApiError('E04', `${partnerBizplaceId} does not exist`)
   }
 
   const partner: Partner = await tx.getRepository(Partner).findOne({
@@ -37,8 +37,8 @@ export async function terminatePartner(request, context, tx) {
   await terminateGrantedRoles(bizplace.domain, partnerBizplace.domain, tx)
 
   let data = {
-    refBizplaceId,
-    partnerRefBizplaceId
+    bizplaceId,
+    partnerBizplaceId
   }
 
   return data

package/server/routers/internal/apis/terminate-user.ts

@@ -5,22 +5,22 @@ import { Domain } from '@things-factory/shell'
 import { ApiError } from '../utils/error-util'
 
 export async function terminateUser(request, context, tx) {
-  const { userEmail, refBizplaceId } = request.data
+  const { userId, bizplaceId } = request.data
 
   const user: User = await tx
     .getRepository(User)
-    .findOne({ where: { email: userEmail }, relations: ['domains', 'roles', 'roles.domain'] })
+    .findOne({ where: { id: userId }, relations: ['domains', 'roles', 'roles.domain'] })
 
   if (!user) {
-    throw new ApiError('E04', `${userEmail} does not exist`)
+    throw new ApiError('E04', `${userId} does not exist`)
   }
 
   const bizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { refBizplaceId }, relations: ['domain'] })
+    .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
 
   if (!bizplace) {
-    throw new ApiError('E04', `${refBizplaceId} does not exist`)
+    throw new ApiError('E04', `${bizplaceId} does not exist`)
   }
 
   const targetDomainIdx: number = user.domains.findIndex((userDomain: Domain) => userDomain.id === bizplace.domain.id)
@@ -37,8 +37,8 @@ export async function terminateUser(request, context, tx) {
   await tx.getRepository(User).save(user)
 
   let data = {
-    refBizplaceId,
-    userEmail
+    userId,
+    bizplaceId
   }
 
   return data

package/server/routers/internal/apis/update-bizplace.ts

@@ -9,12 +9,12 @@ export async function updateBizplace(request, context, tx) {
 
   const existingBizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
     where: {
-      refBizplaceId: bizplace.refBizplaceId
+      id: bizplace.id
     },
     relations: ['company', 'domain']
   })
   if (!existingBizplace) {
-    throw new ApiError('E04', `${bizplace.refBizplaceId} does not exist`)
+    throw new ApiError('E04', `${bizplace.id} does not exist`)
   }
 
   const company: Company = existingBizplace.company

package/server/routers/internal/apis/update-company.ts

@@ -6,22 +6,17 @@ import { slugger } from '@things-factory/utils'
 import { ApiError } from '../utils/error-util'
 
 export async function updateCompany(request, context, tx) {
-  const { refCompanyId, name, description, brn, address, postalCode, countryCode, type, status, userEmail } =
-    request.data
+  const { id, name, description, brn, address, postalCode, countryCode, type, status, userId } = request.data
 
-  let foundUser: User = await tx
-    .getRepository(User)
-    .findOne({ where: { email: userEmail }, relations: ['domains', 'roles'] })
+  let foundUser: User = await tx.getRepository(User).findOne({ where: { id: userId }, relations: ['domains', 'roles'] })
 
   const subdomain = slugger(name)
 
   //check for existing company
-  const existingCompany: Company = await tx.getRepository(Company).findOne({
-    where: { refCompanyId }
-  })
+  const existingCompany: Company = await tx.getRepository(Company).findOne(id)
 
   if (!existingCompany) {
-    throw new ApiError('E04', `${name} does not exist`)
+    throw new ApiError('E04', `${id} does not exist`)
   }
 
   const existingBizplaces: Bizplace[] = await tx

package/server/routers/internal/apis/update-user.ts

@@ -5,7 +5,7 @@ import { ApiError } from '../utils/error-util'
 export async function updateUser(request, context, tx) {
   let user: NewUser = request?.data || {}
 
-  const existingUser: User = await tx.getRepository(User).findOne({ where: { email: user.email } })
+  const existingUser: User = await tx.getRepository(User).findOne({ where: { id: user.id } })
   if (!existingUser) {
     throw new ApiError('E04', context.t('error.x does not exists in y', { x: context.t('field.user'), y: 'operato' }))
   }

package/server/routers/internal/powrup-router.ts

@@ -1,14 +1,14 @@
 import Router from 'koa-router'
 import { EntityManager, getConnection } from 'typeorm'
 
-import { Integration } from '@things-factory/integration-base'
+import { Powrup } from '@things-factory/integration-powrup'
 import { Domain } from '@things-factory/shell'
 
 import * as API from './apis'
 import { validationMiddleware } from './middlewares/validation-middleware'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from './utils/error-util'
 
-const debug = require('debug')('things-factory:integration-accounting:xilnex-router')
+const debug = require('debug')('things-factory:operato-hub:powrup-router')
 
 export const powrupRouter = new Router()
 
@@ -17,7 +17,7 @@ powrupRouter.post('/internal/account/create-user', validationMiddleware, async (
     await getConnection().transaction(async (tx: EntityManager) => {
       const { body } = context.request
 
-      await getIntegration(context, null, tx)
+      await getPowrup(context, null, tx)
 
       let data = await API.createUser(body, context, tx)
 
@@ -36,7 +36,7 @@ powrupRouter.post('/internal/account/update-user', validationMiddleware, async (
     await getConnection().transaction(async (tx: EntityManager) => {
       const { body } = context.request
 
-      await getIntegration(context, null, tx)
+      await getPowrup(context, null, tx)
 
       let data = await API.updateUser(body, context, tx)
 
@@ -55,7 +55,7 @@ powrupRouter.post('/internal/account/create-company', validationMiddleware, asyn
     await getConnection().transaction(async (tx: EntityManager) => {
       const { body } = context.request
 
-      await getIntegration(context, null, tx)
+      await getPowrup(context, null, tx)
 
       let data = await API.createCompany(body, context, tx)
 
@@ -91,7 +91,7 @@ powrupRouter.post('/internal/account/create-bizplace', validationMiddleware, asy
     await getConnection().transaction(async (tx: EntityManager) => {
       const { body } = context.request
 
-      await getIntegration(context, null, tx)
+      await getPowrup(context, null, tx)
 
       let data = await API.createBizplace(body, context, tx)
 
@@ -110,7 +110,7 @@ powrupRouter.post('/internal/account/update-bizplace', validationMiddleware, asy
     await getConnection().transaction(async (tx: EntityManager) => {
       const { body } = context.request
 
-      await getIntegration(context, null, tx)
+      await getPowrup(context, null, tx)
 
       let data = await API.updateBizplace(body, context, tx)
 
@@ -128,7 +128,7 @@ powrupRouter.post('/internal/account/create-partner', validationMiddleware, asyn
   try {
     await getConnection().transaction(async (tx: EntityManager) => {
       const { body } = context.request
-      await getIntegration(context, null, tx)
+      await getPowrup(context, null, tx)
 
       let data = await API.createPartner(body, context, tx)
 
@@ -146,7 +146,7 @@ powrupRouter.post('/internal/account/terminate-partner', validationMiddleware, a
   try {
     await getConnection().transaction(async (tx: EntityManager) => {
       const { body } = context.request
-      await getIntegration(context, null, tx)
+      await getPowrup(context, null, tx)
 
       let data = await API.terminatePartner(body, context, tx)
 
@@ -164,7 +164,7 @@ powrupRouter.post('/internal/account/invite-user', validationMiddleware, async (
   try {
     await getConnection().transaction(async (tx: EntityManager) => {
       const { body } = context.request
-      await getIntegration(context, null, tx)
+      await getPowrup(context, null, tx)
 
       let data = await API.inviteUser(body, context, tx)
 
@@ -182,7 +182,7 @@ powrupRouter.post('/internal/account/terminate-user', validationMiddleware, asyn
   try {
     await getConnection().transaction(async (tx: EntityManager) => {
       const { body } = context.request
-      await getIntegration(context, null, tx)
+      await getPowrup(context, null, tx)
 
       let data = await API.terminateUser(body, context, tx)
 
@@ -205,7 +205,7 @@ powrupRouter.get('/warehouse/get', async (context, next) => {
         throw new ApiError('E01', apiKey)
       }
 
-      await getIntegration(context, apiKey, tx)
+      await getPowrup(context, apiKey, tx)
 
       if (!subdomain) {
         throw new ApiError('E01', subdomain)
@@ -232,13 +232,13 @@ powrupRouter.get('/warehouse/get', async (context, next) => {
   }
 })
 
-async function getIntegration(context, apiKey, tx) {
-  const integration: Integration = await tx.getRepository(Integration).findOne({
-    where: { name: apiKey || context.request.body.apiKey }
+async function getPowrup(context, apiKey, tx) {
+  const powrup: Powrup = await tx.getRepository(Powrup).findOne({
+    where: { apiKey: apiKey || context.request.body.apiKey }
   })
 
-  if (integration) {
-    context.state.integration = integration
+  if (powrup) {
+    context.state.powrup = powrup
   } else {
     throw new ApiError('E04', 'apiKey')
   }