@things-factory/operato-hub 4.3.236 → 4.3.238

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.236",
+  "version": "4.3.238",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -55,59 +55,60 @@
     "@operato/scene-tab": "^0.1.8",
     "@operato/scene-table": "^0.1.8",
     "@operato/scene-wheel-sorter": "^0.1.8",
-    "@things-factory/api": "^4.3.234",
-    "@things-factory/apptool-ui": "^4.3.227",
-    "@things-factory/attachment-base": "^4.3.234",
-    "@things-factory/auth-base": "^4.3.234",
-    "@things-factory/auth-ui": "^4.3.234",
-    "@things-factory/biz-base": "^4.3.234",
-    "@things-factory/biz-ui": "^4.3.234",
-    "@things-factory/board-service": "^4.3.234",
-    "@things-factory/board-ui": "^4.3.234",
-    "@things-factory/code-ui": "^4.3.234",
+    "@things-factory/api": "^4.3.237",
+    "@things-factory/apptool-ui": "^4.3.237",
+    "@things-factory/attachment-base": "^4.3.237",
+    "@things-factory/auth-base": "^4.3.237",
+    "@things-factory/auth-ui": "^4.3.237",
+    "@things-factory/biz-base": "^4.3.237",
+    "@things-factory/biz-ui": "^4.3.237",
+    "@things-factory/board-service": "^4.3.237",
+    "@things-factory/board-ui": "^4.3.237",
+    "@things-factory/code-ui": "^4.3.237",
     "@things-factory/component-ui": "^4.3.227",
-    "@things-factory/context-ui": "^4.3.227",
-    "@things-factory/document-template-ui": "^4.3.234",
-    "@things-factory/export-ui": "^4.3.227",
-    "@things-factory/export-ui-csv": "^4.3.227",
-    "@things-factory/export-ui-excel": "^4.3.227",
-    "@things-factory/geography": "^4.3.234",
-    "@things-factory/grist-ui": "^4.3.227",
-    "@things-factory/help": "^4.3.227",
-    "@things-factory/i18n-base": "^4.3.227",
-    "@things-factory/import-ui": "^4.3.227",
-    "@things-factory/import-ui-excel": "^4.3.227",
-    "@things-factory/integration-accounting": "^4.3.234",
-    "@things-factory/integration-fulfillment": "^4.3.234",
-    "@things-factory/integration-lmd": "^4.3.234",
-    "@things-factory/integration-marketplace": "^4.3.234",
-    "@things-factory/integration-pos": "^4.3.234",
-    "@things-factory/integration-sellercraft": "^4.3.234",
-    "@things-factory/integration-sftp": "^4.3.234",
-    "@things-factory/lite-menu": "^4.3.234",
-    "@things-factory/marketplace-base": "^4.3.234",
-    "@things-factory/more-ui": "^4.3.227",
-    "@things-factory/notification": "^4.3.234",
+    "@things-factory/context-ui": "^4.3.237",
+    "@things-factory/document-template-ui": "^4.3.237",
+    "@things-factory/export-ui": "^4.3.237",
+    "@things-factory/export-ui-csv": "^4.3.237",
+    "@things-factory/export-ui-excel": "^4.3.237",
+    "@things-factory/geography": "^4.3.237",
+    "@things-factory/grist-ui": "^4.3.237",
+    "@things-factory/help": "^4.3.237",
+    "@things-factory/i18n-base": "^4.3.237",
+    "@things-factory/import-ui": "^4.3.237",
+    "@things-factory/import-ui-excel": "^4.3.237",
+    "@things-factory/integration-accounting": "^4.3.238",
+    "@things-factory/integration-fulfillment": "^4.3.238",
+    "@things-factory/integration-lmd": "^4.3.238",
+    "@things-factory/integration-marketplace": "^4.3.238",
+    "@things-factory/integration-pos": "^4.3.238",
+    "@things-factory/integration-powrup": "^4.3.238",
+    "@things-factory/integration-sellercraft": "^4.3.238",
+    "@things-factory/integration-sftp": "^4.3.238",
+    "@things-factory/lite-menu": "^4.3.237",
+    "@things-factory/marketplace-base": "^4.3.238",
+    "@things-factory/more-ui": "^4.3.237",
+    "@things-factory/notification": "^4.3.237",
     "@things-factory/pdf": "^4.3.227",
