@things-factory/operato-hub 4.3.232 → 4.3.233

package/dist-server/routers/internal/utils/params.js

@@ -3,9 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reqParams = exports.params = void 0;
 exports.params = {
     'create-user': ['refUserId', 'name', 'description', 'email', 'password', 'salt', 'status'],
-    'update-user': ['id', 'name', 'description', 'password', 'salt', 'status'],
-    'create-company': ['refCompanyId', 'userId', 'name', 'description', 'brn', 'address', 'postalCode', 'type', 'status'],
-    'update-company': ['userId', 'id', 'name', 'description', 'brn', 'address', 'postalCode'],
+    'update-user': ['email', 'name', 'description', 'password', 'salt', 'status'],
+    'create-company': [
+        'refCompanyId',
+        'userEmail',
+        'name',
+        'description',
+        'brn',
+        'address',
+        'postalCode',
+        'type',
+        'status'
+    ],
+    'update-company': [
+        'userEmail',
+        'refCompanyId',
+        'name',
+        'description',
+        'brn',
+        'address',
+        'postalCode',
+        'type',
+        'status'
+    ],
     'create-bizplace': [
         'refBizplaceId',
         'name',
@@ -14,22 +34,17 @@ exports.params = {
         'postalCode',
         'latlng',
         'extType',
-        'companyId',
-        'userId'
+        'refCompanyId',
+        'userEmail'
     ],
-    'update-bizplace': ['id', 'name', 'description', 'address', 'postalCode', 'latlng', 'extType'],
-    'create-partner': ['bizplaceId', 'partnerBizplaceId', 'requesterId'],
-    'terminate-partner': ['bizplaceId', 'partnerBizplaceId'],
-    'invite-user': ['userId', 'bizplaceId'],
-    'terminate-user': ['userId', 'bizplaceId']
+    'update-bizplace': ['refBizplaceId', 'name', 'description', 'address', 'postalCode', 'latlng', 'extType'],
+    'create-partner': ['refBizplaceId', 'partnerRefBizplaceId', 'userEmail'],
+    'terminate-partner': ['refBizplaceId', 'partnerRefBizplaceId'],
+    'invite-user': ['userEmail', 'refBizplaceId'],
+    'terminate-user': ['userEmail', 'refBizplaceId']
 };
 exports.reqParams = {
     'create-user': [
-        {
-            name: 'refUserId',
-            required: true,
-            type: 'field'
-        },
         {
             name: 'name',
             required: true,
@@ -48,7 +63,7 @@ exports.reqParams = {
     ],
     'update-user': [
         {
-            name: 'id',
+            name: 'email',
             required: true,
             type: 'field'
         }
@@ -65,19 +80,19 @@ exports.reqParams = {
             type: 'field'
         },
         {
-            name: 'userId',
+            name: 'userEmail',
             required: true,
             type: 'field'
         }
     ],
     'update-company': [
         {
-            name: 'userId',
+            name: 'userEmail',
             required: true,
             type: 'field'
         },
         {
-            name: 'id',
+            name: 'refCompanyId',
             required: true,
             type: 'field'
         }
@@ -89,12 +104,12 @@ exports.reqParams = {
             type: 'field'
         },
         {
-            name: 'userId',
+            name: 'userEmail',
             required: true,
             type: 'field'
         },
         {
-            name: 'companyId',
+            name: 'refCompanyId',
             required: true,
             type: 'field'
         },
@@ -106,55 +121,55 @@ exports.reqParams = {
     ],
     'update-bizplace': [
         {
-            name: 'id',
+            name: 'refBizplaceId',
             required: true,
             type: 'field'
         }
     ],
     'create-partner': [
         {
-            name: 'bizplaceId',
+            name: 'refBizplaceId',
             required: true,
             type: 'field'
         },
         {
-            name: 'partnerBizplaceId',
+            name: 'partnerRefBizplaceId',
             required: true,
             type: 'field'
         }
     ],
     'terminate-partner': [
         {
-            name: 'bizplaceId',
+            name: 'refBizplaceId',
             required: true,
             type: 'field'
         },
         {
-            name: 'partnerBizplaceId',
+            name: 'partnerRefBizplaceId',
             required: true,
             type: 'field'
         }
     ],
     'invite-user': [
         {
-            name: 'userId',
+            name: 'userEmail',
             required: true,
             type: 'field'
         },
         {
-            name: 'bizplaceId',
+            name: 'refBizplaceId',
             required: true,
             type: 'field'
         }
     ],
     'terminate-user': [
         {
-            name: 'userId',
+            name: 'userEmail',
             required: true,
             type: 'field'
         },
         {
-            name: 'bizplaceId',
+            name: 'refBizplaceId',
             required: true,
             type: 'field'
         }

package/dist-server/routers/internal/utils/params.js.map

@@ -1 +1 @@
-{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../server/routers/internal/utils/params.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;IACpB,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC;IAC1F,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC;IAC1E,gBAAgB,EAAE,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC;IACrH,gBAAgB,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,CAAC;IACzF,iBAAiB,EAAE;QACjB,eAAe;QACf,MAAM;QACN,aAAa;QACb,SAAS;QACT,YAAY;QACZ,QAAQ;QACR,SAAS;QACT,WAAW;QACX,QAAQ;KACT;IACD,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC;IAC9F,gBAAgB,EAAE,CAAC,YAAY,EAAE,mBAAmB,EAAE,aAAa,CAAC;IACpE,mBAAmB,EAAE,CAAC,YAAY,EAAE,mBAAmB,CAAC;IACxD,aAAa,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC;IACvC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC;CAC3C,CAAA;AAEY,QAAA,SAAS,GAAG;IACvB,aAAa,EAAE;QACb;YACE,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;IACD,aAAa,EAAE;QACb;YACE,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;IACD,gBAAgB,EAAE;QAChB;YACE,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;IACD,gBAAgB,EAAE;QAChB;YACE,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;IACD,iBAAiB,EAAE;QACjB;YACE,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;IACD,iBAAiB,EAAE;QACjB;YACE,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;IACD,gBAAgB,EAAE;QAChB;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,mBAAmB;YACzB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;IACD,mBAAmB,EAAE;QACnB;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,mBAAmB;YACzB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;IACD,aAAa,EAAE;QACb;YACE,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;IACD,gBAAgB,EAAE;QAChB;YACE,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;CACF,CAAA"}
+{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../server/routers/internal/utils/params.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.232",
+  "version": "4.3.233",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -119,5 +119,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "14c591b96b1519e7a118103205053185cf7a1305"
+  "gitHead": "544826ef621347e85325f8ebc6018598ac64259d"
 }

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