@enervance/insight-cim-model 0.0.206 → 0.0.208-dev

package/dist/converter/integral7/dl-convert/data-manager.d.ts

@@ -2,7 +2,7 @@ import { ILogger } from '../../../interfaces/ILogger.js';
 import { i7SchemaKeyDefinitions, I7TableSchemas } from './dl-graphs/convert-graph-keys.js';
 import { DbObjectGraph } from './dl-graphs/db-object-graph.js';
 import { MysqlController } from '../../../util/database/mysql-controller.js';
-import { CimModelGraph, DbObjectKey2CimModelUUIDGraph } from './dl-graphs/cim-model-graph.js';
+import { CimModelGraph } from './dl-graphs/cim-model-graph.js';
 export type LoadFromMySQLOptions = {
     [tableName in keyof I7TableSchemas]?: {
         [tableColumnName in keyof I7TableSchemas[tableName]]?: {
@@ -14,13 +14,10 @@ export type LoadFromMySQLOptions = {
 export declare class DataManager {
     private logger;
     dbObjectGraph: DbObjectGraph<I7TableSchemas, typeof i7SchemaKeyDefinitions>;
-    dbObjectKeyCimModelUuidGraph: DbObjectKey2CimModelUUIDGraph<typeof i7SchemaKeyDefinitions>;
     cimModelGraph: CimModelGraph;
     trafowicklungIntegralId2Uuid: Map<number, string>;
     constructor(logger?: ILogger);
     setDbObjectGraph(graph: DbObjectGraph<I7TableSchemas, typeof i7SchemaKeyDefinitions>): void;
     setCimModelGraph(graph: CimModelGraph): void;
-    addTrafowicklungIntegralId2UuidMapping(i7Id: number, uuid: string): void;
-    setDbObjectKeyCimModelUuidGraph(graph: DbObjectKey2CimModelUUIDGraph<typeof i7SchemaKeyDefinitions>): void;
     loadFromMySQL(mysqlController: MysqlController, options: LoadFromMySQLOptions, currentFrameBoundary?: IterableIterator<number>): Promise<void>;
 }

package/dist/converter/integral7/dl-convert/data-manager.js

@@ -15,77 +15,71 @@ class DataManager {
     setCimModelGraph(graph) {
         this.cimModelGraph = graph;
     }
-    addTrafowicklungIntegralId2UuidMapping(i7Id, uuid) {
-        this.trafowicklungIntegralId2Uuid.set(i7Id, uuid);
-    }
-    setDbObjectKeyCimModelUuidGraph(graph) {
-        this.dbObjectKeyCimModelUuidGraph = graph;
-    }
     loadFromMySQL(mysqlController, options, currentFrameBoundary) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const tableMetaData = yield mysqlController.getTableMetaData();
             for (const tableName in options) {
                 if (tableMetaData.has(tableName)) {
                     /* BEGIN: query-build */
-                    let whereConditionsConcats_and = [];
+                    let where_conditions_concats_and = [];
                     for (const columnName in options[tableName]) {
                         if (options[tableName][columnName].eq) { //&& options[tableName][columnName].eq.length > 0) {
                             const eqConditions = options[tableName][columnName].eq.map(arg => {
                                 return `${columnName} = ${arg}`;
                             }).join(' OR ');
-                            whereConditionsConcats_and.push(eqConditions);
+                            where_conditions_concats_and.push(eqConditions);
                         }
                         else if (options[tableName][columnName].in) { //&& options[tableName][columnName].in.length > 0) {
                             const inConditions = options[tableName][columnName].in.join(', ');
-                            whereConditionsConcats_and.push(` ${columnName} IN (${inConditions})`);
+                            where_conditions_concats_and.push(` ${columnName} IN (${inConditions})`);
                         }
                     }
                     let selectQuery = `SELECT *
                            FROM ${tableName}`;
-                    if (whereConditionsConcats_and.length > 0) {
-                        selectQuery += ` WHERE ${whereConditionsConcats_and.join(' AND ')}`;
+                    if (where_conditions_concats_and.length > 0) {
+                        selectQuery += ` WHERE ${where_conditions_concats_and.join(' AND ')}`;
                     }
                     selectQuery += ';';
                     /* END: query-build */
                     try {
                         let queryResultsAllSites = undefined;
                         if (tableName === 'nsg_nsgstandort') {
-                            const selectQuery = `SELECT * FROM nsg_nsgstandort WHERE ${whereConditionsConcats_and[0]}` + ';';
+                            const selectQuery = `SELECT *
+                                 FROM nsg_nsgstandort
+                                 WHERE ${where_conditions_concats_and[0]}` + ';';
                             queryResultsAllSites = yield mysqlController.execQuery(selectQuery);
                         }
                         const queryResults = yield mysqlController.execQuery(selectQuery);
                         if (queryResults.length > 0) {
-                            if (tableName !== 'nsg_nsgstandort') {
-                                this.dbObjectGraph.addObjects(tableName, convert_graph_keys_1.i7TableNamesToPrimaryKeys[tableName], queryResults);
-                            }
-                            else if (queryResultsAllSites !== undefined && queryResults.length / queryResultsAllSites.length > 0.5) { //ignore cause this variant is not the main variant for this sites
-                                console.log(tableName);
-                                console.log('---------------queryResultsAllSites---------------');
-                                console.log(queryResultsAllSites.length);
-                                console.log('---------------queryResults---------------');
-                                console.log(queryResults.length);
-                                this.dbObjectGraph[tableName] = (_a = this.dbObjectGraph[tableName]) !== null && _a !== void 0 ? _a : {};
-                                let bdSites = [];
-                                if (currentFrameBoundary !== undefined) {
-                                    for (let site of currentFrameBoundary) {
-                                        const filter = queryResults.filter(elem => elem.id === site);
-                                        if (filter.length > 0) {
-                                            bdSites.push(filter);
-                                        }
-                                        let stop = true;
-                                    }
-                                }
-                                if (bdSites.length / queryResults.length <= 0.5) {
-                                    this.dbObjectGraph.addObjects(tableName, convert_graph_keys_1.i7TableNamesToPrimaryKeys[tableName], queryResults);
-                                }
-                                else {
-                                    let stop = true;
-                                }
-                            }
-                            else {
-                                let stop = true;
-                            }
+                            // if(tableName !== 'nsg_nsgstandort'){
+                            this.dbObjectGraph.addObjects(tableName, convert_graph_keys_1.i7TableNamesToPrimaryKeys[tableName], queryResults);
+                            // }else if(queryResultsAllSites !== undefined && queryResults.length/queryResultsAllSites.length>0.5){//ignore cause this variant is not the main variant for this sites
+                            //   console.log(tableName);
+                            //   console.log('---------------queryResultsAllSites---------------');
+                            //   console.log(queryResultsAllSites.length);
+                            //   console.log('---------------queryResults---------------');
+                            //   console.log(queryResults.length);
+                            //   this.dbObjectGraph[tableName] = this.dbObjectGraph[tableName] ?? {};
+                            //   let bdSites:number[] = [];
+                            //   if(currentFrameBoundary!==undefined){
+                            //     for(let site of currentFrameBoundary){
+                            //       const filter = queryResults.filter(elem => elem.id === site);
+                            //       if(filter.length > 0){
+                            //         bdSites.push(filter);
+                            //       }
+                            //       let stop = true;
+                            //     }
+                            //   }
+                            //   if(bdSites.length/queryResults.length<=0.5){
+                            //     this.dbObjectGraph.addObjects(
+                            //       tableName as keyof I7TableNameKeys, i7TableNamesToPrimaryKeys[tableName], queryResults
+                            //     );
+                            //   }else{
+                            //     let stop = true;
+                            //   }
+                            // }else{
+                            //   let stop = true;
+                            // }
                         }
                         else { //ignore cause this variant contains no elements for this tablename
                             let stop = true;

package/dist/converter/integral7/dl-convert/data-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/data-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/data-manager.ts"],"names":[],"mappings":"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"}

package/dist/converter/integral7/dl-convert/dl-converter-i7.d.ts

@@ -3,20 +3,21 @@ import { NetzKnoten, NetzLKupplung, NetzStreckenlast, Netzvariante, NsgKnotenHgu
 import { DiagramObject } from '../../../model/diagram/DiagramObject.js';
 import { i7SchemaKeyDefinitions, I7TableSchemas } from './dl-graphs/convert-graph-keys.js';
 import { Diagram } from '../../../model/diagram/Diagram.js';
-import { CimModelGraph, DbObjectKey2CimModelUUIDGraph } from './dl-graphs/cim-model-graph.js';
+import { CimModelGraph } from './dl-graphs/cim-model-graph.js';
 import { DbObjectGraph } from './dl-graphs/db-object-graph.js';
 import { VariantenNrIdKey } from './db/data-types.js';
 import { IUuidConfig } from '../interface-i7/uuid-config.interface.js';
 type DLConverterI7Config = {
     busbarSectionAsConnectivityNode: boolean;
+    generateUUID4?: boolean;
 };
 export declare class DLConverterI7 {
     private logger;
     private configUuid;
+    private integralID2UUID;
     static testmode: boolean;
     private config;
     private dbObjectGraph;
-    private dbObjectKeyCimModelUuidGraph;
     private cimModelGraph;
     exportedTerminalUUIDs: Set<string>;
     exportedDiagramObjectsGraph: {
@@ -24,12 +25,11 @@ export declare class DLConverterI7 {
             [netzId: number | string]: DiagramObject;
         };
     };
-    constructor(configUuid: Array<IUuidConfig>, logger?: ILogger, config?: DLConverterI7Config);
+    constructor(configUuid?: Array<IUuidConfig>, logger?: ILogger, config?: DLConverterI7Config);
     addExportedDiagramObjectToGraph(variantennr: number, netzId: number, diagramObject: DiagramObject): void;
     getExportedDiagramObjectBy(variantennr: number, netzId: number): DiagramObject | undefined;
     setDbObjectGraph(graph: DbObjectGraph<I7TableSchemas, typeof i7SchemaKeyDefinitions>): void;
     setCimModelGraph(graph: CimModelGraph): void;
-    setDbObjectKeyCimModelUuidGraph(graph: DbObjectKey2CimModelUUIDGraph<typeof i7SchemaKeyDefinitions>): void;
     addCimObject<K extends typeof i7SchemaKeyDefinitions, KN extends keyof typeof i7SchemaKeyDefinitions & string>(uuid: string, object: any, typeOfKey?: KN, dbKey?: K[KN]): void;
     /**
      * convertNsgVariante
@@ -154,5 +154,7 @@ export declare class DLConverterI7 {
     private adjustTransformerTerminalPositions;
     private createTerminalDiagramObjectFromPoints;
     private alreadyExported;
+    linkIntegralId2UUIDMap(integralID2UUID: Map<number, string>): void;
+    private getCimObjectIdFromDbKey;
 }
 export {};