@enervance/insight-cim-model 1.0.27 → 1.0.29

package/dist/database/core/ConductingEquipmentDao.d.ts

@@ -4,5 +4,4 @@ import { InsertStatement } from '../dao-sql-types.js';
 export declare class ConductingEquipmentDao<T extends ConductingEquipment> extends EquipmentDao<T> {
     protected buildConductingEquipmentInsert(): InsertStatement;
     toInsertStatements(): InsertStatement[];
-    toAssociationInsertStatements(): InsertStatement[];
 }

package/dist/database/core/ConductingEquipmentDao.js

@@ -19,11 +19,6 @@ class ConductingEquipmentDao extends EquipmentDao_1.EquipmentDao {
             this.buildConductingEquipmentInsert()
         ];
     }
-    toAssociationInsertStatements() {
-        return [
-            ...super.toAssociationInsertStatements()
-        ];
-    }
 }
 exports.ConductingEquipmentDao = ConductingEquipmentDao;
 //# sourceMappingURL=ConductingEquipmentDao.js.map

package/dist/database/core/ConductingEquipmentDao.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConductingEquipmentDao.js","sourceRoot":"","sources":["../../../src/database/core/ConductingEquipmentDao.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAG9C,MAAa,sBAAsD,SAAQ,2BAAe;IAC9E,8BAA8B;QACtC,OAAO;YACL,GAAG,EAAE;;;;OAIJ;YACD,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;SACnC,CAAC;IACJ,CAAC;IAEQ,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B,IAAI,CAAC,8BAA8B,EAAE;SACtC,CAAC;IACJ,CAAC;IAEQ,6BAA6B;QACpC,OAAO;YACL,GAAG,KAAK,CAAC,6BAA6B,EAAE;SACzC,CAAC;IACJ,CAAC;CACF;AAxBD,wDAwBC"}
+{"version":3,"file":"ConductingEquipmentDao.js","sourceRoot":"","sources":["../../../src/database/core/ConductingEquipmentDao.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAG9C,MAAa,sBAAsD,SAAQ,2BAAe;IAC9E,8BAA8B;QACtC,OAAO;YACL,GAAG,EAAE;;;;OAIJ;YACD,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;SACnC,CAAC;IACJ,CAAC;IAEQ,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B,IAAI,CAAC,8BAA8B,EAAE;SACtC,CAAC;IACJ,CAAC;CACF;AAlBD,wDAkBC"}

package/dist/database/core/EquipmentDao.d.ts

@@ -3,6 +3,6 @@ import { PowerSystemResourceDao } from './PowerSystemResourceDao.js';
 import { InsertStatement } from '../dao-sql-types.js';
 export declare class EquipmentDao<T extends Equipment> extends PowerSystemResourceDao<T> {
     protected buildEquipmentInsert(): InsertStatement;
+    protected buildAdditionalEquipmentContainerInserts(): InsertStatement[];
     toInsertStatements(): InsertStatement[];
-    toAssociationInsertStatements(): InsertStatement[];
 }

package/dist/database/core/EquipmentDao.js

@@ -6,46 +6,36 @@ class EquipmentDao extends PowerSystemResourceDao_1.PowerSystemResourceDao {
     buildEquipmentInsert() {
         return {
             sql: `
-          insert into cim.equipment (
-              mrid
-          ) values (?)
-              on conflict (mrid) do nothing
+        insert into cim.equipment (
+          mrid,
+          equipment_container_mrid
+        ) values (?, ?)
+        on conflict (mrid) do update
+        set equipment_container_mrid = excluded.equipment_container_mrid
       `,
             params: [
-                this.cimObject.getUUID()
+                this.cimObject.getUUID(),
+                this.cimObject.equipmentContainer?.getUUID() ?? null
             ]
         };
     }
+    buildAdditionalEquipmentContainerInserts() {
+        return [...this.cimObject.additionalEquipmentContainer.values()].map((container) => ({
+            sql: `
+        insert into cim.equipment_additional_equipment_container (
+          equipment_mrid,
+          equipment_container_mrid
+        ) values (?, ?)
+        on conflict (equipment_mrid, equipment_container_mrid) do nothing
+      `,
+            params: [this.cimObject.getUUID(), container.getUUID()]
+        }));
+    }
     toInsertStatements() {
         return [
             ...super.toInsertStatements(),
-            this.buildEquipmentInsert()
-        ];
-    }
-    toAssociationInsertStatements() {
-        return [
-            ...super.toAssociationInsertStatements(),
-            {
-                sql: `
-          update cim.equipment
-          set equipment_container_mrid = ?
-          where mrid = ?
-        `,
-                params: [
-                    this.cimObject.equipmentContainer?.getUUID() ?? null,
-                    this.cimObject.getUUID()
-                ]
-            },
-            ...[...this.cimObject.additionalEquipmentContainer.values()].map((container) => ({
-                sql: `
-            insert into cim.equipment_additional_equipment_container (
-                equipment_mrid,
-                equipment_container_mrid
-            ) values (?, ?)
-                on conflict (equipment_mrid, equipment_container_mrid) do nothing
-        `,
-                params: [this.cimObject.getUUID(), container.getUUID()]
-            }))
+            this.buildEquipmentInsert(),
+            ...this.buildAdditionalEquipmentContainerInserts()
         ];
     }
 }

package/dist/database/core/EquipmentDao.js.map

@@ -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;;;;;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"}
+{"version":3,"file":"EquipmentDao.js","sourceRoot":"","sources":["../../../src/database/core/EquipmentDao.ts"],"names":[],"mappings":";;;AACA,qEAAkE;AAGlE,MAAa,YAAkC,SAAQ,+CAAyB;IACpE,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;IAES,wCAAwC;QAChD,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,4BAA4B,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACnF,GAAG,EAAE;;;;;;OAMJ;YACD,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;SACxD,CAAC,CAAC,CAAC;IACN,CAAC;IAEQ,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B,IAAI,CAAC,oBAAoB,EAAE;YAC3B,GAAG,IAAI,CAAC,wCAAwC,EAAE;SACnD,CAAC;IACJ,CAAC;CACF;AAtCD,oCAsCC"}

package/dist/database/core/FeederDao.d.ts

@@ -3,5 +3,4 @@ import { Feeder } from '../../model/core/Feeder.js';
 import { InsertStatement } from '../dao-sql-types.js';
 export declare class FeederDao<T extends Feeder> extends EquipmentContainerDao<Feeder> {
     toInsertStatements(): InsertStatement[];
-    toAssociationInsertStatements(): InsertStatement[];
 }

package/dist/database/core/FeederDao.js

@@ -8,36 +8,20 @@ class FeederDao extends EquipmentContainerDao_1.EquipmentContainerDao {
             ...super.toInsertStatements(),
             {
                 sql: `
-            insert into cim.feeder (mrid) 
-            values (?)
-            on conflict (mrid) do nothing
+          insert into cim.feeder (
+            mrid,
+            normal_energizing_substation_mrid
+          ) values (?, ?)
+          on conflict (mrid) do update
+          set normal_energizing_substation_mrid = excluded.normal_energizing_substation_mrid
         `,
                 params: [
-                    this.cimObject.getUUID()
+                    this.cimObject.getUUID(),
+                    this.cimObject.normalEnergizingSubstation?.getUUID() ?? null
                 ]
             }
         ];
     }