-    "@things-factory/product-ui": "^4.3.234",
-    "@things-factory/resource-ui": "^4.3.234",
-    "@things-factory/sales-base": "^4.3.236",
-    "@things-factory/scene-data-transform": "^4.3.227",
-    "@things-factory/scene-excel": "^4.3.227",
+    "@things-factory/product-ui": "^4.3.237",
+    "@things-factory/resource-ui": "^4.3.237",
+    "@things-factory/sales-base": "^4.3.238",
+    "@things-factory/scene-data-transform": "^4.3.237",
+    "@things-factory/scene-excel": "^4.3.237",
     "@things-factory/scene-firebase": "^4.3.227",
-    "@things-factory/scene-form": "^4.3.227",
-    "@things-factory/scene-google-map": "^4.3.227",
-    "@things-factory/scene-graphql": "^4.3.227",
-    "@things-factory/scene-label": "^4.3.227",
+    "@things-factory/scene-form": "^4.3.237",
+    "@things-factory/scene-google-map": "^4.3.237",
+    "@things-factory/scene-graphql": "^4.3.237",
+    "@things-factory/scene-label": "^4.3.237",
     "@things-factory/scene-marker": "^4.3.227",
     "@things-factory/scene-mqtt": "^4.3.227",
-    "@things-factory/scene-restful": "^4.3.227",
-    "@things-factory/scene-visualizer": "^4.3.227",
-    "@things-factory/setting-ui": "^4.3.234",
-    "@things-factory/shell": "^4.3.227",
-    "@things-factory/system-ui": "^4.3.227",
-    "@things-factory/warehouse-base": "^4.3.234",
-    "@things-factory/worksheet-base": "^4.3.236",
+    "@things-factory/scene-restful": "^4.3.237",
+    "@things-factory/scene-visualizer": "^4.3.237",
+    "@things-factory/setting-ui": "^4.3.237",
+    "@things-factory/shell": "^4.3.237",
+    "@things-factory/system-ui": "^4.3.237",
+    "@things-factory/warehouse-base": "^4.3.238",
+    "@things-factory/worksheet-base": "^4.3.238",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -119,5 +120,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "88d028f476ba15ffd7bedf3b9aa5ad2f8c51e5a8"
+  "gitHead": "926d659dd0e4d6c24c33ed7cf558779a51f5cba7"
 }

package/server/graphql/resolvers/synchronization/powrup-pack-order.ts

