@things-factory/operato-hub 4.3.232 → 4.3.234

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/utils/params.ts

@@ -1,8 +1,28 @@
 export const 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',
@@ -11,23 +31,18 @@ export const 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']
 }
 
 export const reqParams = {
   'create-user': [
-    {
-      name: 'refUserId',
-      required: true,
-      type: 'field'
-    },
     {
       name: 'name',
       required: true,
@@ -46,7 +61,7 @@ export const reqParams = {
   ],
   'update-user': [
     {
-      name: 'id',
+      name: 'email',
       required: true,
       type: 'field'
     }
@@ -63,19 +78,19 @@ export const 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'
     }
@@ -87,12 +102,12 @@ export const reqParams = {
       type: 'field'
     },
     {
-      name: 'userId',
+      name: 'userEmail',
       required: true,
       type: 'field'
     },
     {
-      name: 'companyId',
+      name: 'refCompanyId',
       required: true,
       type: 'field'
     },
@@ -104,55 +119,55 @@ export const 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'
     }