feat: mysql based index implemented

FraunhoferIOSB · Dec 30, 2023 · 2f7fdec · 2f7fdec
1 parent f5a73a1
commit 2f7fdec
Show file tree

Hide file tree

Showing 23 changed files with 29,804 additions and 33,974 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -29,7 +29,8 @@
                 "WEB_ROOT": "projects/aas-portal/dist",
                 "ASSETS": "projects/aas-server/src/assets",
                 "USER_STORAGE": "mongodb://localhost:27017/aasportal-users",
-                "ENDPOINTS": "[\"file:///samples?name=Samples\",\"http://localhost:5001?name=AASXServer&type=AasxServer\"]"
+                "ENDPOINTS": "[\"file:///samples?name=Samples\",\"http://localhost:5001?name=AASXServer&type=AasxServer\"]",
+                // "AAS_INDEX": "mysql://aasportal:aas-server@localhost:3306"
             }
         },
         {

diff --git a/aasportal.mdx b/aasportal.mdx
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
   "dependencies": {
     "@ngrx/component-store": "^16.3.0",
     "lowdb": "^6.1.1",
+    "mysql2": "^3.6.5",
     "uninstall": "^0.0.0"
   }
 }
diff --git a/projects/aas-portal/src/app/start/favorites-form/favorites-form.store.ts b/projects/aas-portal/src/app/start/favorites-form/favorites-form.store.ts
@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
+
 import { Injectable } from '@angular/core';
 import { ComponentStore } from '@ngrx/component-store';
 
@@ -47,4 +55,4 @@ export class FavoritesFormStore extends ComponentStore<FavoritesFormState> {
             return { ...state, items };
         });
     }
-}
+}
diff --git a/projects/aas-portal/src/app/start/start.reducer.ts b/projects/aas-portal/src/app/start/start.reducer.ts
@@ -60,7 +60,6 @@ function addTree(state: StartState, nodes: AASDocument[]): StartState {
 }
 
 function setPage(state: StartState, page: AASPage, limit: number | undefined, filter: string | undefined): StartState {
-    console.debug(`setPage(...)`);
     return {
         ...state,
         viewMode: ViewMode.List,
@@ -70,7 +69,6 @@ function setPage(state: StartState, page: AASPage, limit: number | undefined, fi
         documents: page.documents,
         isFirstPage: page.previous === null,
         isLastPage: page.next === null,
-        totalCount: page.totalCount,
     };
 }
 

diff --git a/projects/aas-portal/src/test/start/start.component.spec.ts b/projects/aas-portal/src/test/start/start.component.spec.ts
@@ -75,7 +75,6 @@ describe('StartComponent', () => {
             previous: null,
             next: null,
             documents: [],
-            totalCount: 0,
         }));
 
         api.getContent.and.returnValue(of({

diff --git a/projects/aas-server/src/app/aas-provider/aas-index-factory.ts b/projects/aas-server/src/app/aas-provider/aas-index-factory.ts
@@ -14,6 +14,7 @@ import { AASIndex } from './aas-index.js';
 import { LowDbIndex } from './lowdb/lowdb-index.js';
 import { Variable } from '../variable.js';
 import { LowDbData } from './lowdb/lowdb-types.js';
+import { MySqlIndex } from './mysql/mysql-index.js';
 
 export class AASIndexFactory {
     constructor(
@@ -22,6 +23,15 @@ export class AASIndexFactory {
 
     public create(): AASIndex {
         const variable = this.container.resolve(Variable);
+        if (variable.AAS_INDEX) {
+            const url = new URL(variable.AAS_INDEX);
+            if (url.protocol === 'mysql:') {
+                return new MySqlIndex(variable);
+            }
+
+            throw new Error('Not implemented.');
+        }
+
         const dbFile = path.join(variable.CONTENT_ROOT, 'db.json');
         const db = new Low<LowDbData>(new JSONFile(dbFile), { documents: [], endpoints: [], elements: [] });
         return new LowDbIndex(db, variable);