@things-factory/operato-hub 4.3.231 → 4.3.233

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.231",
+  "version": "4.3.233",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -91,7 +91,7 @@
     "@things-factory/pdf": "^4.3.227",
     "@things-factory/product-ui": "^4.3.227",
     "@things-factory/resource-ui": "^4.3.227",
-    "@things-factory/sales-base": "^4.3.229",
+    "@things-factory/sales-base": "^4.3.232",
     "@things-factory/scene-data-transform": "^4.3.227",
     "@things-factory/scene-excel": "^4.3.227",
     "@things-factory/scene-firebase": "^4.3.227",
@@ -107,7 +107,7 @@
     "@things-factory/shell": "^4.3.227",
     "@things-factory/system-ui": "^4.3.227",
     "@things-factory/warehouse-base": "^4.3.229",
-    "@things-factory/worksheet-base": "^4.3.231",
+    "@things-factory/worksheet-base": "^4.3.232",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -119,5 +119,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "5fee013f37dee7e021e0c88e1078a51d7375e3ad"
+  "gitHead": "544826ef621347e85325f8ebc6018598ac64259d"
 }

package/server/routers/api/restful-apis/v1/utils/params.ts

@@ -268,6 +268,7 @@ export const params = {
     'refNo',
     'refNo2',
     'refNo3',
+    'refOrderId',
     'type',
     'transporter',
     'trackingNo',
@@ -339,6 +340,7 @@ export const params = {
     'releaseGood.refNo',
     'releaseGood.refNo2',
     'releaseGood.refNo3',
+    'releaseGood.refOrderId',
     'releaseGood.marketplaceOrderStatus',
     'releaseGood.billingAddress',
     'releaseGood.deliveryAddress1',

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

@@ -1,13 +1,13 @@
 import {
+  Brackets,
   EntityManager,
   getConnection,
   getRepository,
+  ILike,
   In,
   Not,
   Repository,
-  SelectQueryBuilder,
-  ILike,
-  Brackets
+  SelectQueryBuilder
 } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
@@ -16,6 +16,7 @@ import { User } from '@things-factory/auth-base'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 import { GeoCountry } from '@things-factory/geography'
 import { generateId } from '@things-factory/id-rule-base'
+import { LastMileDelivery } from '@things-factory/integration-lmd'
 import { Sellercraft } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import { ProductBundle, ProductDetail } from '@things-factory/product-base'
@@ -39,7 +40,6 @@ import {
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
-import { LastMileDelivery } from '@things-factory/integration-lmd'
 
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
@@ -96,6 +96,7 @@ router.post(
           refNo: bodyReq.refNo,
           refNo2: bodyReq?.refNo2,
           refNo3: bodyReq?.refNo3,
+          refOrderId: bodyReq?.refOrderId,
           releaseDate: bodyReq.releaseDate,
           type: bodyReq.type,
           marketplaceOrderStatus: bodyReq?.marketplaceOrderStatus,
@@ -207,6 +208,7 @@ router.post(
           refNo: result.refNo,
           refNo2: result.refNo2,
           refNo3: result.refNo3,
+          refOrderId: result.refOrderId,
           status: result.status,
           truckNo: result.truckNo,
           ownTransport: result.ownTransport,
@@ -262,6 +264,7 @@ router.post(
               refNo: result.refNo,
               refNo2: result.refNo2,
               refNo3: result.refNo3,
+              refOrderId: result.refOrderId,
               status: result.status,
               truckNo: result.truckNo,
               ownTransport: result.ownTransport,
@@ -474,6 +477,7 @@ async function createReleaseGood(
     refNo: releaseGood.refNo,
     refNo2: releaseGood.refNo2 || null,
     refNo3: releaseGood.refNo3 || null,
+    refOrderId: releaseGood?.refOrderId || null,
     remark: releaseGood?.remark || null,
     releaseDate: releaseGood.releaseDate,
     truckNo: releaseGood.truckNo,

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

@@ -52,6 +52,7 @@ router.get(
         refNo: releaseGood.refNo,
         refNo2: releaseGood.refNo2,
         refNo3: releaseGood.refNo3,
+        refOrderId: releaseGood.refOrderId,
         type: releaseGood.type,
         releaseDate: releaseGood.releaseDate,
         collectionOrderNo: releaseGood.collectionOrderNo,

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

@@ -62,6 +62,7 @@ router.get(
           refNo: releaseGood.refNo,
           refNo2: releaseGood.refNo2,
           refNo3: releaseGood.refNo3,
+          refOrderId: releaseGood.refOrderId,
           type: releaseGood.type,
           releaseDate: releaseGood.releaseDate,
           collectionOrderNo: releaseGood.collectionOrderNo,

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

@@ -1,12 +1,26 @@
-import { User } from '@things-factory/auth-base'
+import { Repository } from 'typeorm'
+
+import { Privilege, Role, User } from '@things-factory/auth-base'
 import { Bizplace, Company } from '@things-factory/biz-base'
+import { Domain } from '@things-factory/shell'
 
-import { generateBizplaceDomain } from '../../../controllers/bizplace-initializer'
+import {
+  generateBizplaceDomain,
+  initCodes,
+  initGroups,
+  initMenus,
+  initSettings
+} from '../../../controllers/bizplace-initializer'
+import { generateBizplaceDomainRoles } from '../../../controllers/bizplace-initializer/generate-bizplace-domain-roles'
 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: { id: bizplace.companyId } })
+  const company: Company = await tx.getRepository(Company).findOne({ where: { refCompanyId: bizplace.refCompanyId } })
+
+  if (!company) {
+    throw new ApiError('E04', `${bizplace.refCompanyId} not found`)
+  }
 
   const oldBizplace = await tx.getRepository(Bizplace).findOne({
     where: {
@@ -17,7 +31,7 @@ export async function createBizplace(request, context, tx) {
     throw new ApiError('E04', `${bizplace.name} is duplicated`)
   }
 
-  let foundUser: User = await tx.getRepository(User).findOne({ where: { id: bizplace.userId } })
+  let foundUser: User = await tx.getRepository(User).findOne({ where: { email: bizplace.userEmail } })
 
   let createdBizplace: Bizplace = await tx.getRepository(Bizplace).save({
     name: bizplace.name,
@@ -32,7 +46,37 @@ export async function createBizplace(request, context, tx) {
     creator: foundUser
   })
 
-  await generateBizplaceDomain(createdBizplace.id, foundUser, tx)
+  let domain: Domain = await generateBizplaceDomain(createdBizplace.id, foundUser, tx)
+  if (bizplace?.extType && bizplace?.extType == 'warehouse') {
+    domain.extType = bizplace.extType
+    await generateBizplaceDomainRoles(domain, tx)
+    await initMenus(tx, domain)
+    await initCodes(tx, domain)
+    await initSettings(tx, domain)
+    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 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 domains: Domain[] = user.domains
+    domains.push(domain)
+    user.domains = domains
+
+    const roles: Role[] = await user.roles
+    roles.push(role)
+    user.roles = roles
+
+    role.privileges = privileges
+
+    await userRepo.save(user)
+    await roleRepo.save(role)
+
+    await tx.getRepository(Domain).update({ id: domain.id }, { extType: bizplace.extType })
+  }
 
   let data = {
     id: createdBizplace.id,

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

@@ -7,9 +7,12 @@ 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, userId, refCompanyId } = request.data
+  const { name, description, brn, address, postalCode, countryCode, type, status, userEmail, refCompanyId } =
+    request.data
 
-  let foundUser: User = await tx.getRepository(User).findOne({ where: { id: userId }, relations: ['domains', 'roles'] })
+  let foundUser: User = await tx
+    .getRepository(User)
+    .findOne({ where: { email: userEmail }, relations: ['domains', 'roles'] })
 
   const subdomain = slugger(name)
 
@@ -71,6 +74,7 @@ export async function createCompany(request, context, tx) {
     address: company.address,
     postalCode: company.postalCode || '',
     latlng: '',
+    refBizplaceId: refCompanyId || null,
     domain,
     company
   })

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 { bizplaceId, partnerBizplaceId, requesterId } = request.data
+  const { refBizplaceId, partnerRefBizplaceId, userEmail } = request.data
 
   const bizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
+    .findOne({ where: { refBizplaceId }, relations: ['domain'] })
 
   if (!bizplace) {
-    throw new ApiError('E04', `${bizplaceId} does not exist`)
+    throw new ApiError('E04', `${refBizplaceId} does not exist`)
   }
 
   const partnerBizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { id: partnerBizplaceId }, relations: ['domain'] })
+    .findOne({ where: { refBizplaceId: partnerRefBizplaceId }, relations: ['domain'] })
 
   if (!partnerBizplace) {
-    throw new ApiError('E04', `${partnerBizplaceId} does not exist`)
+    throw new ApiError('E04', `${partnerRefBizplaceId} does not exist`)
   }
 
   const isExistingCustomer: boolean = Boolean(
@@ -29,10 +29,10 @@ export async function createPartner(request, context, tx) {
   )
 
   if (isExistingCustomer) {
-    throw new ApiError('E04', `${partnerBizplaceId} already registered as partner`)
+    throw new ApiError('E04', `${partnerRefBizplaceId} already registered as partner`)
   }
 
-  let user: User = await tx.getRepository(User).findOne({ where: { id: requesterId } })
+  let user: User = await tx.getRepository(User).findOne({ where: { email: userEmail } })
 
   await tx.getRepository(Partner).save({
     domain: bizplace.domain,
@@ -42,8 +42,8 @@ export async function createPartner(request, context, tx) {
   })
 
   let data = {
-    bizplaceId,
-    partnerBizplaceId
+    refBizplaceId,
+    partnerRefBizplaceId
   }
 
   return data

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

@@ -7,7 +7,7 @@ export async function createUser(request, context, tx) {
   const { email } = user
   user.email = email.trim()
 
-  const oldUser: User = await tx.getRepository(User).findOne({ where: { refUserId: user.refUserId } })
+  const oldUser: User = await tx.getRepository(User).findOne({ where: { email: user.email } })
   if (oldUser) {
     throw new ApiError('E04', context.t('error.x already exists in y', { x: context.t('field.user'), y: 'operato' }))
   }
@@ -21,7 +21,7 @@ export async function createUser(request, context, tx) {
     status: user?.status || 'inactive',
     salt: user?.salt || salt,
     passwordUpdatedAt: new Date(),
-    password: user?.password || User.encode(user.password, salt)
+    password: user?.password && user?.salt ? user.password : User.encode(user.password, salt)
   })
 
   let data = {

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 { userId, bizplaceId } = request.data
+  const { userEmail, refBizplaceId } = request.data
 
-  const user: User = await tx.getRepository(User).findOne({ where: { id: userId }, relations: ['domains'] })
+  const user: User = await tx.getRepository(User).findOne({ where: { email: userEmail }, relations: ['domains'] })
 
   if (!user) {
-    throw new ApiError('E04', `${userId} does not exist`)
+    throw new ApiError('E04', `${userEmail} does not exist`)
   }
 
   const bizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
+    .findOne({ where: { refBizplaceId }, relations: ['domain'] })
 
   if (!bizplace) {
-    throw new ApiError('E04', `${bizplaceId} does not exist`)
+    throw new ApiError('E04', `${refBizplaceId} 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 = {
-    bizplaceId,
-    userId
+    refBizplaceId,
+    userEmail
   }
 
   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 { bizplaceId, partnerBizplaceId } = request.data
+  const { refBizplaceId, partnerRefBizplaceId } = request.data
 
   const bizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
+    .findOne({ where: { refBizplaceId }, relations: ['domain'] })
 
   if (!bizplace) {
-    throw new ApiError('E04', `${bizplaceId} does not exist`)
+    throw new ApiError('E04', `${refBizplaceId} does not exist`)
   }
 
   const partnerBizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { id: partnerBizplaceId }, relations: ['domain'] })
+    .findOne({ where: { refBizplaceId: partnerRefBizplaceId }, relations: ['domain'] })
 
   if (!partnerBizplace) {
-    throw new ApiError('E04', `${partnerBizplaceId} does not exist`)
+    throw new ApiError('E04', `${partnerRefBizplaceId} 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 = {
-    bizplaceId,
-    partnerBizplaceId
+    refBizplaceId,
+    partnerRefBizplaceId
   }
 
   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 { userId, bizplaceId } = request.data
+  const { userEmail, refBizplaceId } = request.data
 
   const user: User = await tx
     .getRepository(User)
-    .findOne({ where: { id: userId }, relations: ['domains', 'roles', 'roles.domain'] })
+    .findOne({ where: { email: userEmail }, relations: ['domains', 'roles', 'roles.domain'] })
 
   if (!user) {
-    throw new ApiError('E04', `${userId} does not exist`)
+    throw new ApiError('E04', `${userEmail} does not exist`)
   }
 
   const bizplace: Bizplace = await tx
     .getRepository(Bizplace)
-    .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
+    .findOne({ where: { refBizplaceId }, relations: ['domain'] })
 
   if (!bizplace) {
-    throw new ApiError('E04', `${bizplaceId} does not exist`)
+    throw new ApiError('E04', `${refBizplaceId} 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 = {
-    bizplaceId,
-    userId
+    refBizplaceId,
+    userEmail
   }
 
   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: {
-      id: bizplace.id
+      refBizplaceId: bizplace.refBizplaceId
     },
     relations: ['company', 'domain']
   })
   if (!existingBizplace) {
-    throw new ApiError('E04', `${bizplace.id} does not exist`)
+    throw new ApiError('E04', `${bizplace.refBizplaceId} does not exist`)
   }
 
   const company: Company = existingBizplace.company

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

@@ -6,39 +6,37 @@ import { slugger } from '@things-factory/utils'
 import { ApiError } from '../utils/error-util'
 
 export async function updateCompany(request, context, tx) {
-  const { id, name, description, brn, address, postalCode, countryCode, type, status, userId } = request.data
+  const { refCompanyId, name, description, brn, address, postalCode, countryCode, type, status, userEmail } =
+    request.data
 
-  let foundUser: User = await tx.getRepository(User).findOne({ where: { id: userId }, relations: ['domains', 'roles'] })
+  let foundUser: User = await tx
+    .getRepository(User)
+    .findOne({ where: { email: userEmail }, relations: ['domains', 'roles'] })
 
   const subdomain = slugger(name)
 
   //check for existing company
   const existingCompany: Company = await tx.getRepository(Company).findOne({
-    where: { id }
+    where: { refCompanyId }
   })
 
   if (!existingCompany) {
     throw new ApiError('E04', `${name} does not exist`)
   }
 
-  const existingDomain: Domain = await tx.getRepository(Domain).findOne({
-    where: {
-      subdomain
-    },
-    relations: ['bizplace']
-  })
+  const existingBizplaces: Bizplace[] = await tx
+    .getRepository(Bizplace)
+    .find({ where: { company: existingCompany }, relations: ['domain'] })
 
-  if (!existingDomain) {
-    throw new ApiError('E04', `${subdomain} does not exist`)
-  }
+  let companyBizplace: Bizplace = existingBizplaces.find(biz => biz.domain.extType == 'company')
+  let companyDomain: Domain = companyBizplace.domain
 
   // update company
   await tx.getRepository(Domain).update(
-    { id: existingDomain.id },
+    { id: companyDomain.id },
     {
-      subdomain: name ? subdomain : existingDomain.subdomain,
-      name: name ? name : existingDomain.name,
-      updater: foundUser
+      subdomain: name ? subdomain : companyDomain.subdomain,
+      name: name ? name : companyDomain.name
     }
   )
 
@@ -55,19 +53,19 @@ export async function updateCompany(request, context, tx) {
     }
   )
   await tx.getRepository(Bizplace).update(
-    { id: existingDomain.bizplace.id },
+    { id: companyBizplace.id },
     {
-      name: name || existingDomain.bizplace.name,
-      description: description || existingDomain.bizplace.description,
-      address: address || existingDomain.bizplace.address,
-      postalCode: postalCode || existingDomain.bizplace.postalCode || '',
+      name: name || companyBizplace.name,
+      description: description || companyBizplace.description,
+      address: address || companyBizplace.address,
+      postalCode: postalCode || companyBizplace.postalCode || '',
       latlng: '',
       updater: foundUser
     }
   )
 
   const updatedCompany: Company = await tx.getRepository(Company).findOne({
-    where: { id }
+    where: { id: existingCompany.id }
   })
 
   let data = {

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: { id: user.id } })
+  const existingUser: User = await tx.getRepository(User).findOne({ where: { email: user.email } })
   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,6 +1,7 @@
 import Router from 'koa-router'
 import { EntityManager, getConnection } from 'typeorm'
 
+import { Bizplace } from '@things-factory/biz-base'
 import { Integration } from '@things-factory/integration-base'
 
 import * as API from './apis'
@@ -195,6 +196,93 @@ powrupRouter.post('/internal/account/terminate-user', validationMiddleware, asyn
   }
 })
 
+powrupRouter.post('/integration/create', validationMiddleware, async (context, next) => {
+  try {
+    await getConnection().transaction(async (tx: EntityManager) => {
+      const { body } = context.request
+
+      const { bizplaceId, name, description } = body
+
+      const bizplace: Bizplace = await tx
+        .getRepository(Bizplace)
+        .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
+
+      if (!bizplace) {
+        throw new ApiError('E04', `${bizplaceId} not found`)
+      }
+
+      let existingIntegration: Integration = await tx
+        .getRepository(Integration)
+        .findOne({ where: { name, domain: bizplace.domain } })
+
+      if (existingIntegration) {
+        throw new ApiError('E04', `${name} already exist`)
+      }
+
+      let integration: Integration = {
+        name,
+        description,
+        platform: 'powrup',
+        active: true,
+        domain: bizplace.domain
+      }
+
+      let createdIntegration: Integration = await tx.getRepository(Integration).create(integration)
+
+      let data = {
+        id: createdIntegration.id,
+        name: createdIntegration.name
+      }
+
+      context.body = {
+        result: { data }
+      }
+    })
+  } catch (e) {
+    if (e instanceof ApiError) ApiErrorHandler(context, e)
+    else throwInternalServerError(context, e)
+  }
+})
+
+powrupRouter.post('/integration/update', validationMiddleware, async (context, next) => {
+  try {
+    await getConnection().transaction(async (tx: EntityManager) => {
+      const { body } = context.request
+
+      const { id, name, description, active } = body
+
+      let existingIntegration: Integration = await tx.getRepository(Integration).findOne(id)
+
+      if (!existingIntegration) {
+        throw new ApiError('E04', `${id} not found`)
+      }
+
+      await tx.getRepository(Integration).update(
+        { id: existingIntegration.id },
+        {
+          name: name || existingIntegration.name,
+          description: description || existingIntegration.description,
+          active: active || existingIntegration.active
+        }
+      )
+
+      let updatedIntegration: Integration = await tx.getRepository(Integration).findOne(existingIntegration.id)
+
+      let data = {
+        id: updatedIntegration.id,
+        name: updatedIntegration.name
+      }
+
+      context.body = {
+        result: { data }
+      }
+    })
+  } catch (e) {
+    if (e instanceof ApiError) ApiErrorHandler(context, e)
+    else throwInternalServerError(context, e)
+  }
+})
+
 async function getIntegration(context, tx) {
   const integration: Integration = await tx.getRepository(Integration).findOne({
     where: { name: context.request.body.apiKey }