-    toAssociationInsertStatements() {
-        return [
-            ...super.toAssociationInsertStatements(),
-            ...(this.cimObject.normalEnergizingSubstation
-                ? [
-                    {
-                        sql: `
-              update cim.feeder
-              set normal_energizing_substation_mrid = ?
-              where mrid = ?
-            `,
-                        params: [
-                            this.cimObject.getUUID(),
-                            this.cimObject.normalEnergizingSubstation?.getUUID() ?? null
-                        ]
-                    }
-                ]
-                : [])
-        ];
-    }
 }
 exports.FeederDao = FeederDao;
 //# sourceMappingURL=FeederDao.js.map

package/dist/database/core/FeederDao.js.map

@@ -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;;;;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"}
+{"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"}

package/dist/database/core/IdentifiedObjectDao.d.ts

@@ -4,6 +4,5 @@ export declare class IdentifiedObjectDao<T extends IdentifiedObject> {
     readonly cimObject: T;
     powerGridId: number;
     constructor(cimObject: T, powerGridId: number);
-    toAssociationInsertStatements(): InsertStatement[];
     protected buildIdentifiedObjectInsert(): InsertStatement;
 }

package/dist/database/core/IdentifiedObjectDao.js

@@ -10,9 +10,6 @@ class IdentifiedObjectDao {
         this.cimObject = cimObject;
         this.powerGridId = powerGridId;
     }
