Use upserts instead of appending SAP instances

trento-project · Aug 1, 2023 · 475fe2f · 475fe2f
1 parent e530e90
commit 475fe2f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 38 deletions.
diff --git a/assets/js/state/databases.js b/assets/js/state/databases.js
@@ -1,5 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
-import { filterByInstances, maybeUpdateInstanceHealth } from './instances';
+import { upsertInstances, maybeUpdateInstanceHealth } from './instances';
 
 const initialState = {
   loading: false,
@@ -27,14 +27,11 @@ export const databasesListSlice = createSlice({
     appendDatabase: (state, action) => {
       state.databases = [...state.databases, action.payload];
     },
-    appendDatabaseInstance: (state, action) => {
-      state.databaseInstances = [...state.databaseInstances, action.payload];
-    },
     upsertDatabaseInstances: (state, action) => {
-      state.databaseInstances = filterByInstances(
+      state.databaseInstances = upsertInstances(
         state.databaseInstances,
         action.payload
-      ).concat(action.payload);
+      );
     },
     removeDatabase: (state, { payload: { id } }) => {
       state.databases = state.databases.filter(
@@ -123,7 +120,6 @@ export const {
   appendDatabase,
   removeDatabase,
   removeDatabaseInstance,
-  appendDatabaseInstance,
   upsertDatabaseInstances,
   updateDatabaseHealth,
   updateDatabaseInstanceHealth,

diff --git a/assets/js/state/instances.js b/assets/js/state/instances.js
@@ -3,13 +3,16 @@ const payloadMatchesInstance = (payload, instance) =>
   payload.host_id === instance.host_id &&
   payload.instance_number === instance.instance_number;
 
-export const filterByInstances = (currentInstances, newInstances) =>
+const filterByInstances = (currentInstances, newInstances) =>
   currentInstances.filter((currentInstance) =>
     newInstances.every(
       (newInstance) => !payloadMatchesInstance(newInstance, currentInstance)
     )
   );
 
+export const upsertInstances = (currentInstances, newInstances) =>
+  filterByInstances(currentInstances, newInstances).concat(newInstances);
+
 export const maybeUpdateInstanceHealth = (payload, instance) => {
   if (payloadMatchesInstance(payload, instance)) {
     instance.health = payload.health;

diff --git a/assets/js/state/sagas/databases.js b/assets/js/state/sagas/databases.js
@@ -9,7 +9,6 @@ import {
   DATABASE_INSTANCE_HEALTH_CHANGED,
   DATABASE_INSTANCE_SYSTEM_REPLICATION_CHANGED,
   appendDatabase,
-  appendDatabaseInstance,
   upsertDatabaseInstances,
   updateDatabaseHealth,
   updateDatabaseInstanceHealth,
@@ -19,7 +18,7 @@ import {
 } from '@state/databases';
 
 import {
-  appendDatabaseInstanceToSapSystem,
+  upsertDatabaseInstancesToSapSystem,
   removeDatabaseInstanceFromSapSystem,
   updateSAPSystemDatabaseInstanceHealth,
   updateSAPSystemDatabaseInstanceSystemReplication,
@@ -52,8 +51,8 @@ function* databaseHealthChanged({ payload }) {
 }
 
 function* databaseInstanceRegistered({ payload }) {
-  yield put(appendDatabaseInstance(payload));
-  yield put(appendDatabaseInstanceToSapSystem(payload));
+  yield put(upsertDatabaseInstances([payload]));
+  yield put(upsertDatabaseInstancesToSapSystem([payload]));
   yield put(
     notify({
       text: `A new Database instance, ${payload.sid}, has been discovered.`,

diff --git a/assets/js/state/sagas/sapSystems.js b/assets/js/state/sagas/sapSystems.js
@@ -11,9 +11,8 @@ import {
   SAP_SYSTEM_UPDATED,
   appendSapsystem,
   updateSapSystemHealth,
-  upsertDatabaseInstances,
+  upsertDatabaseInstancesToSapSystem,
   upsertApplicationInstances,
-  appendApplicationInstance,
   removeApplicationInstance,
   updateApplicationInstanceHost,
   updateApplicationInstanceHealth,
@@ -47,7 +46,7 @@ function* sapSystemHealthChanged({ payload }) {
 }
 
 function* applicationInstanceRegistered({ payload }) {
-  yield put(appendApplicationInstance(payload));
+  yield put(upsertApplicationInstances([payload]));
 }
 
 export function* applicationInstanceMoved({ payload }) {
@@ -93,7 +92,7 @@ export function* sapSystemRestored({ payload }) {
     application_instances: applicationInstances,
   } = payload;
 
-  yield put(upsertDatabaseInstances(databaseInstances));
+  yield put(upsertDatabaseInstancesToSapSystem(databaseInstances));
   yield put(upsertApplicationInstances(applicationInstances));
 
   yield put(

diff --git a/assets/js/state/sagas/sapSystems.test.js b/assets/js/state/sagas/sapSystems.test.js
@@ -9,7 +9,7 @@ import {
 import {
   appendSapsystem,
   removeSAPSystem,
-  upsertDatabaseInstances,
+  upsertDatabaseInstancesToSapSystem,
   updateApplicationInstanceHost,
   upsertApplicationInstances,
   removeApplicationInstance,
@@ -42,7 +42,7 @@ describe('SAP Systems sagas', () => {
 
     expect(dispatched).toEqual([
       appendSapsystem(sapSystem),
-      upsertDatabaseInstances(sapSystem.database_instances),
+      upsertDatabaseInstancesToSapSystem(sapSystem.database_instances),
       upsertApplicationInstances(sapSystem.application_instances),
       notify({
         text: `SAP System, ${sapSystem.sid}, has been restored.`,

diff --git a/assets/js/state/sapSystems.js b/assets/js/state/sapSystems.js
@@ -1,5 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
-import { filterByInstances, maybeUpdateInstanceHealth } from './instances';
+import { upsertInstances, maybeUpdateInstanceHealth } from './instances';
 
 const initialState = {
   loading: false,
@@ -39,17 +39,11 @@ export const sapSystemsListSlice = createSlice({
     },
     // When a new ApplicationInstanceRegistered comes in,
     // it need to be appended to the list of the application instances of the relative sap system
-    appendApplicationInstance: (state, action) => {
-      state.applicationInstances = [
-        ...state.applicationInstances,
-        action.payload,
-      ];
-    },
     upsertApplicationInstances: (state, action) => {
-      state.applicationInstances = filterByInstances(
+      state.applicationInstances = upsertInstances(
         state.applicationInstances,
         action.payload
-      ).concat(action.payload);
+      );
     },
     removeApplicationInstance: (
       state,
@@ -66,14 +60,11 @@ export const sapSystemsListSlice = createSlice({
     },
     // When a new DatabaseInstanceRegistered comes in,
     // it need to be appended to the list of the database instances of the relative sap system
-    appendDatabaseInstanceToSapSystem: (state, action) => {
-      state.databaseInstances = [...state.databaseInstances, action.payload];
-    },
-    upsertDatabaseInstances: (state, action) => {
-      state.databaseInstances = filterByInstances(
+    upsertDatabaseInstancesToSapSystem: (state, action) => {
+      state.databaseInstances = upsertInstances(
         state.databaseInstances,
         action.payload
-      ).concat(action.payload);
+      );
     },
     removeDatabaseInstanceFromSapSystem: (
       state,
@@ -195,11 +186,9 @@ export const {
   stopSapSystemsLoading,
   setSapSystems,
   appendSapsystem,
-  appendApplicationInstance,
   upsertApplicationInstances,
   removeApplicationInstance,
-  appendDatabaseInstanceToSapSystem,
-  upsertDatabaseInstances,
+  upsertDatabaseInstancesToSapSystem,
   removeDatabaseInstanceFromSapSystem,
   updateSapSystemHealth,
   updateApplicationInstanceHost,

diff --git a/assets/js/state/sapSystems.test.js b/assets/js/state/sapSystems.test.js
@@ -1,6 +1,6 @@
 import sapSystemsReducer, {
   removeSAPSystem,
-  upsertDatabaseInstances,
+  upsertDatabaseInstancesToSapSystem,
   upsertApplicationInstances,
   updateApplicationInstanceHost,
   removeApplicationInstance,
@@ -130,7 +130,7 @@ describe('SAP Systems reducer', () => {
     const newInstance = databaseInstanceFactory.build();
     const newInstances = [updatedInstance, newInstance];
 
-    const action = upsertDatabaseInstances(newInstances);
+    const action = upsertDatabaseInstancesToSapSystem(newInstances);
 
     const expectedState = {
       databaseInstances: [initialInstances[1], ...newInstances],