@things-factory/code-base 4.3.115-alpha.0 → 4.3.122

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -26,7 +26,7 @@ __decorate([
26
26
  __metadata("design:type", typeof (_a = typeof shell_1.Domain !== "undefined" && shell_1.Domain) === "function" ? _a : Object)
27
27
  ], CommonCodeDetail.prototype, "domain", void 0);
28
28
  __decorate([
29
- (0, typeorm_1.ManyToOne)(type => common_code_1.CommonCode, { onDelete: 'CASCADE' }),
29
+ (0, typeorm_1.ManyToOne)(type => common_code_1.CommonCode),
30
30
  __metadata("design:type", common_code_1.CommonCode)
31
31
  ], CommonCodeDetail.prototype, "commonCode", void 0);
32
32
  __decorate([
@@ -1 +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,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"}
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"}
@@ -8,31 +8,24 @@ exports.updateMultipleCommonCodeResolver = {
8
8
  };
9
9
  async function updateMultipleCommonCode(_, { patches }, context) {
10
10
  let results = [];
11
- await (0, typeorm_1.getConnection)().transaction(async (tx) => {
12
- const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
13
- const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
14
- if (_createRecords.length > 0) {
15
- for (let i = 0; i < _createRecords.length; i++) {
16
- const newRecord = _createRecords[i];
17
- let cc = await tx.getRepository(entities_1.CommonCode).findOne({
18
- where: { name: newRecord.name, domain: context.state.domain }
19
- });
20
- if (cc) {
21
- throw new Error(`${cc.name} already exists`);
22
- }
23
- const result = await tx.getRepository(entities_1.CommonCode).save(Object.assign({ domain: context.state.domain, creator: context.state.user, updater: context.state.user }, newRecord));
24
- results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
25
- }
11
+ const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
12
+ const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
13
+ const commonCodeRepo = (0, typeorm_1.getRepository)(entities_1.CommonCode);
14
+ if (_createRecords.length > 0) {
15
+ for (let i = 0; i < _createRecords.length; i++) {
16
+ const newRecord = _createRecords[i];
17
+ const result = await commonCodeRepo.save(Object.assign({ domain: context.state.domain, creator: context.state.user, updater: context.state.user }, newRecord));
18
+ results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
26
19
  }
27
- if (_updateRecords.length > 0) {
28
- for (let i = 0; i < _updateRecords.length; i++) {
29
- const newRecord = _updateRecords[i];
30
- const commonCode = await tx.getRepository(entities_1.CommonCode).findOne(newRecord.id);
31
- const result = await tx.getRepository(entities_1.CommonCode).save(Object.assign(Object.assign(Object.assign({}, commonCode), newRecord), { updater: context.state.user }));
32
- results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
33
- }
20
+ }
21
+ if (_updateRecords.length > 0) {
22
+ for (let i = 0; i < _updateRecords.length; i++) {
23
+ const newRecord = _updateRecords[i];
24
+ const commonCode = await commonCodeRepo.findOne(newRecord.id);
25
+ const result = await commonCodeRepo.save(Object.assign(Object.assign(Object.assign({}, commonCode), newRecord), { updater: context.state.user }));
26
+ results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
34
27
  }
35
- });
28
+ }
36
29
  return results;
37
30
  }
38
31
  exports.updateMultipleCommonCode = updateMultipleCommonCode;
@@ -1 +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,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"}
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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/code-base",
3
- "version": "4.3.115-alpha.0",
3
+ "version": "4.3.122",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -24,7 +24,7 @@
24
24
  "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
25
25
  },
26
26
  "dependencies": {
27
- "@things-factory/auth-base": "^4.3.115-alpha.0"
27
+ "@things-factory/auth-base": "^4.3.122"
28
28
  },
29
- "gitHead": "05580c4e3c0e4cd2f0e800533b1bed2b87cd42ac"
29
+ "gitHead": "3edd80e6ca68480b22ee0e25eba34d13ab0e49f1"
30
30
  }
@@ -21,7 +21,7 @@ export class CommonCodeDetail {
21
21
  @ManyToOne(type => Domain)
22
22
  domain: Domain
23
23
 
24
- @ManyToOne(type => CommonCode, { onDelete: 'CASCADE' })
24
+ @ManyToOne(type => CommonCode)
25
25
  commonCode: CommonCode
26
26
 
27
27
  @Column()
@@ -1,4 +1,4 @@
1
- import { getRepository, EntityManager, getConnection } from 'typeorm'
1
+ import { getRepository } from 'typeorm'
2
2
  import { CommonCode } from '../../../entities'
3
3
 
4
4
  export const updateMultipleCommonCodeResolver = {
@@ -7,46 +7,39 @@ export const updateMultipleCommonCodeResolver = {
7
7
 
8
8
  export async function updateMultipleCommonCode(_: any, { patches }, context: any): Promise<CommonCode[]> {
9
9
  let results = []
10
- await getConnection().transaction(async (tx: EntityManager) => {
11
- const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
12
- const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
13
-
14
- if (_createRecords.length > 0) {
15
- for (let i = 0; i < _createRecords.length; i++) {
16
- const newRecord = _createRecords[i]
17
-
18
- let cc: CommonCode = await tx.getRepository(CommonCode).findOne({
19
- where: { name: newRecord.name, domain: context.state.domain }
20
- })
21
- if (cc) {
22
- throw new Error(`${cc.name} already exists`)
23
- }
24
-
25
- const result = await tx.getRepository(CommonCode).save({
26
- domain: context.state.domain,
27
- creator: context.state.user,
28
- updater: context.state.user,
29
- ...newRecord
30
- })
31
-
32
- results.push({ ...result, cuFlag: '+' })
33
- }
10
+ const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
11
+ const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
12
+ const commonCodeRepo = getRepository(CommonCode)
13
+
14
+ if (_createRecords.length > 0) {
15
+ for (let i = 0; i < _createRecords.length; i++) {
16
+ const newRecord = _createRecords[i]
17
+
18
+ const result = await commonCodeRepo.save({
19
+ domain: context.state.domain,
20
+ creator: context.state.user,
21
+ updater: context.state.user,
22
+ ...newRecord
23
+ })
24
+
25
+ results.push({ ...result, cuFlag: '+' })
34
26
  }
27
+ }
35
28
 
36
- if (_updateRecords.length > 0) {
37
- for (let i = 0; i < _updateRecords.length; i++) {
38
- const newRecord = _updateRecords[i]
39
- const commonCode = await tx.getRepository(CommonCode).findOne(newRecord.id)
29
+ if (_updateRecords.length > 0) {
30
+ for (let i = 0; i < _updateRecords.length; i++) {
31
+ const newRecord = _updateRecords[i]
32
+ const commonCode = await commonCodeRepo.findOne(newRecord.id)
40
33
 
41
- const result = await tx.getRepository(CommonCode).save({
42
- ...commonCode,
43
- ...newRecord,
44
- updater: context.state.user
45
- })
34
+ const result = await commonCodeRepo.save({
35
+ ...commonCode,
36
+ ...newRecord,
37
+ updater: context.state.user
38
+ })
46
39
 
47
- results.push({ ...result, cuFlag: 'M' })
48
- }
40
+ results.push({ ...result, cuFlag: 'M' })
49
41
  }
50
- })
42
+ }
43
+
51
44
  return results
52
45
  }