-    toAssociationInsertStatements() {
-        return [];
-    }
     buildIdentifiedObjectInsert() {
         return {
             sql: `

package/dist/database/core/IdentifiedObjectDao.js.map

@@ -1 +1 @@
-{"version":3,"file":"IdentifiedObjectDao.js","sourceRoot":"","sources":["../../../src/database/core/IdentifiedObjectDao.ts"],"names":[],"mappings":";;;AAGA,MAAa,mBAAmB;IAMF;IAJ5B,sBAAsB;IACtB,kDAAkD;IAClD,WAAW,CAAS;IAEpB,YAA4B,SAAY,EAAE,WAAmB;QAAjC,cAAS,GAAT,SAAS,CAAG;QACtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAGD,6BAA6B;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IAES,2BAA2B;QACnC,OAAO;YACL,GAAG,EAAE;;;2JAGgJ;YACrJ,MAAM,EAAE;gBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;gBACxB,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI;gBAC3B,IAAI,CAAC,SAAS,CAAC,SAAS,IAAI,IAAI;gBAChC,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,IAAI;gBAClC,IAAI,CAAC,WAAW,IAAI,IAAI;aACzB;SACF,CAAC;IACJ,CAAC;CACF;AA9BD,kDA8BC"}
+{"version":3,"file":"IdentifiedObjectDao.js","sourceRoot":"","sources":["../../../src/database/core/IdentifiedObjectDao.ts"],"names":[],"mappings":";;;AAGA,MAAa,mBAAmB;IAMF;IAJ5B,sBAAsB;IACtB,kDAAkD;IAClD,WAAW,CAAS;IAEpB,YAA4B,SAAY,EAAE,WAAmB;QAAjC,cAAS,GAAT,SAAS,CAAG;QACtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAGS,2BAA2B;QACnC,OAAO;YACL,GAAG,EAAE;;;2JAGgJ;YACrJ,MAAM,EAAE;gBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;gBACxB,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI;gBAC3B,IAAI,CAAC,SAAS,CAAC,SAAS,IAAI,IAAI;gBAChC,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,IAAI;gBAClC,IAAI,CAAC,WAAW,IAAI,IAAI;aACzB;SACF,CAAC;IACJ,CAAC;CACF;AA1BD,kDA0BC"}

package/dist/database/core/PowerSystemResourceDao.d.ts

@@ -4,5 +4,4 @@ import { InsertStatement } from '../dao-sql-types.js';
 export declare class PowerSystemResourceDao<T extends PowerSystemResource> extends IdentifiedObjectDao<T> {
     protected buildPowerSystemResourceInsert(): InsertStatement;
     toInsertStatements(): InsertStatement[];
-    toAssociationInsertStatements(): InsertStatement[];
 }

package/dist/database/core/PowerSystemResourceDao.js

@@ -6,13 +6,16 @@ class PowerSystemResourceDao extends IdentifiedObjectDao_1.IdentifiedObjectDao {
     buildPowerSystemResourceInsert() {
         return {
             sql: `
-          insert into cim.power_system_resource (
-              mrid
-          ) values (?)
-              on conflict (mrid) do nothing
+        insert into cim.power_system_resource (
+          mrid,
+          psr_type_mrid
+        ) values (?, ?)
+        on conflict (mrid) do update
+        set psr_type_mrid = excluded.psr_type_mrid
       `,
             params: [
-                this.cimObject.getUUID()
+                this.cimObject.getUUID(),
+                this.cimObject.psrType?.getUUID() ?? null
             ]
         };
     }
@@ -22,22 +25,6 @@ class PowerSystemResourceDao extends IdentifiedObjectDao_1.IdentifiedObjectDao {
             this.buildPowerSystemResourceInsert()
         ];
     }
-    toAssociationInsertStatements() {
-        return [
-            ...super.toAssociationInsertStatements(),
-            {
-                sql: `
-          update cim.power_system_resource
-          set psr_type_mrid = ?
-          where mrid = ?
-        `,
-                params: [
-                    this.cimObject.psrType?.getUUID() ?? null,
-                    this.cimObject.getUUID()
-                ]
-            }
-        ];
-    }
 }
 exports.PowerSystemResourceDao = PowerSystemResourceDao;
 //# sourceMappingURL=PowerSystemResourceDao.js.map

package/dist/database/core/PowerSystemResourceDao.js.map

@@ -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;;;;;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"}
+{"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"}

package/dist/database/core/SubstationDao.d.ts

@@ -3,5 +3,4 @@ import { Substation } from '../../model/core/Substation.js';
 import { InsertStatement } from '../dao-sql-types.js';
 export declare class SubstationDao extends EquipmentContainerDao<Substation> {
     toInsertStatements(): InsertStatement[];
-    toAssociationInsertStatements(): InsertStatement[];
 }

package/dist/database/core/SubstationDao.js

@@ -8,49 +8,22 @@ class SubstationDao extends EquipmentContainerDao_1.EquipmentContainerDao {
             ...super.toInsertStatements(),
             {
                 sql: `
-            insert into cim.substation (
-                mrid,
-                number
-            ) values (?, ?)
-                on conflict (mrid) do update
-                set number = excluded.number
+          insert into cim.substation (
+            mrid,
+            number,                             
+            region_mrid
+          ) values (?, ?, ?)
+          on conflict (mrid) do update
+          set region_mrid = excluded.region_mrid
         `,
                 params: [
                     this.cimObject.getUUID(),
-                    this.cimObject.getNumber() ?? null
+                    this.cimObject.getNumber() ?? null,
+                    this.cimObject.subGeographicalRegion?.getUUID() ?? null
                 ]
             }
         ];
     }
-    toAssociationInsertStatements() {
-        return [
-            ...super.toAssociationInsertStatements(),
-            {
-                sql: `
-          update cim.substation
-          set region_mrid = ?
-          where mrid = ?
-        `,
-                params: [
-                    this.cimObject.subGeographicalRegion?.getUUID() ?? null,
-                    this.cimObject.getUUID()
-                ]
-            },
-            ...Array.from(this.cimObject.normalEnergizedFeeder.values()).map((feeder) => ({
-                sql: `
-          insert into cim.substation_normal_energized_feeder (
-            substation_mrid,
-            feeder_mrid
-          ) values (?, ?)
-          on conflict (substation_mrid, feeder_mrid) do nothing
-        `,
-                params: [
-                    this.cimObject.getUUID(),
-                    feeder.getUUID()
-                ]
-            }))
-        ];
-    }
 }
 exports.SubstationDao = SubstationDao;
 //# sourceMappingURL=SubstationDao.js.map

package/dist/database/core/SubstationDao.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubstationDao.js","sourceRoot":"","sources":["../../../src/database/core/SubstationDao.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAIhE,MAAa,aAAc,SAAQ,6CAAiC;IAEzD,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,SAAS,EAAE,IAAI,IAAI;iBACnC;aACF;SACF,CAAC;IACJ,CAAC;IAGQ,6BAA6B;QACpC,OAAO;YACL,GAAG,KAAK,CAAC,6BAA6B,EAAE;YACxC;gBACE,GAAG,EAAE;;;;SAIJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,OAAO,EAAE,IAAI,IAAI;oBACvD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;iBACzB;aACF;YACD,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC5E,GAAG,EAAE;;;;;;SAMJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;oBACxB,MAAM,CAAC,OAAO,EAAE;iBACjB;aACF,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;CACF;AApDD,sCAoDC"}
+{"version":3,"file":"SubstationDao.js","sourceRoot":"","sources":["../../../src/database/core/SubstationDao.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAIhE,MAAa,aAAc,SAAQ,6CAAiC;IACzD,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B;gBACE,GAAG,EAAE;;;;;;;;SAQJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;oBACxB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,IAAI;oBAClC,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,OAAO,EAAE,IAAI,IAAI;iBACxD;aACF;SACF,CAAC;IACJ,CAAC;CACF;AAtBD,sCAsBC"}

package/dist/database/core/WNFeederDao.d.ts

@@ -3,5 +3,4 @@ import { FeederDao } from './FeederDao.js';
 import { WNFeeder } from '../../model/extensions/westnetz-neplan/core/WNFeeder.js';
 export declare class WNFeederDao extends FeederDao<WNFeeder> {
     toInsertStatements(): InsertStatement[];
-    toAssociationInsertStatements(): InsertStatement[];
 }

package/dist/database/core/WNFeederDao.js

@@ -13,7 +13,7 @@ class WNFeederDao extends FeederDao_1.FeederDao {
                 number
             ) values (?, ?)
                 on conflict (mrid) do update
-                set number = excluded.number
+                                          set number = excluded.number
         `,
                 params: [
                     this.cimObject.getUUID(),
@@ -22,11 +22,6 @@ class WNFeederDao extends FeederDao_1.FeederDao {
             }
         ];
     }
-    toAssociationInsertStatements() {
-        return [
-            ...super.toAssociationInsertStatements()
-        ];
-    }
 }
 exports.WNFeederDao = WNFeederDao;
 //# sourceMappingURL=WNFeederDao.js.map

