Update DatabaseRestored and DatabaseInstanceRegistered events order

trento-project · Aug 1, 2023 · 75e0166 · 75e0166
1 parent 0a065fc
commit 75e0166
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/lib/trento/domain/sap_system/sap_system.ex b/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

diff --git a/test/trento/domain/sap_system/sap_system_test.exs b/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 ->