@enervance/insight-cim-model 1.0.22 → 1.0.24

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.
Files changed (9) hide show
  1. package/dist/database/core/EquipmentDao.js +16 -8
  2. package/dist/database/core/EquipmentDao.js.map +1 -1
  3. package/dist/database/core/FeederDao.d.ts +1 -0
  4. package/dist/database/core/FeederDao.js +24 -8
  5. package/dist/database/core/FeederDao.js.map +1 -1
  6. package/dist/database/core/PowerSystemResourceDao.d.ts +1 -0
  7. package/dist/database/core/PowerSystemResourceDao.js +21 -8
  8. package/dist/database/core/PowerSystemResourceDao.js.map +1 -1
  9. package/package.json +1 -1
package/dist/database/core/EquipmentDao.js CHANGED
@@ -6,16 +6,13 @@ class EquipmentDao extends PowerSystemResourceDao_1.PowerSystemResourceDao {
6
6
  buildEquipmentInsert() {
7
7
  return {
8
8
  sql: `
9
- insert into cim.equipment (
10
- mrid,
11
- equipment_container_mrid
12
- ) values (?, ?)
13
- on conflict (mrid) do update
14
- set equipment_container_mrid = excluded.equipment_container_mrid
9
+ insert into cim.equipment (
10
+ mrid
11
+ ) values (?)
12
+ on conflict (mrid) do nothing
15
13
  `,
16
14
  params: [
17
- this.cimObject.getUUID(),
18
- this.cimObject.equipmentContainer?.getUUID() ?? null
15
+ this.cimObject.getUUID()
19
16
  ]
20
17
  };
21
18
  }
@@ -28,6 +25,17 @@ class EquipmentDao extends PowerSystemResourceDao_1.PowerSystemResourceDao {
28
25
  toAssociationInsertStatements() {
29
26
  return [
30
27
  ...super.toAssociationInsertStatements(),
28
+ {
29
+ sql: `
30
+ update cim.equipment
31
+ set equipment_container_mrid = ?
32
+ where mrid = ?
33
+ `,
34
+ params: [
35
+ this.cimObject.equipmentContainer?.getUUID() ?? null,
36
+ this.cimObject.getUUID()
37
+ ]
38
+ },
31
39
  ...[...this.cimObject.additionalEquipmentContainer.values()].map((container) => ({
32
40
  sql: `
33
41
  insert into cim.equipment_additional_equipment_container (
package/dist/database/core/EquipmentDao.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EquipmentDao.js","sourceRoot":"","sources":["../../../src/database/core/EquipmentDao.ts"],"names":[],"mappings":";;;AACA,qEAAkE;AAGlE,MAAa,YAAkC,SAAQ,+CAAyB;IAEpE,oBAAoB;QAC5B,OAAO;YACL,GAAG,EAAE;;;;;;;OAOJ;YACD,MAAM,EAAE;gBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;gBACxB,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,OAAO,EAAE,IAAI,IAAI;aACrD;SACF,CAAC;IACJ,CAAC;IAEQ,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B,IAAI,CAAC,oBAAoB,EAAE;SAC5B,CAAC;IACJ,CAAC;IAEQ,6BAA6B;QACpC,OAAO;YACL,GAAG,KAAK,CAAC,6BAA6B,EAAE;YACxC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,4BAA4B,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBAC/E,GAAG,EAAE;;;;;;SAMJ;gBACD,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;aACxD,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;CACF;AAzCD,oCAyCC"}
1
+ {"version":3,"file":"EquipmentDao.js","sourceRoot":"","sources":["../../../src/database/core/EquipmentDao.ts"],"names":[],"mappings":";;;AACA,qEAAkE;AAGlE,MAAa,YAAkC,SAAQ,+CAAyB;IAEpE,oBAAoB;QAC5B,OAAO;YACL,GAAG,EAAE;;;;;OAKJ;YACD,MAAM,EAAE;gBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;aACzB;SACF,CAAC;IACJ,CAAC;IAEQ,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B,IAAI,CAAC,oBAAoB,EAAE;SAC5B,CAAC;IACJ,CAAC;IAEQ,6BAA6B;QACpC,OAAO;YACL,GAAG,KAAK,CAAC,6BAA6B,EAAE;YACxC;gBACE,GAAG,EAAE;;;;SAIJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,OAAO,EAAE,IAAI,IAAI;oBACpD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;iBACzB;aACF;YACD,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,4BAA4B,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBAC/E,GAAG,EAAE;;;;;;SAMJ;gBACD,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;aACxD,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;CACF;AAjDD,oCAiDC"}
package/dist/database/core/FeederDao.d.ts CHANGED
@@ -3,4 +3,5 @@ import { Feeder } from '../../model/core/Feeder.js';
3
3
  import { InsertStatement } from '../dao-sql-types.js';
4
4
  export declare class FeederDao<T extends Feeder> extends EquipmentContainerDao<Feeder> {
5
5
  toInsertStatements(): InsertStatement[];
6
+ toAssociationInsertStatements(): InsertStatement[];
6
7
  }
package/dist/database/core/FeederDao.js CHANGED
@@ -8,20 +8,36 @@ class FeederDao extends EquipmentContainerDao_1.EquipmentContainerDao {
8
8
  ...super.toInsertStatements(),
9
9
  {
10
10
  sql: `
11
- insert into cim.feeder (
12
- mrid,
13
- normal_energizing_substation_mrid
14
- ) values (?, ?)
15
- on conflict (mrid) do update
16
- set normal_energizing_substation_mrid = excluded.normal_energizing_substation_mrid
11
+ insert into cim.feeder (mrid)
12
+ values ($1)
13
+ on conflict (mrid) do nothing
17
14
  `,
18
15
  params: [
19
- this.cimObject.getUUID(),
20
- this.cimObject.normalEnergizingSubstation?.getUUID() ?? null
16
+ this.cimObject.getUUID()
21
17
  ]
22
18
  }
23
19
  ];
24
20
  }
21
+ toAssociationInsertStatements() {
22
+ return [
23
+ ...super.toAssociationInsertStatements(),
24
+ ...(this.cimObject.normalEnergizingSubstation
25
+ ? [
26
+ {
27
+ sql: `
28
+ update cim.feeder
29
+ set normal_energizing_substation_mrid = $2
30
+ where mrid = $1
31
+ `,
32
+ params: [
33
+ this.cimObject.getUUID(),
34
+ this.cimObject.normalEnergizingSubstation?.getUUID() ?? null
35
+ ]
36
+ }
37
+ ]
38
+ : [])
39
+ ];
40
+ }
25
41
  }
26
42
  exports.FeederDao = FeederDao;
27
43
  //# sourceMappingURL=FeederDao.js.map
package/dist/database/core/FeederDao.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FeederDao.js","sourceRoot":"","sources":["../../../src/database/core/FeederDao.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAIhE,MAAa,SAA4B,SAAQ,6CAA6B;IACnE,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B;gBACE,GAAG,EAAE;;;;;;;SAOJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;oBACxB,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE,OAAO,EAAE,IAAI,IAAI;iBAC7D;aACF;SACF,CAAC;IACJ,CAAC;CACF;AApBD,8BAoBC"}
1
+ {"version":3,"file":"FeederDao.js","sourceRoot":"","sources":["../../../src/database/core/FeederDao.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAIhE,MAAa,SAA4B,SAAQ,6CAA6B;IACnE,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B;gBACE,GAAG,EAAE;;;;SAIJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;iBACzB;aACF;SACF,CAAC;IACJ,CAAC;IAEQ,6BAA6B;QACpC,OAAO;YACL,GAAG,KAAK,CAAC,6BAA6B,EAAE;YAExC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,0BAA0B;gBAC3C,CAAC,CAAC;oBACA;wBACE,GAAG,EAAE;;;;aAIJ;wBACD,MAAM,EAAE;4BACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;4BACxB,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE,OAAO,EAAE,IAAI,IAAI;yBAC7D;qBACF;iBACF;gBACD,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;IACJ,CAAC;CACF;AAtCD,8BAsCC"}
package/dist/database/core/PowerSystemResourceDao.d.ts CHANGED
@@ -4,4 +4,5 @@ import { InsertStatement } from '../dao-sql-types.js';
4
4
  export declare class PowerSystemResourceDao<T extends PowerSystemResource> extends IdentifiedObjectDao<T> {
5
5
  protected buildPowerSystemResourceInsert(): InsertStatement;
6
6
  toInsertStatements(): InsertStatement[];
7
+ toAssociationInsertStatements(): InsertStatement[];
7
8
  }
package/dist/database/core/PowerSystemResourceDao.js CHANGED
@@ -6,16 +6,13 @@ class PowerSystemResourceDao extends IdentifiedObjectDao_1.IdentifiedObjectDao {
6
6
  buildPowerSystemResourceInsert() {
7
7
  return {
8
8
  sql: `
9
- insert into cim.power_system_resource (
10
- mrid,
11
- psr_type_mrid
12
- ) values (?, ?)
13
- on conflict (mrid) do update
14
- set psr_type_mrid = excluded.psr_type_mrid
9
+ insert into cim.power_system_resource (
10
+ mrid
11
+ ) values (?)
12
+ on conflict (mrid) do nothing
15
13
  `,
16
14
  params: [
17
- this.cimObject.getUUID(),
18
- this.cimObject.psrType?.getUUID() ?? null
15
+ this.cimObject.getUUID()
19
16
  ]
20
17
  };
21
18
  }
@@ -25,6 +22,22 @@ class PowerSystemResourceDao extends IdentifiedObjectDao_1.IdentifiedObjectDao {
25
22
  this.buildPowerSystemResourceInsert()
26
23
  ];
27
24
  }
25
+ toAssociationInsertStatements() {
26
+ return [
27
+ ...super.toAssociationInsertStatements(),
28
+ {
29
+ sql: `
30
+ update cim.power_system_resource
31
+ set psr_type_mrid = ?
32
+ where mrid = ?
33
+ `,
34
+ params: [
35
+ this.cimObject.psrType?.getUUID() ?? null,
36
+ this.cimObject.getUUID()
37
+ ]
38
+ }
39
+ ];
40
+ }
28
41
  }
29
42
  exports.PowerSystemResourceDao = PowerSystemResourceDao;
30
43
  //# sourceMappingURL=PowerSystemResourceDao.js.map
package/dist/database/core/PowerSystemResourceDao.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PowerSystemResourceDao.js","sourceRoot":"","sources":["../../../src/database/core/PowerSystemResourceDao.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAa,sBAAsD,SAAQ,yCAAsB;IACrF,8BAA8B;QACtC,OAAO;YACL,GAAG,EAAE;;;;;;;OAOJ;YACD,MAAM,EAAE;gBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;gBACxB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,IAAI;aAC1C;SACF,CAAC;IACJ,CAAC;IAED,kBAAkB;QAChB,OAAO;YACL,IAAI,CAAC,2BAA2B,EAAE;YAClC,IAAI,CAAC,8BAA8B,EAAE;SACtC,CAAC;IACJ,CAAC;CACF;AAxBD,wDAwBC"}
1
+ {"version":3,"file":"PowerSystemResourceDao.js","sourceRoot":"","sources":["../../../src/database/core/PowerSystemResourceDao.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAa,sBAAsD,SAAQ,yCAAsB;IACrF,8BAA8B;QACtC,OAAO;YACL,GAAG,EAAE;;;;;OAKJ;YACD,MAAM,EAAE;gBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;aACzB;SACF,CAAC;IACJ,CAAC;IAED,kBAAkB;QAChB,OAAO;YACL,IAAI,CAAC,2BAA2B,EAAE;YAClC,IAAI,CAAC,8BAA8B,EAAE;SACtC,CAAC;IACJ,CAAC;IAEQ,6BAA6B;QACpC,OAAO;YACL,GAAG,KAAK,CAAC,6BAA6B,EAAE;YACxC;gBACE,GAAG,EAAE;;;;SAIJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,IAAI;oBACzC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;iBACzB;aACF;SACF,CAAC;IACJ,CAAC;CACF;AAtCD,wDAsCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@enervance/insight-cim-model",
3
- "version": "1.0.22",
3
+ "version": "1.0.24",
4
4
  "description": "CIM data model",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",