package/dist/database/core/WNFeederDao.js.map

@@ -1 +1 @@
-{"version":3,"file":"WNFeederDao.js","sourceRoot":"","sources":["../../../src/database/core/WNFeederDao.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AAGxC,MAAa,WAAY,SAAQ,qBAAmB;IACzC,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,MAAM,IAAI,IAAI;iBAC9B;aACF;SACF,CAAC;IACJ,CAAC;IAEQ,6BAA6B;QACpC,OAAO;YACL,GAAG,KAAK,CAAC,6BAA6B,EAAE;SACzC,CAAC;IACJ,CAAC;CACF;AA1BD,kCA0BC"}
+{"version":3,"file":"WNFeederDao.js","sourceRoot":"","sources":["../../../src/database/core/WNFeederDao.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AAGxC,MAAa,WAAY,SAAQ,qBAAmB;IACzC,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,MAAM,IAAI,IAAI;iBAC9B;aACF;SACF,CAAC;IACJ,CAAC;CACF;AApBD,kCAoBC"}

package/dist/database/dao-base.d.ts

@@ -4,5 +4,4 @@ export declare abstract class BaseDao<T extends IdentifiedObject> {
     readonly cimObject: T;
     constructor(cimObject: T);
     abstract toInsertStatements(): InsertStatement[];
-    toAssociationInsertStatements(): InsertStatement[];
 }

package/dist/database/dao-base.js

@@ -6,9 +6,6 @@ class BaseDao {
     constructor(cimObject) {
         this.cimObject = cimObject;
     }
-    toAssociationInsertStatements() {
-        return [];
-    }
 }
 exports.BaseDao = BaseDao;
 //# sourceMappingURL=dao-base.js.map

package/dist/database/dao-base.js.map

@@ -1 +1 @@
-{"version":3,"file":"dao-base.js","sourceRoot":"","sources":["../../src/database/dao-base.ts"],"names":[],"mappings":";;;AAGA,MAAsB,OAAO;IACX,SAAS,CAAI;IAE7B,YAAY,SAAY;QACtB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAID,6BAA6B;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAZD,0BAYC"}
+{"version":3,"file":"dao-base.js","sourceRoot":"","sources":["../../src/database/dao-base.ts"],"names":[],"mappings":";;;AAGA,MAAsB,OAAO;IACC;IAA5B,YAA4B,SAAY;QAAZ,cAAS,GAAT,SAAS,CAAG;IAAG,CAAC;CAG7C;AAJD,0BAIC"}

package/dist/database/dao-dependency-resolver.js

@@ -28,13 +28,8 @@ class DaoDependencyResolver {
         if (obj instanceof PowerSystemResource_1.PowerSystemResource && obj.psrType) {
             deps.push(obj.psrType);
         }
-        if (obj instanceof Substation_1.Substation) {
-            if (obj.subGeographicalRegion) {
-                deps.push(obj.subGeographicalRegion);
-            }
-            for (const feeder of obj.normalEnergizedFeeder.values()) {
-                deps.push(feeder);
-            }
+        if (obj instanceof Substation_1.Substation && obj.subGeographicalRegion) {
+            deps.push(obj.subGeographicalRegion);
         }
         if (obj instanceof Feeder_1.Feeder && obj.normalEnergizingSubstation) {
             deps.push(obj.normalEnergizingSubstation);

package/dist/database/dao-dependency-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"dao-dependency-resolver.js","sourceRoot":"","sources":["../../src/database/dao-dependency-resolver.ts"],"names":[],"mappings":";;;AACA,2EAAwE;AACxE,yDAAsD;AACtD,iDAA8C;AAC9C,uDAAoD;AAGpD,MAAa,qBAAqB;IAEhC,OAAO,CAAC,IAAsB;QAC5B,MAAM,OAAO,GAAuB,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAElC,MAAM,KAAK,GAAG,CAAC,GAAiC,EAAQ,EAAE;YACxD,IAAI,CAAC,GAAG;gBAAE,OAAO;YACjB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBAAE,OAAO;YAEvC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAE3B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5C,KAAK,CAAC,GAAG,CAAC,CAAC;YACb,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,eAAe,CAAC,GAAqB;QAC3C,MAAM,IAAI,GAAuB,EAAE,CAAC;QAEpC,IAAI,GAAG,YAAY,yCAAmB,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACtD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,GAAG,YAAY,uBAAU,EAAE,CAAC;YAC9B,IAAI,GAAG,CAAC,qBAAqB,EAAE,CAAC;gBAC9B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YACvC,CAAC;YAED,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,qBAAqB,CAAC,MAAM,EAAE,EAAE,CAAC;gBACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QAED,IAAI,GAAG,YAAY,eAAM,IAAI,GAAG,CAAC,0BAA0B,EAAE,CAAC;YAC5D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,GAAG,YAAY,qBAAS,EAAE,CAAC;YAC7B,IAAI,GAAG,CAAC,kBAAkB,EAAE,CAAC;gBAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YACpC,CAAC;YAED,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,4BAA4B,CAAC,MAAM,EAAE,EAAE,CAAC;gBACnE,IAAI,CAAC,IAAI,CAAC,UAAgC,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAxDD,sDAwDC"}
+{"version":3,"file":"dao-dependency-resolver.js","sourceRoot":"","sources":["../../src/database/dao-dependency-resolver.ts"],"names":[],"mappings":";;;AACA,2EAAwE;AACxE,yDAAsD;AACtD,iDAA8C;AAC9C,uDAAoD;AAGpD,MAAa,qBAAqB;IAEhC,OAAO,CAAC,IAAsB;QAC5B,MAAM,OAAO,GAAuB,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAElC,MAAM,KAAK,GAAG,CAAC,GAAiC,EAAQ,EAAE;YACxD,IAAI,CAAC,GAAG;gBAAE,OAAO;YACjB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBAAE,OAAO;YAEvC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAE3B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5C,KAAK,CAAC,GAAG,CAAC,CAAC;YACb,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,eAAe,CAAC,GAAqB;QAC3C,MAAM,IAAI,GAAuB,EAAE,CAAC;QAEpC,IAAI,GAAG,YAAY,yCAAmB,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACtD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,GAAG,YAAY,uBAAU,IAAI,GAAG,CAAC,qBAAqB,EAAE,CAAC;YAC3D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,GAAG,YAAY,eAAM,IAAI,GAAG,CAAC,0BAA0B,EAAE,CAAC;YAC5D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,GAAG,YAAY,qBAAS,EAAE,CAAC;YAC7B,IAAI,GAAG,CAAC,kBAAkB,EAAE,CAAC;gBAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YACpC,CAAC;YAED,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,4BAA4B,CAAC,MAAM,EAAE,EAAE,CAAC;gBACnE,IAAI,CAAC,IAAI,CAAC,UAAgC,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAlDD,sDAkDC"}

package/dist/database/dao-statement-planner.d.ts

@@ -3,6 +3,5 @@ import { IdentifiedObject } from '../model/core/IdentifiedObject.js';
 export declare class DaoStatementPlanner {
     private readonly resolver;
     plan(root: IdentifiedObject, powerGridId: number): InsertStatement[];
-    planManyObjects(roots: IdentifiedObject[], powerGridId: number): InsertStatement[];
-    planManyAssociations(roots: IdentifiedObject[], powerGridId: number): InsertStatement[];
+    planMany(roots: IdentifiedObject[], powerGridId: number): InsertStatement[];
 }

package/dist/database/dao-statement-planner.js

@@ -14,27 +14,7 @@ class DaoStatementPlanner {
         }
         return statements;
     }
-    planManyObjects(roots, powerGridId) {
-        /*    const visited = new Set<string>();
-            const orderedObjects: IdentifiedObject[] = [];
-            const resolver = new DaoDependencyResolver();
-        
-            for (const root of roots) {
-              for (const obj of resolver.resolve(root)) {
-                if (!visited.has(obj.getUUID())) {
-                  visited.add(obj.getUUID());
-                  orderedObjects.push(obj);
-                }
-              }
-            }*/
-        const coreStatements = [];
-        for (const obj of roots) {
-            const dao = dao_factory_1.DaoFactory.create(obj, powerGridId);
-            coreStatements.push(...dao.toInsertStatements());
-        }
-        return coreStatements;
-    }
-    planManyAssociations(roots, powerGridId) {
+    planMany(roots, powerGridId) {
         const visited = new Set();
         const orderedObjects = [];
         const resolver = new dao_dependency_resolver_1.DaoDependencyResolver();
@@ -46,12 +26,12 @@ class DaoStatementPlanner {
                 }
             }
         }
-        const associationStatements = [];
+        const statements = [];
         for (const obj of orderedObjects) {
             const dao = dao_factory_1.DaoFactory.create(obj, powerGridId);
-            associationStatements.push(...dao.toAssociationInsertStatements());
+            statements.push(...dao.toInsertStatements());
         }
-        return associationStatements;
+        return statements;
     }
 }
 exports.DaoStatementPlanner = DaoStatementPlanner;

package/dist/database/dao-statement-planner.js.map

@@ -1 +1 @@
-{"version":3,"file":"dao-statement-planner.js","sourceRoot":"","sources":["../../src/database/dao-statement-planner.ts"],"names":[],"mappings":";;;AACA,+CAA2C;AAC3C,uEAAkE;AAIlE,MAAa,mBAAmB;IACb,QAAQ,GAAG,IAAI,+CAAqB,EAAE,CAAC;IAExD,IAAI,CAAC,IAAsB,EAAE,WAAmB;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAsB,EAAE,CAAC;QAEzC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,eAAe,CAAC,KAAyB,EAAE,WAAmB;QAChE;;;;;;;;;;;eAWO;QAEH,MAAM,cAAc,GAAsB,EAAE,CAAC;QAC7C,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,GAAG,GAAG,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAChD,cAAc,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,oBAAoB,CAAC,KAAyB,EAAE,WAAmB;QACjE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,MAAM,cAAc,GAAuB,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAG,IAAI,+CAAqB,EAAE,CAAC;QAE7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;oBAChC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC3B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,qBAAqB,GAAsB,EAAE,CAAC;QACpD,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAChD,qBAAqB,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,6BAA6B,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,qBAAqB,CAAC;IAC/B,CAAC;CACF;AA5DD,kDA4DC"}
+{"version":3,"file":"dao-statement-planner.js","sourceRoot":"","sources":["../../src/database/dao-statement-planner.ts"],"names":[],"mappings":";;;AACA,+CAA2C;AAC3C,uEAAkE;AAIlE,MAAa,mBAAmB;IACb,QAAQ,GAAG,IAAI,+CAAqB,EAAE,CAAC;IAExD,IAAI,CAAC,IAAsB,EAAE,WAAmB;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAsB,EAAE,CAAC;QAEzC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,QAAQ,CAAC,KAAyB,EAAE,WAAmB;QACrD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,MAAM,cAAc,GAAuB,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAG,IAAI,+CAAqB,EAAE,CAAC;QAE7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;oBAChC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC3B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAsB,EAAE,CAAC;QACzC,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AArCD,kDAqCC"}

package/dist/database/wires/ACLineSegmentDao.d.ts

@@ -3,5 +3,4 @@ import { ConductingEquipmentDao } from '../core/ConductingEquipmentDao.js';
 import { InsertStatement } from '../dao-sql-types.js';
 export declare class ACLineSegmentDao extends ConductingEquipmentDao<ACLineSegment> {
     toInsertStatements(): InsertStatement[];
-    toAssociationInsertStatements(): InsertStatement[];
 }

package/dist/database/wires/ACLineSegmentDao.js

@@ -31,11 +31,6 @@ class ACLineSegmentDao extends ConductingEquipmentDao_1.ConductingEquipmentDao {
             }
         ];
     }
