Fix SR status broadcast on database instance registration

lib/trento/application/projectors/database_projector.ex

@@ -226,13 +226,23 @@ defmodule Trento.DatabaseProjector do
   def after_update(
         %DatabaseInstanceRegistered{},
         _,
-        %{database_instance: %DatabaseInstanceReadModel{} = instance}
+        %{database_instance: %DatabaseInstanceReadModel{sap_system_id: sap_system_id} = instance}
       ) do
+    # All database instances are required to compute the system replication status in the current instance
+    database_instances =
+      DatabaseInstanceReadModel
+      |> where([i], i.sap_system_id == ^sap_system_id)
+      |> Repo.all()
+
     TrentoWeb.Endpoint.broadcast(
       @databases_topic,
       "database_instance_registered",
-      SapSystemView.render("database_instance.json",
-        instance: instance
+      SapSystemView.render(
+        "database_instance_with_sr_status.json",
+        %{
+          instance: instance,
+          database_instances: database_instances
+        }
       )
     )
   end

lib/trento/domain/sap_system/sap_system.ex

@@ -195,10 +195,6 @@ defmodule Trento.Domain.SapSystem do
       )
       when not is_nil(deregistered_at) do
     [
-      %DatabaseRestored{
-        sap_system_id: sap_system_id,
-        health: health
-      },
       %DatabaseInstanceRegistered{
         sap_system_id: sap_system_id,
         sid: sid,
@@ -213,6 +209,10 @@ defmodule Trento.Domain.SapSystem do
         system_replication: system_replication,
         system_replication_status: system_replication_status,
         health: health
+      },
+      %DatabaseRestored{
+        sap_system_id: sap_system_id,
+        health: health
       }
     ]
   end

lib/trento_web/views/v1/sap_system_view.ex

@@ -28,6 +28,15 @@ defmodule TrentoWeb.V1.SapSystemView do
     |> Map.delete(:host)
   end
 
+  def render("database_instance_with_sr_status.json", %{
+        instance: instance,
+        database_instances: database_instances
+      }) do
+    "database_instance.json"
+    |> render(%{instance: instance})
+    |> add_system_replication_status(database_instances)
+  end
+
   def render("database_registered.json", %{database: database}) do
     database
     |> Map.from_struct()
@@ -152,32 +161,43 @@ defmodule TrentoWeb.V1.SapSystemView do
   defp add_system_replication_status_to_secondary_instance(
          %{database_instances: database_instances} = sap_system
        ) do
-    system_replication_status =
-      Enum.find_value(database_instances, fn
-        %{
-          system_replication: "Primary",
-          system_replication_status: system_replication_status
-        } ->
-          system_replication_status
-
-        _ ->
-          false
-      end)
+    system_replication_status = get_system_replication_status(database_instances)
 
     database_instances =
-      Enum.map(database_instances, fn
-        %{
-          system_replication: "Secondary"
-        } = instance ->
-          %{instance | system_replication_status: system_replication_status}
+      Enum.map(
+        database_instances,
+        &map_system_replication_status_to_secondary(&1, system_replication_status)
+      )
 
-        %{system_replication: "Primary"} = instance ->
-          %{instance | system_replication_status: ""}
+    Map.put(sap_system, :database_instances, database_instances)
+  end
 
-        instance ->
-          instance
-      end)
+  defp add_system_replication_status(instance, database_instances) do
+    system_replication_status = get_system_replication_status(database_instances)
+    map_system_replication_status_to_secondary(instance, system_replication_status)
+  end
 
-    Map.put(sap_system, :database_instances, database_instances)
+  defp get_system_replication_status(database_instances) do
+    Enum.find_value(database_instances, fn
+      %{
+        system_replication: "Primary",
+        system_replication_status: system_replication_status
+      } ->
+        system_replication_status
+
+      _ ->
+        false
+    end)
   end
+
+  defp map_system_replication_status_to_secondary(
+         %{system_replication: "Secondary"} = instance,
+         system_replication_status
+       ),
+       do: %{instance | system_replication_status: system_replication_status}
+
+  defp map_system_replication_status_to_secondary(%{system_replication: "Primary"} = instance, _),
+    do: %{instance | system_replication_status: ""}
+
+  defp map_system_replication_status_to_secondary(instance, _), do: instance
 end

test/e2e/cypress/e2e/databases_overview.cy.js

@@ -36,9 +36,9 @@ context('Databases Overview', () => {
       cy.contains('div', hdqDatabase.instances[1].name).should('exist');
     });
 
