@things-factory/code-base 4.3.122 → 4.3.138

package/dist-server/entities/common-code-detail.js

@@ -26,7 +26,7 @@ __decorate([
     __metadata("design:type", typeof (_a = typeof shell_1.Domain !== "undefined" && shell_1.Domain) === "function" ? _a : Object)
 ], CommonCodeDetail.prototype, "domain", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(type => common_code_1.CommonCode),
+    (0, typeorm_1.ManyToOne)(type => common_code_1.CommonCode, { onDelete: 'CASCADE' }),
     __metadata("design:type", common_code_1.CommonCode)
 ], CommonCodeDetail.prototype, "commonCode", void 0);
 __decorate([

package/dist-server/entities/common-code-detail.js.map

@@ -1 +1 @@
-{"version":3,"file":"common-code-detail.js","sourceRoot":"","sources":["../../server/entities/common-code-detail.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,iDAA8C;AAC9C,qCAAsH;AACtH,+CAA0C;AAanC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAkC5B,CAAA;AAjCC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;4CACrB;AAEV;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;gDAAA;AAEd;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAU,CAAC;8BAClB,wBAAU;oDAAA;AAEtB;IAAC,IAAA,gBAAM,GAAE;;8CACG;AAEZ;IAAC,IAAA,gBAAM,GAAE;;qDACU;AAEnB;IAAC,IAAA,gBAAM,GAAE;;8CACG;AAEZ;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAEb;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAjCJ,gBAAgB;IAX5B,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,yBAAyB,EACzB,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC5F,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;IACA,IAAA,eAAK,EACJ,yBAAyB,EACzB,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC5F,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,gBAAgB,CAkC5B;AAlCY,4CAAgB"}
+{"version":3,"file":"common-code-detail.js","sourceRoot":"","sources":["../../server/entities/common-code-detail.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,iDAA8C;AAC9C,qCAAsH;AACtH,+CAA0C;AAanC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAkC5B,CAAA;AAjCC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;4CACrB;AAEV;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;gDAAA;AAEd;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAU,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BAC3C,wBAAU;oDAAA;AAEtB;IAAC,IAAA,gBAAM,GAAE;;8CACG;AAEZ;IAAC,IAAA,gBAAM,GAAE;;qDACU;AAEnB;IAAC,IAAA,gBAAM,GAAE;;8CACG;AAEZ;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAEb;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAjCJ,gBAAgB;IAX5B,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,yBAAyB,EACzB,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC5F,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;IACA,IAAA,eAAK,EACJ,yBAAyB,EACzB,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAC5F,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,gBAAgB,CAkC5B;AAlCY,4CAAgB"}

package/dist-server/graphql/resolvers/common-code/update-multiple-common-code.js

@@ -8,24 +8,31 @@ exports.updateMultipleCommonCodeResolver = {
 };
 async function updateMultipleCommonCode(_, { patches }, context) {
     let results = [];
-    const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
-    const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
-    const commonCodeRepo = (0, typeorm_1.getRepository)(entities_1.CommonCode);
-    if (_createRecords.length > 0) {
-        for (let i = 0; i < _createRecords.length; i++) {
-            const newRecord = _createRecords[i];
-            const result = await commonCodeRepo.save(Object.assign({ domain: context.state.domain, creator: context.state.user, updater: context.state.user }, newRecord));
-            results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
+    await (0, typeorm_1.getConnection)().transaction(async (tx) => {
+        const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
+        const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
+        if (_createRecords.length > 0) {
+            for (let i = 0; i < _createRecords.length; i++) {
+                const newRecord = _createRecords[i];
+                let cc = await tx.getRepository(entities_1.CommonCode).findOne({
+                    where: { name: newRecord.name, domain: context.state.domain }
+                });
+                if (cc) {
+                    throw new Error(`${cc.name} already exists`);
+                }
+                const result = await tx.getRepository(entities_1.CommonCode).save(Object.assign({ domain: context.state.domain, creator: context.state.user, updater: context.state.user }, newRecord));
+                results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
+            }
         }
-    }
-    if (_updateRecords.length > 0) {
-        for (let i = 0; i < _updateRecords.length; i++) {
-            const newRecord = _updateRecords[i];
-            const commonCode = await commonCodeRepo.findOne(newRecord.id);
-            const result = await commonCodeRepo.save(Object.assign(Object.assign(Object.assign({}, commonCode), newRecord), { updater: context.state.user }));
-            results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
+        if (_updateRecords.length > 0) {
+            for (let i = 0; i < _updateRecords.length; i++) {
+                const newRecord = _updateRecords[i];
+                const commonCode = await tx.getRepository(entities_1.CommonCode).findOne(newRecord.id);
+                const result = await tx.getRepository(entities_1.CommonCode).save(Object.assign(Object.assign(Object.assign({}, commonCode), newRecord), { updater: context.state.user }));
+                results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
+            }
         }
-    }
+    });
     return results;
 }
 exports.updateMultipleCommonCode = updateMultipleCommonCode;

package/dist-server/graphql/resolvers/common-code/update-multiple-common-code.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-multiple-common-code.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/common-code/update-multiple-common-code.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AACvC,gDAA8C;AAEjC,QAAA,gCAAgC,GAAG;IAC9C,wBAAwB;CACzB,CAAA;AAEM,KAAK,UAAU,wBAAwB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;IAC9E,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;IACzF,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;IACzF,MAAM,cAAc,GAAG,IAAA,uBAAa,EAAC,qBAAU,CAAC,CAAA;IAEhD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YAEnC,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,iBACtC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAC5B,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAC3B,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,IACxB,SAAS,EACZ,CAAA;YAEF,OAAO,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,EAAE,GAAG,IAAG,CAAA;SACzC;KACF;IAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YACnC,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;YAE7D,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,+CACnC,UAAU,GACV,SAAS,KACZ,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,IAC3B,CAAA;YAEF,OAAO,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,EAAE,GAAG,IAAG,CAAA;SACzC;KACF;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AArCD,4DAqCC"}
+{"version":3,"file":"update-multiple-common-code.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/common-code/update-multiple-common-code.ts"],"names":[],"mappings":";;;AAAA,qCAAqE;AACrE,gDAA8C;AAEjC,QAAA,gCAAgC,GAAG;IAC9C,wBAAwB;CACzB,CAAA;AAEM,KAAK,UAAU,wBAAwB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;IAC9E,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAiB,EAAE,EAAE;QAC5D,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;QACzF,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;QAEzF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;gBAEnC,IAAI,EAAE,GAAe,MAAM,EAAE,CAAC,aAAa,CAAC,qBAAU,CAAC,CAAC,OAAO,CAAC;oBAC9D,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE;iBAC9D,CAAC,CAAA;gBACF,IAAI,EAAE,EAAE;oBACN,MAAM,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,iBAAiB,CAAC,CAAA;iBAC7C;gBAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,qBAAU,CAAC,CAAC,IAAI,iBACpD,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAC5B,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAC3B,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,IACxB,SAAS,EACZ,CAAA;gBAEF,OAAO,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,EAAE,GAAG,IAAG,CAAA;aACzC;SACF;QAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;gBACnC,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,qBAAU,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;gBAE3E,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,qBAAU,CAAC,CAAC,IAAI,+CACjD,UAAU,GACV,SAAS,KACZ,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,IAC3B,CAAA;gBAEF,OAAO,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,EAAE,GAAG,IAAG,CAAA;aACzC;SACF;IACH,CAAC,CAAC,CAAA;IACF,OAAO,OAAO,CAAA;AAChB,CAAC;AA5CD,4DA4CC"}

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@things-factory/code-base",
-  "version": "4.3.122",
+  "version": "4.3.138",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
-  "license": "MIT",
   "author": "",
   "description": "Server-side module for handling common code management.",
   "publishConfig": {
@@ -24,7 +23,7 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^4.3.122"
+    "@things-factory/auth-base": "^4.3.138"
   },
-  "gitHead": "3edd80e6ca68480b22ee0e25eba34d13ab0e49f1"
+  "gitHead": "1d4e0a3ff6b8792c843b9735a28a3f5fb946b144"
 }

package/server/entities/common-code-detail.ts

@@ -21,7 +21,7 @@ export class CommonCodeDetail {
   @ManyToOne(type => Domain)
   domain: Domain
 
-  @ManyToOne(type => CommonCode)
+  @ManyToOne(type => CommonCode, { onDelete: 'CASCADE' })
   commonCode: CommonCode
 
   @Column()

package/server/graphql/resolvers/common-code/update-multiple-common-code.ts

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository, EntityManager, getConnection } from 'typeorm'
 import { CommonCode } from '../../../entities'
 
 export const updateMultipleCommonCodeResolver = {
@@ -7,39 +7,46 @@ export const updateMultipleCommonCodeResolver = {
 
 export async function updateMultipleCommonCode(_: any, { patches }, context: any): Promise<CommonCode[]> {
   let results = []
-  const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
-  const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
-  const commonCodeRepo = getRepository(CommonCode)
-
-  if (_createRecords.length > 0) {
-    for (let i = 0; i < _createRecords.length; i++) {
-      const newRecord = _createRecords[i]
-
-      const result = await commonCodeRepo.save({
-        domain: context.state.domain,
-        creator: context.state.user,
-        updater: context.state.user,
-        ...newRecord
-      })
-
-      results.push({ ...result, cuFlag: '+' })
+  await getConnection().transaction(async (tx: EntityManager) => {
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
+
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
+
+        let cc: CommonCode = await tx.getRepository(CommonCode).findOne({
+          where: { name: newRecord.name, domain: context.state.domain }
+        })
+        if (cc) {
+          throw new Error(`${cc.name} already exists`)
+        }
+
+        const result = await tx.getRepository(CommonCode).save({
+          domain: context.state.domain,
+          creator: context.state.user,
+          updater: context.state.user,
+          ...newRecord
+        })
+
+        results.push({ ...result, cuFlag: '+' })
+      }
     }
-  }
 
-  if (_updateRecords.length > 0) {
-    for (let i = 0; i < _updateRecords.length; i++) {
-      const newRecord = _updateRecords[i]
-      const commonCode = await commonCodeRepo.findOne(newRecord.id)
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const newRecord = _updateRecords[i]
+        const commonCode = await tx.getRepository(CommonCode).findOne(newRecord.id)
 
-      const result = await commonCodeRepo.save({
-        ...commonCode,
-        ...newRecord,
-        updater: context.state.user
-      })
+        const result = await tx.getRepository(CommonCode).save({
+          ...commonCode,
+          ...newRecord,
+          updater: context.state.user
+        })
 
-      results.push({ ...result, cuFlag: 'M' })
+        results.push({ ...result, cuFlag: 'M' })
+      }
     }
-  }
-
+  })
   return results
 }

package/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Hatiolab
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.