@things-factory/operato-hub 4.3.232 → 4.3.234

package/config.development.js

@@ -1,14 +1,40 @@
 module.exports = {
   domainType: 'company',
   domainExtType: 'company',
+  useVirtualHostBasedDomain: false,
+  fallbackRoute: '/',
   subdomainOffset: 2,
+  port: 3000,
+  inspect: '9260',
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'dev',
+  //   username: 'postgres',
+  //   password: 'abcd1234',
+  //   host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
+  //   port: 55432,
+  //   synchronize: false,
+  //   logging: true
+  // },
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'v3-hub1',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: 'localhost',
+  //   port: 15432,
+  //   synchronize: true,
+  //   logging: true
+  // },
   ormconfig: {
     name: 'default',
     type: 'postgres',
-    database: 'sum',
+    database: 'dev2',
     username: 'postgres',
     password: 'hatio',
-    host: '192.168.0.151',
+    host: '192.168.0.161',
     port: 15432,
     synchronize: true,
     logging: true
@@ -16,95 +42,105 @@ module.exports = {
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'postgres',
+  //   database: 'dev',
   //   username: 'postgres',
-  //   password: 'abcd1234',
-  //   host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
-  //   port: 55432,
-  //   synchronize: false,
-  //   logging: false
+  //   password: 'hatio',
+  //   host: 'localhost',
+  //   port: 15432,
+  //   synchronize: true,
+  //   logging: true
   // },
-  notification: {
-    fcm: {
-      serviceAccount: {
-        project_id: 'operato',
-        private_key:
-          '-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYNOfyNjPMSeG9\nzU1qs0cpVK5cVfadcUaw5g+hkQZMOMlAA7uqW2eX4vkayj7MzbYUayH+sei8044Q\nJIyl6f26dNX1VT3UgTmSmCS0v48EBEZHCgusrUGFjduLRN6OS6uvrXW1xKA18k9q\nai1C2EHCXF2AE4PTvf239RC1UIOnVePcMtT7rMTdHRO4s8OKVuSDbzIt8k1cV3Zt\nES0YsJlkELqBisYpV//2/ZSILTt39J9JzrVef03X9kkoo9p+YnNyy6tWsfQPfgJO\nybiRGBNxiyJ/E2pxRo/WqU0go9OzYJlGaSUrUx09heNiRD1b0MAOmyPDJz/6AaTk\nkU/A+kLzAgMBAAECggEADQ5s2gtR53VSujk1V/Xe8e0Di99DwaWUj5w6YhcK7/wX\nPdQRN4Fw6RLeLjL7xeG/rCNSwzm6hKSrQJL5zLnWW7XbMdyQRk6jdmnVAEv3zACi\nFH9+eFK3e+Q214XfgWz/v4p/FZdRLCYni5VBNHcwyWxLLS/V1ynzB3KM1sDiTRmI\npcT7+uTtwrKgJq64sXtFE2pYrFxDdCiyqzkhv/2ed4YIowAjpKBbbcCDKeVxVkoz\nC1P4PAzs9EeUuKSWYrWaUjN17lqtRlYeT1ylR1PIJuWqd4cKfgoEgz+lHwRPDCEX\nAYbk3nofiJIPBhSfCHrXS755wK48mY8vMwFdfCPJeQKBgQDsz4tjYTHdat5A25n5\nekwMxZwFQ5OvMV4eulwZUDMypTAYSz1iB6sDlgwKDm5omZIfuneqCEIvrqxV/kx3\n5wV/DANHO3hYxdp/NV7rM23xmqlaKZhHQbDono1Fm/LP6DEmJiD7N2eFKsXYcPpR\nSAIdCv0X3zkDQ4zRi51yJlCXzQKBgQDpufJBxCoXngiQJ2j14lWVAeOOdQ6zh5Ip\nBcDwF0X67cNSN3Wl40bS4yLFdolhEAyj5m0WPuYYXpjzhHhZ0W3V3ItdBkrmwIvy\nWOWu26qN0ZbwxVS2qVpHuj6iHWJKHuDZZUkFtJg3BeeBSOUHSA8TvjnA0xd83xeb\n8ZJasWoFvwKBgQDFs/gQ/gIdcq0exLfluh5nw0qgcmyHpNWJHdjqITS9IX/nqFkU\n0IYLtmdStf2jQiLmbkydHcvz9wZVvLqml67VBHhwLcwpgPULoskd34/4V0Dvzy4c\nv1Esw8H5zVqIDLeLu+VpFjZMzQrjyl6RIWbyTExEc84rVWfpQYAu3qIGOQKBgAFr\nXatEk7TdAtRNSPflTfu/rTAaSeKROjQBkvBiU8x4US1YpOBDBxUUyAtG8wKh5FHC\nfnsaGq+fM3KXJVv2R6J62mXQOfg4xyDLpWlwcBK4aSBBMoiBcsjouqSlZQlqMpdf\nZBgixqHe6U8BsFJg/6ZxC0y+e3AIss4Bo4/lb+1lAoGAFOexvaBh21K6W3inmRW4\nLlkVYJaBJ20OwokXg5aXjBiHxqmk7VLAuFbkpb5LOKH2xPILRQ0OEkn51yVymS3T\n9lLpHOFTQXt5tF2/F7NW7kaQJNlLr/h5jPi3O9XHeFmuaN2z150ZB6zzgjeGKzr8\ni+1fgTsRfDtNw8xkSH9qL1Y=\n-----END PRIVATE KEY-----\n',
-        client_email: 'firebase-adminsdk-xmm2e@operato.iam.gserviceaccount.com'
-      },
-      appConfig: {
-        apiKey: 'AIzaSyDdTM2BTLHSt2LNS0G5QB8G0i4KBXFiG7U',
-        projectId: 'operato',
-        messagingSenderId: 79537064975,
-        appId: '1:79537064975:web:32f53119e9c8c6ee2a277a'
-      },
-      serverKey:
-        'AAAAEoTHTA8:APA91bGwt-4HT82Dfwf_VwbQaKT0_qHd0Y3tuW41udjWz5Lz0Ko0mEMD6WbHHSILvQpa6yuoGGKCMsrU7VW2qWRrUm3CYpyG9oSwshNm1tIhljAnOuUfwHCoawbVLwf9qlWpHt4dwCoc'
-    },
-    vapidKey: {
-      subject: 'mailto:heartyoh@hatiolab.com',
-      publicKey: 'BAkVkITsCXBIsYL1yeaBmx5_dn57we-ZXMjirPPHzC2dan82cdEnAio_53PQ-1_w3ykWCBPrrFAWQ_d9N4cFF0o',
-      privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
-    }
+  password: {
+    lowerCase: true,
+    upperCase: false,
+    digit: false,
+    specialCharacter: false,
+    allowRepeat: true,
+    useTightPattern: false,
+    useLoosePattern: true,
+    tightCharacterLength: 4,
+    looseCharacterLength: 4,
+    history: 2
   },
-  port: 9002,
+  sftpFileStorage: {
+    type: 's3',
+    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
+    secretAccessKey: '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',
+    bucketName: 'operato-sftp'
+  },
+  // storage: {
+  //   type: 's3',
+  //   accessKeyId: 'AKIAUQEOPWEJCDH6AR5H',
+  //   secretAccessKey: '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',
+  //   bucketName: 'opa-one',
+  //   region: 'ap-southeast-1'
+  // },
+  uploads: 'uploads',
+  attachmentsPath: 'attachments',
   SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
-  useVirtualHostBasedDomain: false,
+  logger: {
+    file: {
+      filename: 'logs/application-%DATE%.log',
+      datePattern: 'YYYY-MM-DD-HH',
+      zippedArchive: true,
+      maxSize: '200m',
+      maxFiles: '1m',
+      level: 'info'
+    }
+  },
   email: {
     host: 'smtp.office365.com',
     port: 587,
     secure: false, // true for 465, false for other ports
     auth: {
-      user: 'no-reply@hatiolab.com', // generated ethereal user
+      user: 'noreply@hatiolab.com', // generated ethereal user
       pass: 'h@ti0LAB1008' // generated ethereal password
     },
     secureConnection: false,
     tls: {
       ciphers: 'SSLv3'
-    },
-    sender: 'no-reply@hatiolab.com'
+    }
   },
-  awsSesEmail: {
-    email: 'support@hatio.asia',
-    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
-    secretAccessKey: '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'
+  sender: 'noreply@hatiolab.com',
+  notification: {
+    // fcm: {
+    //   serviceAccount: {
+    //     project_id: 'operato',
+    //     private_key:
+    //       '-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYNOfyNjPMSeG9\nzU1qs0cpVK5cVfadcUaw5g+hkQZMOMlAA7uqW2eX4vkayj7MzbYUayH+sei8044Q\nJIyl6f26dNX1VT3UgTmSmCS0v48EBEZHCgusrUGFjduLRN6OS6uvrXW1xKA18k9q\nai1C2EHCXF2AE4PTvf239RC1UIOnVePcMtT7rMTdHRO4s8OKVuSDbzIt8k1cV3Zt\nES0YsJlkELqBisYpV//2/ZSILTt39J9JzrVef03X9kkoo9p+YnNyy6tWsfQPfgJO\nybiRGBNxiyJ/E2pxRo/WqU0go9OzYJlGaSUrUx09heNiRD1b0MAOmyPDJz/6AaTk\nkU/A+kLzAgMBAAECggEADQ5s2gtR53VSujk1V/Xe8e0Di99DwaWUj5w6YhcK7/wX\nPdQRN4Fw6RLeLjL7xeG/rCNSwzm6hKSrQJL5zLnWW7XbMdyQRk6jdmnVAEv3zACi\nFH9+eFK3e+Q214XfgWz/v4p/FZdRLCYni5VBNHcwyWxLLS/V1ynzB3KM1sDiTRmI\npcT7+uTtwrKgJq64sXtFE2pYrFxDdCiyqzkhv/2ed4YIowAjpKBbbcCDKeVxVkoz\nC1P4PAzs9EeUuKSWYrWaUjN17lqtRlYeT1ylR1PIJuWqd4cKfgoEgz+lHwRPDCEX\nAYbk3nofiJIPBhSfCHrXS755wK48mY8vMwFdfCPJeQKBgQDsz4tjYTHdat5A25n5\nekwMxZwFQ5OvMV4eulwZUDMypTAYSz1iB6sDlgwKDm5omZIfuneqCEIvrqxV/kx3\n5wV/DANHO3hYxdp/NV7rM23xmqlaKZhHQbDono1Fm/LP6DEmJiD7N2eFKsXYcPpR\nSAIdCv0X3zkDQ4zRi51yJlCXzQKBgQDpufJBxCoXngiQJ2j14lWVAeOOdQ6zh5Ip\nBcDwF0X67cNSN3Wl40bS4yLFdolhEAyj5m0WPuYYXpjzhHhZ0W3V3ItdBkrmwIvy\nWOWu26qN0ZbwxVS2qVpHuj6iHWJKHuDZZUkFtJg3BeeBSOUHSA8TvjnA0xd83xeb\n8ZJasWoFvwKBgQDFs/gQ/gIdcq0exLfluh5nw0qgcmyHpNWJHdjqITS9IX/nqFkU\n0IYLtmdStf2jQiLmbkydHcvz9wZVvLqml67VBHhwLcwpgPULoskd34/4V0Dvzy4c\nv1Esw8H5zVqIDLeLu+VpFjZMzQrjyl6RIWbyTExEc84rVWfpQYAu3qIGOQKBgAFr\nXatEk7TdAtRNSPflTfu/rTAaSeKROjQBkvBiU8x4US1YpOBDBxUUyAtG8wKh5FHC\nfnsaGq+fM3KXJVv2R6J62mXQOfg4xyDLpWlwcBK4aSBBMoiBcsjouqSlZQlqMpdf\nZBgixqHe6U8BsFJg/6ZxC0y+e3AIss4Bo4/lb+1lAoGAFOexvaBh21K6W3inmRW4\nLlkVYJaBJ20OwokXg5aXjBiHxqmk7VLAuFbkpb5LOKH2xPILRQ0OEkn51yVymS3T\n9lLpHOFTQXt5tF2/F7NW7kaQJNlLr/h5jPi3O9XHeFmuaN2z150ZB6zzgjeGKzr8\ni+1fgTsRfDtNw8xkSH9qL1Y=\n-----END PRIVATE KEY-----\n',
+    //     client_email: 'firebase-adminsdk-xmm2e@operato.iam.gserviceaccount.com'
+    //   },
+    //   appConfig: {
+    //     apiKey: 'AIzaSyDdTM2BTLHSt2LNS0G5QB8G0i4KBXFiG7U',
+    //     projectId: 'operato',
+    //     messagingSenderId: 79537064975,
+    //     appId: '1:79537064975:web:32f53119e9c8c6ee2a277a'
+    //   },
+    //   serverKey:
+    //     'AAAAEoTHTA8:APA91bGwt-4HT82Dfwf_VwbQaKT0_qHd0Y3tuW41udjWz5Lz0Ko0mEMD6WbHHSILvQpa6yuoGGKCMsrU7VW2qWRrUm3CYpyG9oSwshNm1tIhljAnOuUfwHCoawbVLwf9qlWpHt4dwCoc'
+    // },
+    // vapidKey: {
+    //   subject: 'mailto:heartyoh@hatiolab.com',
+    //   publicKey: 'BAkVkITsCXBIsYL1yeaBmx5_dn57we-ZXMjirPPHzC2dan82cdEnAio_53PQ-1_w3ykWCBPrrFAWQ_d9N4cFF0o',
+    //   privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
+    // }
   },
-  attachmentsPath: 'attachment',
   fulfillmentIntegrationOperato: {
-    host: 'operato.com:3000',
+    host: 'operato-h.com:3000',
     protocol: 'http',
     platform: 'operato',
     application: 'Operato MMS',
     appKey: 'a9bf751e622bf146662b240d58971051',
     appSecret: '1c385935dc131c4b902b9bbf6a4798af',
-    type: 'MMS',
-    callback: 'http://operato.com:9000/callback-operato'
-  },
-  fulfillmentIntegrationOperatoSftp: {
-    host: 'operato.com:3000',
-    protocol: 'http',
-    platform: 'operato',
-    application: 'Operato SFTP',
-    appKey: 'd3ebaf18121947931b5902d78adc9a98',
-    appSecret: '41e5591dd6597a75ae5d54603494525b',
-    type: 'SFTP',
-    callback: 'http://operato.com:9000/callback-operato'
+    callback: 'http://operato-retail.com:5000/callback-operato'
   },
   marketplaceIntegrationShopee: {
     platform: 'shopee',
     isUAT: false,
     application: 'Operato MMS',
     partnerId: 846025,
-    partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64',
-    v2: true
+    partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
   },
-  // marketplaceIntegrationShopee: {
-  //   platform: 'shopee',
-  //   isUAT: false,
-  //   application: 'Staging MMS',
-  //   partnerId: 845525,
-  //   partnerKey: '4a3f4214fd0f0bda970b342a99b6f8705fc7bacad2743cffa7ed67b79840665e'
-  // },
   marketplaceIntegrationLazada: {
     platform: 'lazada',
     application: 'operato-mms',
@@ -112,19 +148,12 @@ module.exports = {
     appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
     callback: 'https://maybank.operato-m.com/lazada-callback'
   },
-  sellercraftChannelIntegrationConfig: {
-    tokenCraftApiKey: 'gf2oZbK2rv47qO0bQPbkV8RsqhlHcnSVq267W5I8',
-    apiKey: 'eqDVmIp0kxakM4sNnzqTkySBM73UGMS1nOPDN5Z1',
-    tokenCraftUrl: 'https://tokencraft.piggylabs.com/v1/get-shop',
-    getShopsTokenCraftUrl: 'https://tokencraft.piggylabs.com/v1/get-shops'
-  },
-  sellercraftIntegrationConfig: {
-    apiKey: 'Et0KqtLvA6e92bDvOywy9eCCud4hpAal8akpqI90'
-  },
-  sftpFileStorage: {
-    type: 's3',
-    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
-    secretAccessKey: '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',
-    bucketName: 'operato-sftp'
+  accountingIntegrationXero: {
+    platform: 'xero',
+    application: 'Operato WMS',
+    apiKey: '6B12D1AAC05347DC92159C2AEC812859',
+    apiSecret: 'T139_ItMjObC82mmy7iwnNflhd2iV0kUvDBj0P_201EmA7Sj',
+    callback: 'http://operato-h.com:3000/callback-xero',
+    hostname: 'http://operato-h.com:3000/'
   }
 }

package/dist-server/routers/internal/apis/create-bizplace.js

@@ -3,11 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBizplace = void 0;
 const auth_base_1 = require("@things-factory/auth-base");
 const biz_base_1 = require("@things-factory/biz-base");
+const shell_1 = require("@things-factory/shell");
 const bizplace_initializer_1 = require("../../../controllers/bizplace-initializer");
+const generate_bizplace_domain_roles_1 = require("../../../controllers/bizplace-initializer/generate-bizplace-domain-roles");
 const error_util_1 = require("../utils/error-util");
 async function createBizplace(request, context, tx) {
     const { data: bizplace } = request;
-    const company = await tx.getRepository(biz_base_1.Company).findOne({ where: { id: bizplace.companyId } });
+    const company = await tx.getRepository(biz_base_1.Company).findOne({ where: { refCompanyId: bizplace.refCompanyId } });
+    if (!company) {
+        throw new error_util_1.ApiError('E04', `${bizplace.refCompanyId} not found`);
+    }
     const oldBizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
         where: {
             refBizplaceId: bizplace.refBizplaceId
@@ -16,7 +21,7 @@ async function createBizplace(request, context, tx) {
     if (oldBizplace) {
         throw new error_util_1.ApiError('E04', `${bizplace.name} is duplicated`);
     }
-    let foundUser = await tx.getRepository(auth_base_1.User).findOne({ where: { id: bizplace.userId } });
+    let foundUser = await tx.getRepository(auth_base_1.User).findOne({ where: { email: bizplace.userEmail } });
     let createdBizplace = await tx.getRepository(biz_base_1.Bizplace).save({
         name: bizplace.name,
         description: (bizplace === null || bizplace === void 0 ? void 0 : bizplace.description) || null,
@@ -29,7 +34,31 @@ async function createBizplace(request, context, tx) {
         updater: foundUser,
         creator: foundUser
     });
-    await (0, bizplace_initializer_1.generateBizplaceDomain)(createdBizplace.id, foundUser, tx);
+    let domain = await (0, bizplace_initializer_1.generateBizplaceDomain)(createdBizplace.id, foundUser, tx);
+    if ((bizplace === null || bizplace === void 0 ? void 0 : bizplace.extType) && (bizplace === null || bizplace === void 0 ? void 0 : bizplace.extType) == 'warehouse') {
+        domain.extType = bizplace.extType;
+        await (0, generate_bizplace_domain_roles_1.generateBizplaceDomainRoles)(domain, tx);
+        await (0, bizplace_initializer_1.initMenus)(tx, domain);
+        await (0, bizplace_initializer_1.initCodes)(tx, domain);
+        await (0, bizplace_initializer_1.initSettings)(tx, domain);
+        await (0, bizplace_initializer_1.initGroups)(tx, domain);
+        const userRepo = tx.getRepository(auth_base_1.User);
+        const user = await userRepo.findOne({ where: { email: bizplace.userEmail }, relations: ['domains', 'roles'] });
+        const roleRepo = tx.getRepository(auth_base_1.Role);
+        const role = await roleRepo.findOne({ where: { domain } });
+        const privilegeRepo = tx.getRepository(auth_base_1.Privilege);
+        const privileges = await privilegeRepo.find();
+        const domains = user.domains;
+        domains.push(domain);
+        user.domains = domains;
+        const roles = await user.roles;
+        roles.push(role);
+        user.roles = roles;
+        role.privileges = privileges;
+        await userRepo.save(user);
+        await roleRepo.save(role);
+        await tx.getRepository(shell_1.Domain).update({ id: domain.id }, { extType: bizplace.extType });
+    }
     let data = {
         id: createdBizplace.id,
         name: createdBizplace.name

package/dist-server/routers/internal/apis/create-bizplace.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-bizplace.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/create-bizplace.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAChD,uDAA4D;AAE5D,oFAAkF;AAClF,oDAA8C;AAEvC,KAAK,UAAU,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACvD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;IAClC,MAAM,OAAO,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IAEvG,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;QAC3D,KAAK,EAAE;YACL,aAAa,EAAE,QAAQ,CAAC,aAAa;SACtC;KACF,CAAC,CAAA;IACF,IAAI,WAAW,EAAE;QACf,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAA;KAC5D;IAED,IAAI,SAAS,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE9F,IAAI,eAAe,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,IAAI,CAAC;QACpE,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,WAAW,EAAE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,KAAI,IAAI;QAC1C,OAAO,EAAE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,KAAI,EAAE;QAChC,UAAU,EAAE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,KAAI,EAAE;QACtC,MAAM,EAAE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,KAAI,EAAE;QAC9B,MAAM,EAAE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,KAAI,IAAI;QAChC,aAAa,EAAE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,KAAI,IAAI;QAC9C,OAAO;QACP,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,SAAS;KACnB,CAAC,CAAA;IAEF,MAAM,IAAA,6CAAsB,EAAC,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;IAE/D,IAAI,IAAI,GAAG;QACT,EAAE,EAAE,eAAe,CAAC,EAAE;QACtB,IAAI,EAAE,eAAe,CAAC,IAAI;KAC3B,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AApCD,wCAoCC"}
+{"version":3,"file":"create-bizplace.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/create-bizplace.ts"],"names":[],"mappings":"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"}

package/dist-server/routers/internal/apis/create-company.js

@@ -8,8 +8,10 @@ const utils_1 = require("@things-factory/utils");
 const company_initializer_1 = require("../../../controllers/company-initializer");
 const error_util_1 = require("../utils/error-util");
 async function createCompany(request, context, tx) {
-    const { name, description, brn, address, postalCode, countryCode, type, status, userId, refCompanyId } = request.data;
-    let foundUser = await tx.getRepository(auth_base_1.User).findOne({ where: { id: userId }, relations: ['domains', 'roles'] });
+    const { name, description, brn, address, postalCode, countryCode, type, status, userEmail, refCompanyId } = request.data;
+    let foundUser = await tx
+        .getRepository(auth_base_1.User)
+        .findOne({ where: { email: userEmail }, relations: ['domains', 'roles'] });
     const subdomain = (0, utils_1.slugger)(name);
     //check for existing company
     const oldCompany = await tx.getRepository(biz_base_1.Company).findOne({
@@ -33,6 +35,7 @@ async function createCompany(request, context, tx) {
         subdomain,
         name,
         extType: 'company',
+        owner: foundUser.id,
         creator: foundUser,
         updater: foundUser
     });
@@ -61,6 +64,7 @@ async function createCompany(request, context, tx) {
         address: company.address,
         postalCode: company.postalCode || '',
         latlng: '',
+        refBizplaceId: refCompanyId || null,
         domain,
         company
     });

package/dist-server/routers/internal/apis/create-company.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-company.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/create-company.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AACtD,uDAA4D;AAC5D,iDAA8C;AAC9C,iDAA+C;AAE/C,kFAAgF;AAChF,oDAA8C;AAEvC,KAAK,UAAU,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACtD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAErH,IAAI,SAAS,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;IAEtH,MAAM,SAAS,GAAG,IAAA,eAAO,EAAC,IAAI,CAAC,CAAA;IAE/B,4BAA4B;IAC5B,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,OAAO,CAAC;QACzD,KAAK,EAAE;YACL,YAAY;SACb;KACF,CAAC,CAAA;IAEF,IAAI,UAAU,EAAE;QACd,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,IAAI,gBAAgB,CAAC,CAAA;KACnD;IAED,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,cAAM,CAAC,CAAC,OAAO,CAAC;QACvD,KAAK,EAAE;YACL,SAAS;SACV;KACF,CAAC,CAAA;IAEF,IAAI,SAAS,EAAE;QACb,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,SAAS,gBAAgB,CAAC,CAAA;KACxD;IAED,iBAAiB;IACjB,MAAM,MAAM,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,cAAM,CAAC,CAAC,IAAI,CAAC;QACzD,SAAS;QACT,IAAI;QACJ,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,SAAS;KACnB,CAAC,CAAA;IAEF,MAAM,OAAO,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,IAAI,CAAC;QAC5D,IAAI;QACJ,WAAW;QACX,GAAG;QACH,OAAO;QACP,UAAU;QACV,WAAW,EAAE,WAAW,IAAI,IAAI;QAChC,IAAI;QACJ,MAAM;QACN,MAAM;QACN,YAAY,EAAE,YAAY,IAAI,IAAI;QAClC,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,SAAS;KACnB,CAAC,CAAA;IAEF,MAAM,eAAe,GAAW,SAAS,CAAC,KAAK,CAAA;IAC/C,MAAM,WAAW,GAAW,MAAM,IAAA,2CAAqB,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEnE,SAAS,CAAC,OAAO,GAAG,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAClD,SAAS,CAAC,KAAK,GAAG,CAAC,GAAG,eAAe,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC,CAAA;IAE1F,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC5C,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,IAAI,CAAC;QACpC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,EAAE;QACpC,MAAM,EAAE,EAAE;QACV,MAAM;QACN,OAAO;KACR,CAAC,CAAA;IAEF,IAAI,IAAI,GAAG;QACT,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA3ED,sCA2EC"}
+{"version":3,"file":"create-company.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/create-company.ts"],"names":[],"mappings":"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"}

package/dist-server/routers/internal/apis/create-partner.js

@@ -5,26 +5,26 @@ const auth_base_1 = require("@things-factory/auth-base");
 const biz_base_1 = require("@things-factory/biz-base");
 const error_util_1 = require("../utils/error-util");
 async function createPartner(request, context, tx) {
-    const { bizplaceId, partnerBizplaceId, requesterId } = request.data;
+    const { refBizplaceId, partnerRefBizplaceId, userEmail } = request.data;
     const bizplace = await tx
         .getRepository(biz_base_1.Bizplace)
-        .findOne({ where: { id: bizplaceId }, relations: ['domain'] });
+        .findOne({ where: { refBizplaceId }, relations: ['domain'] });
     if (!bizplace) {
-        throw new error_util_1.ApiError('E04', `${bizplaceId} does not exist`);
+        throw new error_util_1.ApiError('E04', `${refBizplaceId} does not exist`);
     }
     const partnerBizplace = await tx
         .getRepository(biz_base_1.Bizplace)
-        .findOne({ where: { id: partnerBizplaceId }, relations: ['domain'] });
+        .findOne({ where: { refBizplaceId: partnerRefBizplaceId }, relations: ['domain'] });
     if (!partnerBizplace) {
-        throw new error_util_1.ApiError('E04', `${partnerBizplaceId} does not exist`);
+        throw new error_util_1.ApiError('E04', `${partnerRefBizplaceId} does not exist`);
     }
     const isExistingCustomer = Boolean(await tx.getRepository(auth_base_1.Partner).count({
         where: { domain: bizplace.domain, partnerDomain: partnerBizplace.domain }
     }));
     if (isExistingCustomer) {
-        throw new error_util_1.ApiError('E04', `${partnerBizplaceId} already registered as partner`);
+        throw new error_util_1.ApiError('E04', `${partnerRefBizplaceId} already registered as partner`);
     }
-    let user = await tx.getRepository(auth_base_1.User).findOne({ where: { id: requesterId } });
+    let user = await tx.getRepository(auth_base_1.User).findOne({ where: { email: userEmail } });
     await tx.getRepository(auth_base_1.Partner).save({
         domain: bizplace.domain,
         partnerDomain: partnerBizplace.domain,
@@ -32,8 +32,8 @@ async function createPartner(request, context, tx) {
         approver: user || null
     });
     let data = {
-        bizplaceId,
-        partnerBizplaceId
+        refBizplaceId,
+        partnerRefBizplaceId
     };
     return data;
 }

package/dist-server/routers/internal/apis/create-partner.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-partner.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/create-partner.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,uDAAmD;AAEnD,oDAA8C;AAEvC,KAAK,UAAU,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACtD,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAEnE,MAAM,QAAQ,GAAa,MAAM,EAAE;SAChC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAEhE,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,UAAU,iBAAiB,CAAC,CAAA;KAC1D;IAED,MAAM,eAAe,GAAa,MAAM,EAAE;SACvC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAEvE,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,iBAAiB,iBAAiB,CAAC,CAAA;KACjE;IAED,MAAM,kBAAkB,GAAY,OAAO,CACzC,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAO,CAAC,CAAC,KAAK,CAAC;QACpC,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,eAAe,CAAC,MAAM,EAAE;KAC1E,CAAC,CACH,CAAA;IAED,IAAI,kBAAkB,EAAE;QACtB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,iBAAiB,gCAAgC,CAAC,CAAA;KAChF;IAED,IAAI,IAAI,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,CAAC,CAAA;IAErF,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAO,CAAC,CAAC,IAAI,CAAC;QACnC,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,aAAa,EAAE,eAAe,CAAC,MAAM;QACrC,SAAS,EAAE,IAAI,IAAI,IAAI;QACvB,QAAQ,EAAE,IAAI,IAAI,IAAI;KACvB,CAAC,CAAA;IAEF,IAAI,IAAI,GAAG;QACT,UAAU;QACV,iBAAiB;KAClB,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA5CD,sCA4CC"}
+{"version":3,"file":"create-partner.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/create-partner.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,uDAAmD;AAEnD,oDAA8C;AAEvC,KAAK,UAAU,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACtD,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAEvE,MAAM,QAAQ,GAAa,MAAM,EAAE;SAChC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAE/D,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,aAAa,iBAAiB,CAAC,CAAA;KAC7D;IAED,MAAM,eAAe,GAAa,MAAM,EAAE;SACvC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,oBAAoB,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAErF,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,oBAAoB,iBAAiB,CAAC,CAAA;KACpE;IAED,MAAM,kBAAkB,GAAY,OAAO,CACzC,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAO,CAAC,CAAC,KAAK,CAAC;QACpC,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,eAAe,CAAC,MAAM,EAAE;KAC1E,CAAC,CACH,CAAA;IAED,IAAI,kBAAkB,EAAE;QACtB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,oBAAoB,gCAAgC,CAAC,CAAA;KACnF;IAED,IAAI,IAAI,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;IAEtF,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAO,CAAC,CAAC,IAAI,CAAC;QACnC,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,aAAa,EAAE,eAAe,CAAC,MAAM;QACrC,SAAS,EAAE,IAAI,IAAI,IAAI;QACvB,QAAQ,EAAE,IAAI,IAAI,IAAI;KACvB,CAAC,CAAA;IAEF,IAAI,IAAI,GAAG;QACT,aAAa;QACb,oBAAoB;KACrB,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA5CD,sCA4CC"}

package/dist-server/routers/internal/apis/create-user.js

@@ -7,12 +7,12 @@ async function createUser(request, context, tx) {
     let user = (request === null || request === void 0 ? void 0 : request.data) || {};
     const { email } = user;
     user.email = email.trim();
-    const oldUser = await tx.getRepository(auth_base_1.User).findOne({ where: { refUserId: user.refUserId } });
+    const oldUser = await tx.getRepository(auth_base_1.User).findOne({ where: { email: user.email } });
     if (oldUser) {
         throw new error_util_1.ApiError('E04', context.t('error.x already exists in y', { x: context.t('field.user'), y: 'operato' }));
     }
     const salt = auth_base_1.User.generateSalt();
-    let createdUser = await tx.getRepository(auth_base_1.User).save(Object.assign(Object.assign({}, user), { refUserId: user === null || user === void 0 ? void 0 : user.refUserId, userType: (user === null || user === void 0 ? void 0 : user.userType) || 'user', status: (user === null || user === void 0 ? void 0 : user.status) || 'inactive', salt: (user === null || user === void 0 ? void 0 : user.salt) || salt, passwordUpdatedAt: new Date(), password: (user === null || user === void 0 ? void 0 : user.password) || auth_base_1.User.encode(user.password, salt) }));
+    let createdUser = await tx.getRepository(auth_base_1.User).save(Object.assign(Object.assign({}, user), { refUserId: user === null || user === void 0 ? void 0 : user.refUserId, userType: (user === null || user === void 0 ? void 0 : user.userType) || 'user', status: (user === null || user === void 0 ? void 0 : user.status) || 'inactive', salt: (user === null || user === void 0 ? void 0 : user.salt) || salt, passwordUpdatedAt: new Date(), password: (user === null || user === void 0 ? void 0 : user.password) && (user === null || user === void 0 ? void 0 : user.salt) ? user.password : auth_base_1.User.encode(user.password, salt) }));
     let data = {
         id: createdUser.id,
         email: createdUser.email

package/dist-server/routers/internal/apis/create-user.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/create-user.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AAEzD,oDAA8C;AAEvC,KAAK,UAAU,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACnD,IAAI,IAAI,GAAY,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,KAAI,EAAE,CAAA;IACvC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;IACtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IAEzB,MAAM,OAAO,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IACpG,IAAI,OAAO,EAAE;QACX,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,6BAA6B,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;KAClH;IAED,MAAM,IAAI,GAAG,gBAAI,CAAC,YAAY,EAAE,CAAA;IAEhC,IAAI,WAAW,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,IAAI,iCACpD,IAAI,KACP,SAAS,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,EAC1B,QAAQ,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,KAAI,MAAM,EAClC,MAAM,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,KAAI,UAAU,EAClC,IAAI,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,KAAI,IAAI,EACxB,iBAAiB,EAAE,IAAI,IAAI,EAAE,EAC7B,QAAQ,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,KAAI,gBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAC5D,CAAA;IAEF,IAAI,IAAI,GAAG;QACT,EAAE,EAAE,WAAW,CAAC,EAAE;QAClB,KAAK,EAAE,WAAW,CAAC,KAAK;KACzB,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA5BD,gCA4BC"}
+{"version":3,"file":"create-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/create-user.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AAEzD,oDAA8C;AAEvC,KAAK,UAAU,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACnD,IAAI,IAAI,GAAY,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,KAAI,EAAE,CAAA;IACvC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;IACtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IAEzB,MAAM,OAAO,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC5F,IAAI,OAAO,EAAE;QACX,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,6BAA6B,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;KAClH;IAED,MAAM,IAAI,GAAG,gBAAI,CAAC,YAAY,EAAE,CAAA;IAEhC,IAAI,WAAW,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,IAAI,iCACpD,IAAI,KACP,SAAS,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,EAC1B,QAAQ,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,KAAI,MAAM,EAClC,MAAM,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,KAAI,UAAU,EAClC,IAAI,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,KAAI,IAAI,EACxB,iBAAiB,EAAE,IAAI,IAAI,EAAE,EAC7B,QAAQ,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,MAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAA,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IACzF,CAAA;IAEF,IAAI,IAAI,GAAG;QACT,EAAE,EAAE,WAAW,CAAC,EAAE;QAClB,KAAK,EAAE,WAAW,CAAC,KAAK;KACzB,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA5BD,gCA4BC"}

package/dist-server/routers/internal/apis/invite-user.js

@@ -5,16 +5,16 @@ const auth_base_1 = require("@things-factory/auth-base");
 const biz_base_1 = require("@things-factory/biz-base");
 const error_util_1 = require("../utils/error-util");
 async function inviteUser(request, context, tx) {
-    const { userId, bizplaceId } = request.data;
-    const user = await tx.getRepository(auth_base_1.User).findOne({ where: { id: userId }, relations: ['domains'] });
+    const { userEmail, refBizplaceId } = request.data;
+    const user = await tx.getRepository(auth_base_1.User).findOne({ where: { email: userEmail }, relations: ['domains'] });
     if (!user) {
-        throw new error_util_1.ApiError('E04', `${userId} does not exist`);
+        throw new error_util_1.ApiError('E04', `${userEmail} does not exist`);
     }
     const bizplace = await tx
         .getRepository(biz_base_1.Bizplace)
-        .findOne({ where: { id: bizplaceId }, relations: ['domain'] });
+        .findOne({ where: { refBizplaceId }, relations: ['domain'] });
     if (!bizplace) {
-        throw new error_util_1.ApiError('E04', `${bizplaceId} does not exist`);
+        throw new error_util_1.ApiError('E04', `${refBizplaceId} does not exist`);
     }
     const existingDomains = user.domains;
     if (existingDomains.find((d) => d.id === bizplace.domain.id)) {
@@ -23,8 +23,8 @@ async function inviteUser(request, context, tx) {
     user.domains = [...existingDomains, bizplace.domain];
     await tx.getRepository(auth_base_1.User).save(user);
     let data = {
-        bizplaceId,
-        userId
+        refBizplaceId,
+        userEmail
     };
     return data;
 }

package/dist-server/routers/internal/apis/invite-user.js.map

@@ -1 +1 @@
-{"version":3,"file":"invite-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/invite-user.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAChD,uDAAmD;AAGnD,oDAA8C;AAEvC,KAAK,UAAU,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACnD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAE3C,MAAM,IAAI,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAE1G,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,MAAM,iBAAiB,CAAC,CAAA;KACtD;IAED,MAAM,QAAQ,GAAa,MAAM,EAAE;SAChC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAEhE,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,UAAU,iBAAiB,CAAC,CAAA;KAC1D;IAED,MAAM,eAAe,GAAa,IAAI,CAAC,OAAO,CAAA;IAC9C,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QACpE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,0BAA0B,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;KACrE;IAED,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;IACpD,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvC,IAAI,IAAI,GAAG;QACT,UAAU;QACV,MAAM;KACP,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA/BD,gCA+BC"}
+{"version":3,"file":"invite-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/invite-user.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAChD,uDAAmD;AAGnD,oDAA8C;AAEvC,KAAK,UAAU,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACnD,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAEjD,MAAM,IAAI,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAEhH,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,SAAS,iBAAiB,CAAC,CAAA;KACzD;IAED,MAAM,QAAQ,GAAa,MAAM,EAAE;SAChC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAE/D,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,aAAa,iBAAiB,CAAC,CAAA;KAC7D;IAED,MAAM,eAAe,GAAa,IAAI,CAAC,OAAO,CAAA;IAC9C,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QACpE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,0BAA0B,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;KACrE;IAED,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;IACpD,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvC,IAAI,IAAI,GAAG;QACT,aAAa;QACb,SAAS;KACV,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA/BD,gCA+BC"}

package/dist-server/routers/internal/apis/terminate-partner.js

@@ -5,18 +5,18 @@ const auth_base_1 = require("@things-factory/auth-base");
 const biz_base_1 = require("@things-factory/biz-base");
 const error_util_1 = require("../utils/error-util");
 async function terminatePartner(request, context, tx) {
-    const { bizplaceId, partnerBizplaceId } = request.data;
+    const { refBizplaceId, partnerRefBizplaceId } = request.data;
     const bizplace = await tx
         .getRepository(biz_base_1.Bizplace)
-        .findOne({ where: { id: bizplaceId }, relations: ['domain'] });
+        .findOne({ where: { refBizplaceId }, relations: ['domain'] });
     if (!bizplace) {
-        throw new error_util_1.ApiError('E04', `${bizplaceId} does not exist`);
+        throw new error_util_1.ApiError('E04', `${refBizplaceId} does not exist`);
     }
     const partnerBizplace = await tx
         .getRepository(biz_base_1.Bizplace)
-        .findOne({ where: { id: partnerBizplaceId }, relations: ['domain'] });
+        .findOne({ where: { refBizplaceId: partnerRefBizplaceId }, relations: ['domain'] });
     if (!partnerBizplace) {
-        throw new error_util_1.ApiError('E04', `${partnerBizplaceId} does not exist`);
+        throw new error_util_1.ApiError('E04', `${partnerRefBizplaceId} does not exist`);
     }
     const partner = await tx.getRepository(auth_base_1.Partner).findOne({
         where: { domain: bizplace.domain, partnerDomain: partnerBizplace.domain }
@@ -29,8 +29,8 @@ async function terminatePartner(request, context, tx) {
     // Remove granted roles
     await (0, auth_base_1.terminateGrantedRoles)(bizplace.domain, partnerBizplace.domain, tx);
     let data = {
-        bizplaceId,
-        partnerBizplaceId
+        refBizplaceId,
+        partnerRefBizplaceId
     };
     return data;
 }

package/dist-server/routers/internal/apis/terminate-partner.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminate-partner.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/terminate-partner.ts"],"names":[],"mappings":";;;AAAA,yDAA0E;AAC1E,uDAAmD;AAEnD,oDAA8C;AAEvC,KAAK,UAAU,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACzD,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAEtD,MAAM,QAAQ,GAAa,MAAM,EAAE;SAChC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAEhE,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,UAAU,iBAAiB,CAAC,CAAA;KAC1D;IAED,MAAM,eAAe,GAAa,MAAM,EAAE;SACvC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAEvE,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,iBAAiB,iBAAiB,CAAC,CAAA;KACjE;IAED,MAAM,OAAO,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAO,CAAC,CAAC,OAAO,CAAC;QAC/D,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,eAAe,CAAC,MAAM,EAAE;KAC1E,CAAC,CAAA;IAEF,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAA;KACpD;IAED,iBAAiB;IACjB,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAElD,uBAAuB;IACvB,MAAM,IAAA,iCAAqB,EAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAExE,IAAI,IAAI,GAAG;QACT,UAAU;QACV,iBAAiB;KAClB,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAvCD,4CAuCC"}
+{"version":3,"file":"terminate-partner.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/terminate-partner.ts"],"names":[],"mappings":";;;AAAA,yDAA0E;AAC1E,uDAAmD;AAEnD,oDAA8C;AAEvC,KAAK,UAAU,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACzD,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAE5D,MAAM,QAAQ,GAAa,MAAM,EAAE;SAChC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAE/D,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,aAAa,iBAAiB,CAAC,CAAA;KAC7D;IAED,MAAM,eAAe,GAAa,MAAM,EAAE;SACvC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,oBAAoB,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAErF,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,oBAAoB,iBAAiB,CAAC,CAAA;KACpE;IAED,MAAM,OAAO,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAO,CAAC,CAAC,OAAO,CAAC;QAC/D,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,eAAe,CAAC,MAAM,EAAE;KAC1E,CAAC,CAAA;IAEF,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAA;KACpD;IAED,iBAAiB;IACjB,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAElD,uBAAuB;IACvB,MAAM,IAAA,iCAAqB,EAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAExE,IAAI,IAAI,GAAG;QACT,aAAa;QACb,oBAAoB;KACrB,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAvCD,4CAuCC"}

package/dist-server/routers/internal/apis/terminate-user.js

@@ -5,18 +5,18 @@ const auth_base_1 = require("@things-factory/auth-base");
 const biz_base_1 = require("@things-factory/biz-base");
 const error_util_1 = require("../utils/error-util");
 async function terminateUser(request, context, tx) {
-    const { userId, bizplaceId } = request.data;
+    const { userEmail, refBizplaceId } = request.data;
     const user = await tx
         .getRepository(auth_base_1.User)
-        .findOne({ where: { id: userId }, relations: ['domains', 'roles', 'roles.domain'] });
+        .findOne({ where: { email: userEmail }, relations: ['domains', 'roles', 'roles.domain'] });
     if (!user) {
-        throw new error_util_1.ApiError('E04', `${userId} does not exist`);
+        throw new error_util_1.ApiError('E04', `${userEmail} does not exist`);
     }
     const bizplace = await tx
         .getRepository(biz_base_1.Bizplace)
-        .findOne({ where: { id: bizplaceId }, relations: ['domain'] });
+        .findOne({ where: { refBizplaceId }, relations: ['domain'] });
     if (!bizplace) {
-        throw new error_util_1.ApiError('E04', `${bizplaceId} does not exist`);
+        throw new error_util_1.ApiError('E04', `${refBizplaceId} does not exist`);
     }
     const targetDomainIdx = user.domains.findIndex((userDomain) => userDomain.id === bizplace.domain.id);
     if (targetDomainIdx < 0) {
@@ -28,8 +28,8 @@ async function terminateUser(request, context, tx) {
     user.roles = user.roles.filter((role) => role.domain.id !== bizplace.domain.id);
     await tx.getRepository(auth_base_1.User).save(user);
     let data = {
-        bizplaceId,
-        userId
+        refBizplaceId,
+        userEmail
     };
     return data;
 }

package/dist-server/routers/internal/apis/terminate-user.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminate-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/terminate-user.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AACtD,uDAAmD;AAGnD,oDAA8C;AAEvC,KAAK,UAAU,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACtD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAE3C,MAAM,IAAI,GAAS,MAAM,EAAE;SACxB,aAAa,CAAC,gBAAI,CAAC;SACnB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,CAAC,CAAA;IAEtF,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,MAAM,iBAAiB,CAAC,CAAA;KACtD;IAED,MAAM,QAAQ,GAAa,MAAM,EAAE;SAChC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAEhE,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,UAAU,iBAAiB,CAAC,CAAA;KAC1D;IAED,MAAM,eAAe,GAAW,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,UAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACpH,IAAI,eAAe,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,uBAAuB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;KAC9E;IAED,mCAAmC;IACnC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAA;IAEvC,sCAAsC;IACtC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAErF,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvC,IAAI,IAAI,GAAG;QACT,UAAU;QACV,MAAM;KACP,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAtCD,sCAsCC"}
+{"version":3,"file":"terminate-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/terminate-user.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AACtD,uDAAmD;AAGnD,oDAA8C;AAEvC,KAAK,UAAU,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACtD,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAEjD,MAAM,IAAI,GAAS,MAAM,EAAE;SACxB,aAAa,CAAC,gBAAI,CAAC;SACnB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,CAAC,CAAA;IAE5F,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,SAAS,iBAAiB,CAAC,CAAA;KACzD;IAED,MAAM,QAAQ,GAAa,MAAM,EAAE;SAChC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAE/D,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,aAAa,iBAAiB,CAAC,CAAA;KAC7D;IAED,MAAM,eAAe,GAAW,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,UAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACpH,IAAI,eAAe,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,uBAAuB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;KAC9E;IAED,mCAAmC;IACnC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAA;IAEvC,sCAAsC;IACtC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAErF,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvC,IAAI,IAAI,GAAG;QACT,aAAa;QACb,SAAS;KACV,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAtCD,sCAsCC"}

package/dist-server/routers/internal/apis/update-bizplace.js

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

package/dist-server/routers/internal/apis/update-bizplace.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-bizplace.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/update-bizplace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-bizplace.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/update-bizplace.ts"],"names":[],"mappings":"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"}