@@ -0,0 +1,156 @@
+import { getConnection, getRepository } from 'typeorm'
+
+import { logger } from '@things-factory/env'
+import { createPayloadLog, PayloadType } from '@things-factory/integration-base'
+import { Powrup, PowrupAPI } from '@things-factory/integration-powrup'
+import {
+  ORDER_STATUS,
+  OrderNoGenerator,
+  OrderPackage,
+  OrderPackageItem,
+  OrderProduct,
+  ReleaseGood
+} from '@things-factory/sales-base'
+import { DateTimeDifference, Worksheet } from '@things-factory/worksheet-base'
+
+export const powrupPackOrderResolver = {
+  async powrupPackOrder(_: void, {}, context: any): Promise<void> {
+    try {
+      await getConnection().transaction(async tx => {
+        try {
+          const powrup: Powrup = await tx.getRepository(Powrup).findOne({ where: { platform: 'powrup' } })
+
+          let releaseGoodQb = await tx
+            .getRepository(ReleaseGood)
+            .createQueryBuilder('rg')
+            .innerJoinAndSelect('rg.domain', 'domain')
+            .innerJoinAndSelect('rg.bizplace', 'bizplace')
+            .innerJoinAndSelect('rg.creator', 'creator')
+            .innerJoinAndSelect('rg.orderProducts', 'op')
+            .innerJoinAndSelect('op.product', 'prd')
+            .innerJoinAndSelect('op.productDetail', 'pd')
+            .where(`rg.source = :source`, { source: 'POWRUP' })
+            .andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
+            .andWhere(`rg.status NOT IN(:...status) `, {
+              status: [ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL, ORDER_STATUS.DONE]
+            })
+            .andWhere(qb => {
+              const subQuery = qb
+                .subQuery()
+                .from(Worksheet, 'ws')
+                .innerJoin('ws.worksheetDetails', 'wsd')
+                .innerJoin('wsd.targetInventory', 'oi')
+                .where('rg.id = oi.release_good_id')
+                .andWhere('ws.type IN (:...wsType)', { wsType: ['PICKING', 'BATCH_PICKING'] })
+                .getQuery()
+              return 'EXISTS ' + subQuery
+            })
+            .andWhere(qb => {
+              const subQuery = qb.subQuery().from(OrderPackage, 'opk').where('rg.id = opk.release_good_id').getQuery()
+              return 'NOT EXISTS ' + subQuery
+            })
+
+          let releaseGoodsWithoutPackageId: ReleaseGood[] = await releaseGoodQb.getMany()
+
+          if (releaseGoodsWithoutPackageId?.length > 0) {
+            await Promise.all(
+              releaseGoodsWithoutPackageId.map(async releaseGood => {
+                const orderProducts: OrderProduct[] = releaseGood.orderProducts
+                if (
+                  releaseGood?.lastMarketPackCall &&
+                  DateTimeDifference.timeDifferenceInSeconds(releaseGood.lastMarketPackCall, new Date()) <= 5
+                ) {
+                  return false
+                }
+
+                await getRepository(ReleaseGood).update(
+                  { id: releaseGood.id },
+                  {
+                    lastMarketPackCall: new Date()
+                  }
+                )
+
+                await getConnection().transaction(async tx2 => {
+                  try {
+                    const orderPack: any = await PowrupAPI.packOrder(powrup, {
+                      context: { state: { domain: releaseGood?.domain, user: null } },
+                      refOrderId: releaseGood.refOrderId
+                    })
+
+                    createPayloadLog(
+                      releaseGood.bizplace.id,
+                      `/order-pack`,
+                      { name: releaseGood.name, refNo: releaseGood.refNo, refOrderId: releaseGood.refOrderId },
+                      JSON.stringify(orderPack),
+                      { state: { domain: releaseGood?.domain, user: null } },
+                      PayloadType.EGESTION,
+                      'scheduler'
+                    )
+
+                    if (orderPack?.packages) {
+                      const packages: any[] = orderPack.packages
+
+                      await tx2.getRepository(ReleaseGood).update(
+                        { id: releaseGood.id },
+                        {
+                          packageId: packages[0].packageId,
+                          lastMarketPackCall: new Date(),
+                          updatedAt: new Date()
+                        }
+                      )
+
+                      for (let idx = 0; idx < packages.length; idx++) {
+                        let pkg = packages[idx]
+                        const items = pkg.items
+                        const orderPackage: OrderPackage = {
+                          name: OrderNoGenerator.orderPackage(),
+                          packageId: pkg.packageId,
+                          status: ORDER_STATUS.PROCESSING,
+                          releaseGood,
+                          domain: releaseGood.domain,
+                          bizplace: releaseGood.bizplace,
+                          creator: releaseGood.creator,
+                          updater: releaseGood.updater
+                        }
+
+                        let savedOrderPackage: OrderPackage = await tx2.getRepository(OrderPackage).save(orderPackage)
+
+                        const orderPackageItems: OrderPackageItem[] = items.map(itm => {
+                          const { refCode, qty } = itm
+                          const matchedOrderProduct: OrderProduct = orderProducts.find(
+                            op => op.productDetail.refCode == refCode
+                          )
+
+                          return {
+                            name: OrderNoGenerator.orderPackageItem(),
+                            orderProduct: matchedOrderProduct,
+                            status: ORDER_STATUS.PROCESSING,
+                            releaseQty: qty,
+                            orderPackage: savedOrderPackage,
+                            domain: releaseGood.domain,
+                            bizplace: releaseGood.bizplace,
+                            creator: releaseGood.creator,
+                            updater: releaseGood.updater
+                          }
+                        })
+
+                        await tx2.getRepository(OrderPackageItem).save(orderPackageItems)
+                      }
+                    }
+                  } catch (e) {
+                    logger.error(`powrupPackOrder[PackOrder]: ${e}`)
+                    await tx2.getRepository(ReleaseGood).update({ id: releaseGood.id }, { packOrderFail: true })
+                  }
+                })
+              })
+            )
+          }
+        } catch (e) {
+          logger.error(`powrupPackOrder[ROSearch]: ${e}`)
+        }
+      })
+    } catch (e) {
+      logger.error(`powrupPackOrder[MainError]: ${e}`)
+    }
+  }
+}

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' }))
   }