Preload database instances during database restoration

trento-project · Jul 31, 2023 · 160f81b · 160f81b
1 parent baf724e
commit 160f81b
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 5 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 { maybeUpdateInstanceHealth } from './instances';
+import { filterByInstances, maybeUpdateInstanceHealth } from './instances';
 
 const initialState = {
   loading: false,
@@ -30,6 +30,12 @@ export const databasesListSlice = createSlice({
     appendDatabaseInstance: (state, action) => {
       state.databaseInstances = [...state.databaseInstances, action.payload];
     },
+    upsertDatabaseInstances: (state, action) => {
+      state.databaseInstances = filterByInstances(
+        state.databaseInstances,
+        action.payload
+      ).concat(action.payload);
+    },
     removeDatabase: (state, { payload: { id } }) => {
       state.databases = state.databases.filter(
         (database) => database.id !== id
@@ -118,6 +124,7 @@ export const {
   removeDatabase,
   removeDatabaseInstance,
   appendDatabaseInstance,
+  upsertDatabaseInstances,
   updateDatabaseHealth,
   updateDatabaseInstanceHealth,
   updateDatabaseInstanceSystemReplication,

diff --git a/assets/js/state/databases.test.js b/assets/js/state/databases.test.js
@@ -1,6 +1,7 @@
 import databaseReducer, {
   removeDatabase,
   removeDatabaseInstance,
+  upsertDatabaseInstances,
 } from '@state/databases';
 import {
   databaseFactory,
@@ -47,4 +48,29 @@ describe('Databases reducer', () => {
 
     expect(databaseReducer(initialState, action)).toEqual(expectedState);
   });
+
+  it('should upsert database instances', () => {
+    const changedIndex = 0;
+
+    const initialState = {
+      databaseInstances: databaseInstanceFactory.buildList(2),
+    };
+
+    const updatedInstance = {
+      ...initialState.databaseInstances[changedIndex],
+      instance_hostname: 'my_name_has_changed',
+    };
+    const newInstance = databaseInstanceFactory.build();
+    const newInstances = [updatedInstance, newInstance];
+
+    const action = upsertDatabaseInstances(newInstances);
+
+    const expectedState = {
+      databaseInstances: initialState.databaseInstances
+        .filter((_instance, index) => index !== changedIndex)
+        .concat(newInstances),
+    };
+
+    expect(databaseReducer(initialState, action)).toEqual(expectedState);
+  });
 });
diff --git a/assets/js/state/sagas/databases.js b/assets/js/state/sagas/databases.js
@@ -10,6 +10,7 @@ import {
   DATABASE_INSTANCE_SYSTEM_REPLICATION_CHANGED,
   appendDatabase,
   appendDatabaseInstance,
+  upsertDatabaseInstances,
   updateDatabaseHealth,
   updateDatabaseInstanceHealth,
   updateDatabaseInstanceSystemReplication,
@@ -73,6 +74,7 @@ export function* databaseDeregistered({ payload }) {
 
 export function* databaseRestored({ payload }) {
   yield put(appendDatabase(payload));
+  yield put(upsertDatabaseInstances(payload.database_instances));
   yield put(
     notify({
       text: `The database ${payload.sid} has been restored.`,

diff --git a/assets/js/state/sagas/databases.test.js b/assets/js/state/sagas/databases.test.js
@@ -5,6 +5,7 @@ import {
   databaseRestored,
 } from '@state/sagas/databases';
 import {
+  upsertDatabaseInstances,
   removeDatabase,
   removeDatabaseInstance,
   appendDatabase,
@@ -70,6 +71,7 @@ describe('SAP Systems sagas', () => {
 
     expect(dispatched).toEqual([
       appendDatabase(database),
+      upsertDatabaseInstances(database.database_instances),
       notify({
         text: `The database ${database.sid} has been restored.`,
         icon: 'ℹ️',

diff --git a/lib/trento/application/projectors/database_projector.ex b/lib/trento/application/projectors/database_projector.ex
@@ -302,7 +302,7 @@ defmodule Trento.DatabaseProjector do
     database =
       DatabaseReadModel
       |> Repo.get!(sap_system_id)
-      |> Repo.preload([:tags])
+      |> Repo.preload([:tags, :database_instances])
 
     TrentoWeb.Endpoint.broadcast(
       @databases_topic,

diff --git a/lib/trento_web/views/v1/sap_system_view.ex b/lib/trento_web/views/v1/sap_system_view.ex
@@ -40,7 +40,6 @@ defmodule TrentoWeb.V1.SapSystemView do
     database
     |> Map.from_struct()
     |> Map.delete(:__meta__)
-    |> Map.delete(:database_instances)
   end
 
   def render("database_health_changed.json", %{health: health}), do: health

diff --git a/test/trento/application/projectors/database_projector_test.exs b/test/trento/application/projectors/database_projector_test.exs
@@ -318,6 +318,11 @@ defmodule Trento.DatabaseProjectorTest do
         health: :critical
       )
 
+    insert(:database_instance_without_host, sap_system_id: sap_system_id)
+    |> Map.from_struct()
+    |> Map.delete(:__meta__)
+    |> Map.delete(:host)
+
     insert_list(5, :tag, resource_id: sap_system_id)
 
     event = %DatabaseRestored{
@@ -327,11 +332,11 @@ defmodule Trento.DatabaseProjectorTest do
 
     ProjectorTestHelper.project(DatabaseProjector, event, "database_projector")
 
-    %{tags: tags} =
+    %{tags: tags, database_instances: database_instances} =
       projection =
       DatabaseReadModel
       |> Repo.get(sap_system_id)
-      |> Repo.preload([:tags])
+      |> Repo.preload([:tags, :database_instances])
 
     assert nil == projection.deregistered_at
     assert :passing == projection.health
@@ -341,6 +346,7 @@ defmodule Trento.DatabaseProjectorTest do
                        health: :passing,
                        id: ^sap_system_id,
                        sid: "NWD",
+                       database_instances: ^database_instances,
                        tags: ^tags
                      },
                      1000