@things-factory/operato-hub 4.3.232 → 4.3.234

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

@@ -7,30 +7,27 @@ const shell_1 = require("@things-factory/shell");
 const utils_1 = require("@things-factory/utils");
 const error_util_1 = require("../utils/error-util");
 async function updateCompany(request, context, tx) {
-    const { id, name, description, brn, address, postalCode, countryCode, type, status, userId } = request.data;
-    let foundUser = await tx.getRepository(auth_base_1.User).findOne({ where: { id: userId }, relations: ['domains', 'roles'] });
+    const { refCompanyId, name, description, brn, address, postalCode, countryCode, type, status, userEmail } = 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 existingCompany = await tx.getRepository(biz_base_1.Company).findOne({
-        where: { id }
+        where: { refCompanyId }
     });
     if (!existingCompany) {
         throw new error_util_1.ApiError('E04', `${name} does not exist`);
     }
-    const existingDomain = await tx.getRepository(shell_1.Domain).findOne({
-        where: {
-            subdomain
-        },
-        relations: ['bizplace']
-    });
-    if (!existingDomain) {
-        throw new error_util_1.ApiError('E04', `${subdomain} does not exist`);
-    }
+    const existingBizplaces = await tx
+        .getRepository(biz_base_1.Bizplace)
+        .find({ where: { company: existingCompany }, relations: ['domain'] });
+    let companyBizplace = existingBizplaces.find(biz => biz.domain.extType == 'company');
+    let companyDomain = companyBizplace.domain;
     // update company
-    await tx.getRepository(shell_1.Domain).update({ id: existingDomain.id }, {
-        subdomain: name ? subdomain : existingDomain.subdomain,
-        name: name ? name : existingDomain.name,
-        updater: foundUser
+    await tx.getRepository(shell_1.Domain).update({ id: companyDomain.id }, {
+        subdomain: name ? subdomain : companyDomain.subdomain,
+        name: name ? name : companyDomain.name
     });
     await tx.getRepository(biz_base_1.Company).update({ id: existingCompany.id }, {
         name: name || existingCompany.name,
@@ -41,16 +38,16 @@ async function updateCompany(request, context, tx) {
         postalCode: postalCode || existingCompany.postalCode || '',
         updater: foundUser
     });
-    await tx.getRepository(biz_base_1.Bizplace).update({ id: existingDomain.bizplace.id }, {
-        name: name || existingDomain.bizplace.name,
-        description: description || existingDomain.bizplace.description,
-        address: address || existingDomain.bizplace.address,
-        postalCode: postalCode || existingDomain.bizplace.postalCode || '',
+    await tx.getRepository(biz_base_1.Bizplace).update({ id: companyBizplace.id }, {
+        name: name || companyBizplace.name,
+        description: description || companyBizplace.description,
+        address: address || companyBizplace.address,
+        postalCode: postalCode || companyBizplace.postalCode || '',
         latlng: '',
         updater: foundUser
     });
     const updatedCompany = await tx.getRepository(biz_base_1.Company).findOne({
-        where: { id }
+        where: { id: existingCompany.id }
     });
     let data = {
         id: updatedCompany.id,

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

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

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

@@ -5,7 +5,7 @@ const auth_base_1 = require("@things-factory/auth-base");
 const error_util_1 = require("../utils/error-util");
 async function updateUser(request, context, tx) {
     let user = (request === null || request === void 0 ? void 0 : request.data) || {};
-    const existingUser = await tx.getRepository(auth_base_1.User).findOne({ where: { id: user.id } });
+    const existingUser = await tx.getRepository(auth_base_1.User).findOne({ where: { email: user.email } });
     if (!existingUser) {
         throw new error_util_1.ApiError('E04', context.t('error.x does not exists in y', { x: context.t('field.user'), y: 'operato' }));
     }

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

@@ -1 +1 @@
-{"version":3,"file":"update-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/update-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;IAEvC,MAAM,YAAY,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAC3F,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,8BAA8B,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;KACnH;IAED,MAAM,IAAI,GAAG,gBAAI,CAAC,YAAY,EAAE,CAAA;IAEhC,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,MAAM,CACjC,EAAE,EAAE,EAAE,YAAY,CAAC,EAAE,EAAE,EACvB;QACE,IAAI,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,KAAI,YAAY,CAAC,IAAI;QACrC,MAAM,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,KAAI,YAAY,CAAC,MAAM;QAC3C,QAAQ,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,KAAI,YAAY,CAAC,QAAQ;QACjD,IAAI,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAC,CAAC,CAAC,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,EAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI;QAC1E,QAAQ,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ;YACtB,CAAC,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI;gBACV,CAAC,CAAC,IAAI,CAAC,QAAQ;gBACf,CAAC,CAAC,gBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;YACpC,CAAC,CAAC,YAAY,CAAC,QAAQ;QACzB,iBAAiB,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,iBAAiB;KAChF,CACF,CAAA;IAED,IAAI,WAAW,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;IAE7E,IAAI,IAAI,GAAG;QACT,EAAE,EAAE,WAAW,CAAC,EAAE;QAClB,KAAK,EAAE,WAAW,CAAC,KAAK;KACzB,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAlCD,gCAkCC"}
+{"version":3,"file":"update-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/update-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;IAEvC,MAAM,YAAY,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACjG,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,8BAA8B,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;KACnH;IAED,MAAM,IAAI,GAAG,gBAAI,CAAC,YAAY,EAAE,CAAA;IAEhC,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,MAAM,CACjC,EAAE,EAAE,EAAE,YAAY,CAAC,EAAE,EAAE,EACvB;QACE,IAAI,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,KAAI,YAAY,CAAC,IAAI;QACrC,MAAM,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,KAAI,YAAY,CAAC,MAAM;QAC3C,QAAQ,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,KAAI,YAAY,CAAC,QAAQ;QACjD,IAAI,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAC,CAAC,CAAC,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,EAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI;QAC1E,QAAQ,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ;YACtB,CAAC,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI;gBACV,CAAC,CAAC,IAAI,CAAC,QAAQ;gBACf,CAAC,CAAC,gBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;YACpC,CAAC,CAAC,YAAY,CAAC,QAAQ;QACzB,iBAAiB,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,iBAAiB;KAChF,CACF,CAAA;IAED,IAAI,WAAW,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;IAE7E,IAAI,IAAI,GAAG;QACT,EAAE,EAAE,WAAW,CAAC,EAAE;QAClB,KAAK,EAAE,WAAW,CAAC,KAAK;KACzB,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAlCD,gCAkCC"}

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":"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"}
+{"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.234",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -55,43 +55,43 @@
     "@operato/scene-tab": "^0.1.8",
     "@operato/scene-table": "^0.1.8",
     "@operato/scene-wheel-sorter": "^0.1.8",
-    "@things-factory/api": "^4.3.227",
+    "@things-factory/api": "^4.3.234",
     "@things-factory/apptool-ui": "^4.3.227",
-    "@things-factory/attachment-base": "^4.3.227",
-    "@things-factory/auth-base": "^4.3.227",
-    "@things-factory/auth-ui": "^4.3.227",
-    "@things-factory/biz-base": "^4.3.227",
-    "@things-factory/biz-ui": "^4.3.227",
-    "@things-factory/board-service": "^4.3.227",
-    "@things-factory/board-ui": "^4.3.227",
-    "@things-factory/code-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/component-ui": "^4.3.227",
     "@things-factory/context-ui": "^4.3.227",
-    "@things-factory/document-template-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.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.227",
-    "@things-factory/integration-fulfillment": "^4.3.227",
-    "@things-factory/integration-lmd": "^4.3.227",
-    "@things-factory/integration-marketplace": "^4.3.227",
-    "@things-factory/integration-pos": "^4.3.227",
-    "@things-factory/integration-sellercraft": "^4.3.227",
-    "@things-factory/integration-sftp": "^4.3.227",
-    "@things-factory/lite-menu": "^4.3.227",
-    "@things-factory/marketplace-base": "^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.227",
+    "@things-factory/notification": "^4.3.234",
     "@things-factory/pdf": "^4.3.227",
-    "@things-factory/product-ui": "^4.3.227",
-    "@things-factory/resource-ui": "^4.3.227",
-    "@things-factory/sales-base": "^4.3.232",
+    "@things-factory/product-ui": "^4.3.234",
+    "@things-factory/resource-ui": "^4.3.234",
+    "@things-factory/sales-base": "^4.3.234",
     "@things-factory/scene-data-transform": "^4.3.227",
     "@things-factory/scene-excel": "^4.3.227",
     "@things-factory/scene-firebase": "^4.3.227",
@@ -103,11 +103,11 @@
     "@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.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.229",
-    "@things-factory/worksheet-base": "^4.3.232",
+    "@things-factory/warehouse-base": "^4.3.234",
+    "@things-factory/worksheet-base": "^4.3.234",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -119,5 +119,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "14c591b96b1519e7a118103205053185cf7a1305"
+  "gitHead": "f09a8d10fcf4cffc06abb9777ca60ee82b00ce33"
 }

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)
 
@@ -39,6 +42,7 @@ export async function createCompany(request, context, tx) {
     subdomain,
     name,
     extType: 'company',
+    owner: foundUser.id,
     creator: foundUser,
     updater: foundUser
   })
@@ -71,6 +75,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