-    toAssociationInsertStatements() {
-        return [
-            ...super.toAssociationInsertStatements()
-        ];
-    }
 }
 exports.ACLineSegmentDao = ACLineSegmentDao;
 //# sourceMappingURL=ACLineSegmentDao.js.map

package/dist/database/wires/ACLineSegmentDao.js.map

@@ -1 +1 @@
-{"version":3,"file":"ACLineSegmentDao.js","sourceRoot":"","sources":["../../../src/database/wires/ACLineSegmentDao.ts"],"names":[],"mappings":";;;AACA,2EAAwE;AAGxE,MAAa,gBAAiB,SAAQ,+CAAqC;IAChE,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B;gBACE,GAAG,EAAE;;;;;;;;;;;;;SAaJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;oBACxB,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,IAAI;oBAC7B,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI;oBACxB,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI;oBACxB,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,IAAI;iBAC3B;aACF;SACF,CAAC;IACJ,CAAC;IAEQ,6BAA6B;QACpC,OAAO;YACL,GAAG,KAAK,CAAC,6BAA6B,EAAE;SACzC,CAAC;IACJ,CAAC;CACF;AAnCD,4CAmCC"}
+{"version":3,"file":"ACLineSegmentDao.js","sourceRoot":"","sources":["../../../src/database/wires/ACLineSegmentDao.ts"],"names":[],"mappings":";;;AACA,2EAAwE;AAGxE,MAAa,gBAAiB,SAAQ,+CAAqC;IAChE,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B;gBACE,GAAG,EAAE;;;;;;;;;;;;;SAaJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;oBACxB,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,IAAI;oBAC7B,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI;oBACxB,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI;oBACxB,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,IAAI;iBAC3B;aACF;SACF,CAAC;IACJ,CAAC;CACF;AA7BD,4CA6BC"}