-    it.skip('should show the ACTIVE pill in the right host', () => {
+    it('should show the ACTIVE pill in the right host', () => {
       hdqDatabase.instances.forEach((instance) => {
-        cy.contains('div', instance.name).within(() => {
+        cy.contains('div.table-row', instance.name).within(() => {
           if (instance.state === 'ACTIVE') {
             cy.contains('ACTIVE').should('exist');
           } else {

test/trento/application/projectors/database_projector_test.exs

@@ -73,7 +73,14 @@ defmodule Trento.DatabaseProjectorTest do
 
   test "should project a new database instance when DatabaseInstanceRegistered event is received" do
     insert(:database, id: sap_system_id = Faker.UUID.v4())
-    event = build(:database_instance_registered_event, sap_system_id: sap_system_id)
+
+    event =
+      build(
+        :database_instance_registered_event,
+        sap_system_id: sap_system_id,
+        system_replication: "",
+        system_replication_status: ""
+      )
 
     ProjectorTestHelper.project(DatabaseProjector, event, "database_projector")
 
@@ -82,9 +89,7 @@ defmodule Trento.DatabaseProjectorTest do
       sid: sid,
       features: features,
       host_id: host_id,
-      tenant: tenant,
-      system_replication: system_replication,
-      system_replication_status: system_replication_status
+      tenant: tenant
     } =
       database_instance_projection =
       Repo.get_by(DatabaseInstanceReadModel,
@@ -99,11 +104,6 @@ defmodule Trento.DatabaseProjectorTest do
     assert event.instance_number == database_instance_projection.instance_number
     assert event.features == database_instance_projection.features
     assert event.host_id == database_instance_projection.host_id
-    assert event.system_replication == database_instance_projection.system_replication
-
-    assert event.system_replication_status ==
-             database_instance_projection.system_replication_status
-
     assert event.health == database_instance_projection.health
 
     assert_broadcast "database_instance_registered",
@@ -118,13 +118,62 @@ defmodule Trento.DatabaseProjectorTest do
                        instance_number: "00",
                        sap_system_id: ^sap_system_id,
                        start_priority: "0.3",
-                       system_replication: ^system_replication,
-                       system_replication_status: ^system_replication_status,
+                       system_replication: "",
+                       system_replication_status: "",
                        tenant: ^tenant
                      },
                      1000
   end
 
+  test "should project a new database instance as Primary" do
+    insert(:database, id: sap_system_id = Faker.UUID.v4())
+
+    event =
+      build(
+        :database_instance_registered_event,
+        sap_system_id: sap_system_id,
+        system_replication: "Primary",
+        system_replication_status: "ACTIVE"
+      )
+
+    ProjectorTestHelper.project(DatabaseProjector, event, "database_projector")
+
+    assert_broadcast "database_instance_registered",
+                     %{
+                       system_replication: "Primary",
+                       system_replication_status: ""
+                     },
+                     1000
+  end
+
+  test "should project a new database instance as Secondary" do
+    %{id: sap_system_id} = insert(:database)
+
+    insert(
+      :database_instance,
+      sap_system_id: sap_system_id,
+      system_replication: "Primary",
+      system_replication_status: "ACTIVE"
+    )
+
+    event =
+      build(
+        :database_instance_registered_event,
+        sap_system_id: sap_system_id,
+        system_replication: "Secondary",
+        system_replication_status: ""
+      )
+
+    ProjectorTestHelper.project(DatabaseProjector, event, "database_projector")
+
+    assert_broadcast "database_instance_registered",
+                     %{
+                       system_replication: "Secondary",
+                       system_replication_status: "ACTIVE"
+                     },
+                     1000
+  end
+
   test "should update the system replication when DatabaseInstanceSystemReplicationChanged is received" do
     %{
       sap_system_id: sap_system_id,

test/trento/domain/sap_system/sap_system_test.exs

@@ -2001,10 +2001,6 @@ defmodule Trento.SapSystemTest do
         initial_events,
         command,
         [
-          %DatabaseRestored{
-            sap_system_id: sap_system_id,
-            health: command.health
-          },
           %DatabaseInstanceRegistered{
             sap_system_id: sap_system_id,
             sid: db_sid,
@@ -2019,6 +2015,10 @@ defmodule Trento.SapSystemTest do
             system_replication: command.system_replication,
             system_replication_status: command.system_replication_status,
             health: command.health
+          },
+          %DatabaseRestored{
+            sap_system_id: sap_system_id,
+            health: command.health
           }
         ],
         fn sap_system ->
@@ -2138,10 +2138,6 @@ defmodule Trento.SapSystemTest do
         initial_events,
         command,
         [
-          %DatabaseRestored{
-            sap_system_id: sap_system_id,
-            health: command.health
-          },
           %DatabaseInstanceRegistered{
             sap_system_id: sap_system_id,
             sid: db_sid,
@@ -2156,6 +2152,10 @@ defmodule Trento.SapSystemTest do
             system_replication: command.system_replication,
             system_replication_status: command.system_replication_status,
             health: command.health
+          },
+          %DatabaseRestored{
+            sap_system_id: sap_system_id,
+            health: command.health
           }
         ],
         fn sap_system ->
@@ -2277,10 +2277,6 @@ defmodule Trento.SapSystemTest do
         initial_events,
         command,
         [
-          %DatabaseRestored{
-            sap_system_id: sap_system_id,
-            health: command.health
-          },
           %DatabaseInstanceRegistered{
             sap_system_id: sap_system_id,
             sid: db_sid,
@@ -2295,6 +2291,10 @@ defmodule Trento.SapSystemTest do
             system_replication: command.system_replication,
             system_replication_status: command.system_replication_status,
             health: command.health
+          },
+          %DatabaseRestored{
+            sap_system_id: sap_system_id,
+            health: command.health
           }
         ],
         fn sap_system ->
@@ -2410,10 +2410,6 @@ defmodule Trento.SapSystemTest do
         initial_events,
         command,
         [
-          %DatabaseRestored{
-            sap_system_id: sap_system_id,
-            health: command.health
-          },
           %DatabaseInstanceRegistered{
             sap_system_id: sap_system_id,
             sid: db_sid,
@@ -2428,6 +2424,10 @@ defmodule Trento.SapSystemTest do
             system_replication: command.system_replication,
             system_replication_status: command.system_replication_status,
             health: command.health
+          },
+          %DatabaseRestored{
+            sap_system_id: sap_system_id,
+            health: command.health
           }
         ],
         fn sap_system ->