fix(connectors): filter up-to-date connectors only

OptimistikSAS · Sep 8, 2023 · 0e5f40d · 0e5f40d
1 parent d73b4d1
commit 0e5f40d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/backend/src/repository/north-connector.repository.spec.ts b/backend/src/repository/north-connector.repository.spec.ts
@@ -28,7 +28,7 @@ describe('North connector repository', () => {
       {
         id: 'id1',
         name: 'north1',
-        type: 'NorthConnector',
+        type: 'oianalytics',
         description: 'My north connector',
         enabled: true,
         settings: {},
@@ -49,7 +49,7 @@ describe('North connector repository', () => {
       {
         id: 'id2',
         name: 'north2',
-        type: 'NorthConnector',
+        type: 'oianalytics',
         description: 'My second north connector',
         enabled: true,
         settings: {},
@@ -72,7 +72,7 @@ describe('North connector repository', () => {
       {
         id: 'id1',
         name: 'north1',
-        type: 'NorthConnector',
+        type: 'oianalytics',
         description: 'My north connector',
         enabled: true,
         settings: JSON.stringify({}),
@@ -89,7 +89,7 @@ describe('North connector repository', () => {
       {
         id: 'id2',
         name: 'north2',
-        type: 'NorthConnector',
+        type: 'oianalytics',
         description: 'My second north connector',
         enabled: true,
         settings: JSON.stringify({}),

diff --git a/backend/src/repository/north-connector.repository.ts b/backend/src/repository/north-connector.repository.ts
@@ -43,7 +43,8 @@ export default class NorthConnectorRepository {
           enabled: result.archiveEnabled,
           retentionDuration: result.archiveRetentionDuration
         }
-      }));
+      }))
+      .filter(result => ['aws-s3', 'azure-blob', 'console', 'file-writer', 'oianalytics', 'oibus', 'rest-api'].includes(result.type));
   }
 
   /**

diff --git a/backend/src/repository/south-connector.repository.spec.ts b/backend/src/repository/south-connector.repository.spec.ts
@@ -28,7 +28,7 @@ describe('South connector repository', () => {
       {
         id: 'id1',
         name: 'south1',
-        type: 'SouthConnector',
+        type: 'oianalytics',
         description: 'My south connector',
         enabled: true,
         history: {
@@ -41,7 +41,7 @@ describe('South connector repository', () => {
       {
         id: 'id2',
         name: 'south2',
-        type: 'SouthConnector',
+        type: 'oianalytics',
         description: 'My second south connector',
         enabled: true,
         history: {
@@ -56,7 +56,7 @@ describe('South connector repository', () => {
       {
         id: 'id1',
         name: 'south1',
-        type: 'SouthConnector',
+        type: 'oianalytics',
         description: 'My south connector',
         enabled: true,
         maxInstantPerItem: true,
@@ -67,7 +67,7 @@ describe('South connector repository', () => {
       {
         id: 'id2',
         name: 'south2',
-        type: 'SouthConnector',
+        type: 'oianalytics',
         description: 'My second south connector',
         enabled: true,
         maxInstantPerItem: false,
@@ -88,7 +88,7 @@ describe('South connector repository', () => {
     const expectedValue: SouthConnectorDTO = {
       id: 'id1',
       name: 'south1',
-      type: 'SouthConnector',
+      type: 'oianalytics',
       description: 'My south connector',
       enabled: true,
       history: {
@@ -101,7 +101,7 @@ describe('South connector repository', () => {
     get.mockReturnValueOnce({
       id: 'id1',
       name: 'south1',
-      type: 'SouthConnector',
+      type: 'oianalytics',
       description: 'My south connector',
       enabled: true,
       maxInstantPerItem: false,

diff --git a/backend/src/repository/south-connector.repository.ts b/backend/src/repository/south-connector.repository.ts
@@ -32,7 +32,24 @@ export default class SouthConnectorRepository {
           readDelay: result.readDelay
         },
         settings: JSON.parse(result.settings)
-      }));
+      }))
+      .filter(result =>
+        [
+          'ads',
+          'folder-scanner',
+          'modbus',
+          'mqtt',
+          'mssql',
+          'mysql',
+          'odbc',
+          'oianalytics',
+          'opcua',
+          'oracle',
+          'postgresql',
+          'slims',
+          'sqlite'
+        ].includes(result.type)
+      );
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,8 @@ export default class NorthConnectorRepository { @@
               enabled: result.archiveEnabled,
               retentionDuration: result.archiveRetentionDuration
             }
-          }));
+          }))
+          .filter(result => ['aws-s3', 'azure-blob', 'console', 'file-writer', 'oianalytics', 'oibus', 'rest-api'].includes(result.type));
       }
       /**
@@ Expand Down @@