fix: fix north items and add tests coverage after rebase

OptimistikSAS · Jan 3, 2025 · 039bb25 · 039bb25
1 parent c11002b
commit 039bb25
Show file tree

Hide file tree

Showing 26 changed files with 2,003 additions and 110 deletions.
diff --git a/backend/src/engine/data-stream-engine.spec.ts b/backend/src/engine/data-stream-engine.spec.ts
@@ -352,7 +352,7 @@ describe('DataStreamEngine', () => {
     expect(mockedNorth1.retryAllErrorValues).toHaveBeenCalledWith();
   });
 
-  it('should manage item change', async () => {
+  it('should manage south item change', async () => {
     await engine.start([], [mockedSouth1]);
 
     await engine.reloadSouthItems('bad id');
@@ -361,6 +361,15 @@ describe('DataStreamEngine', () => {
     expect(mockedSouth1.onItemChange).toHaveBeenCalled();
   });
 
+  it('should manage north item change', async () => {
+    await engine.start([mockedNorth1], []);
+
+    await engine.reloadNorthItems('bad id');
+    expect(mockedNorth1.onItemChange).not.toHaveBeenCalled();
+    await engine.reloadNorthItems(testData.north.list[0].id);
+    expect(mockedNorth1.onItemChange).toHaveBeenCalled();
+  });
+
   it('should update north subscriptions', async () => {
     await engine.start([mockedNorth1, mockedNorth2], [mockedSouth1]);
 

diff --git a/backend/src/engine/data-stream-engine.ts b/backend/src/engine/data-stream-engine.ts
@@ -377,6 +377,10 @@ export default class DataStreamEngine {
     await this.southConnectors.get(southId)?.onItemChange();
   }
 
+  async reloadNorthItems(northId: string): Promise<void> {
+    await this.northConnectors.get(northId)?.onItemChange();
+  }
+
   async reloadSouth(southConnector: SouthConnectorEntity<SouthSettings, SouthItemSettings>) {
     await this.stopSouth(southConnector.id);
     const south = this.southConnectors.get(southConnector.id);

diff --git a/backend/src/index.ts b/backend/src/index.ts
@@ -128,6 +128,7 @@ const LOG_DB_NAME = 'logs.db';
     repositoryService.southConnectorRepository,
     repositoryService.northMetricsRepository,
     repositoryService.scanModeRepository,
+    repositoryService.transformerRepository,
     repositoryService.logRepository,
     repositoryService.certificateRepository,
     repositoryService.oianalyticsRegistrationRepository,
@@ -142,6 +143,7 @@ const LOG_DB_NAME = 'logs.db';
     repositoryService.southMetricsRepository,
     repositoryService.southCacheRepository,
     repositoryService.scanModeRepository,
+    repositoryService.transformerRepository,
     repositoryService.oianalyticsRegistrationRepository,
     repositoryService.certificateRepository,
     oIAnalyticsMessageService,

diff --git a/backend/src/model/oianalytics-command.model.ts b/backend/src/model/oianalytics-command.model.ts
@@ -5,7 +5,7 @@ import { ScanModeCommandDTO } from '../../shared/model/scan-mode.model';
 import { SouthConnectorCommandDTO } from '../../shared/model/south-connector.model';
 import { SouthItemSettings, SouthSettings } from '../../shared/model/south-settings.model';
 import { NorthConnectorCommandDTO } from '../../shared/model/north-connector.model';
-import { NorthSettings } from '../../shared/model/north-settings.model';
+import { NorthItemSettings, NorthSettings } from '../../shared/model/north-settings.model';
 
 export interface BaseOIBusCommand extends BaseEntity {
   type: OIBusCommandType;
@@ -85,13 +85,13 @@ export interface OIBusDeleteSouthConnectorCommand extends BaseOIBusCommand {
 export interface OIBusCreateNorthConnectorCommand extends BaseOIBusCommand {
   type: 'create-north';
   northConnectorId: string | null; // used to retrieve passwords in case of duplicate
-  commandContent: NorthConnectorCommandDTO<NorthSettings>;
+  commandContent: NorthConnectorCommandDTO<NorthSettings, NorthItemSettings>;
 }
 
 export interface OIBusUpdateNorthConnectorCommand extends BaseOIBusCommand {
   type: 'update-north';
   northConnectorId: string;
-  commandContent: NorthConnectorCommandDTO<NorthSettings>;
+  commandContent: NorthConnectorCommandDTO<NorthSettings, NorthItemSettings>;
 }
 
 export interface OIBusDeleteNorthConnectorCommand extends BaseOIBusCommand {

diff --git a/backend/src/north/north-connector.spec.ts b/backend/src/north/north-connector.spec.ts
@@ -691,4 +691,9 @@ describe('NorthConnector test', () => {
   it('should check if North caches are empty', async () => {
     expect(await north.isCacheEmpty()).toBeFalsy();
   });
+
+  it('should manage item changes', async () => {
+    await north.onItemChange();
+    expect(northConnectorRepository.findAllItemsForNorth).toHaveBeenCalled();
+  });
 });
diff --git a/backend/src/north/north-connector.ts b/backend/src/north/north-connector.ts
@@ -652,6 +652,13 @@ export default abstract class NorthConnector<T extends NorthSettings, I extends
     await this.valueCacheService.retryAllErrorValues();
   }
 
+  /**
+   * Reset on item changes
+   */
+  async onItemChange(): Promise<void> {
+    this.connector.items = this.northConnectorRepository.findAllItemsForNorth(this.connector.id);
+  }
+
   async updateScanMode(scanMode: ScanMode): Promise<void> {
     if (this.cronByScanModeIds.get(scanMode.id)) {
       this.createCronJob(scanMode);