package/dist/model/extensions/amprion/assets/AMPRIONFacility.js

@@ -100,11 +100,12 @@ class AMPRIONFacility extends Facility_1.Facility {
         ?installationDate2 ?name2 ?plannedInstallation ?plannedName ?plannedShortName ?shortName2
         (strafter(strafter(str(?aContainerUUID), '#'), '_') AS ?assetContainerUUID)
         (strafter(strafter(str(?aavUUIDs), '#'), '_') AS ?additionalAssetValueUUID)
-        (strafter(strafter(str(?aiUUIDs), '#'), '_') AS ?assetInfoUUID)
-        (strafter(strafter(str(?sUUIDs), '#'), '_') AS ?stateUUID)
         
         (strafter(strafter(str(?lUUID), '#'), '_') AS ?locationUUID)
 
+        (group_concat(STRAFTER(str(?sUUIDs), '#_');separator=',') as ?stateUUID)
+        (group_concat(STRAFTER(str(?aiUUIDs), '#_');separator=',') as ?assetInfoUUID)
+
         (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)
         (group_concat(STRAFTER(str(?orgaRolesUUIDs), '#_');separator=',') as ?organisationRoleUUIDs)
     
@@ -162,7 +163,7 @@ class AMPRIONFacility extends Facility_1.Facility {
                  ?iecNumber1 ?iecNumber2 ?localContactPrimaryEquipment
                  ?kind ?type ?phaseEnum ?statusEnum ?installationDate2 ?name2 ?plannedInstallation ?serialNumber
                  ?plannedName ?plannedShortName ?shortName2 ?lUUID
-                 ?aContainerUUID ?aavUUIDs ?aiUUIDs ?sUUIDs
+                 ?aContainerUUID ?aavUUIDs 
     `;
 }
 exports.AMPRIONFacility = AMPRIONFacility;

package/dist/model/extensions/amprion/assets/AMPRIONFacility.js.map

@@ -1 +1 @@
-{"version":3,"file":"AMPRIONFacility.js","sourceRoot":"","sources":["../../../../../src/model/extensions/amprion/assets/AMPRIONFacility.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AMPRIONFacility.js","sourceRoot":"","sources":["../../../../../src/model/extensions/amprion/assets/AMPRIONFacility.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enervance/insight-cim-model",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "CIM data model",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -70,11 +70,11 @@
     "proj4": "^2.9.0",
     "saxes": "^5.0.1",
     "superagent": "^6.1.0",
-    "uuid": "^13.0.0"
+    "uuid": "^14.0.0"
   },
   "peerDependencies": {
-    "@enervance/base-model-utils": "^0.5.0",
-    "@enervance/cim-model-utils": "^0.5.1",
+    "@enervance/base-model-utils": "^0.6.0",
+    "@enervance/cim-model-utils": "^0.6.0",
     "mariadb": "^2.5.2",
     "moment": "^2.29.4",
     "mysql": "^2.18.1"