Change domain event class to WarStatusChanged because there's no difference between war start and end. We'll need to keep track of active wars to know if it's war or peace event.

Author: dysk

app/models/pitboss_entry.rb

@@ -40,9 +40,9 @@ def entry_to_domain_event
         Game::CityFounded.new(data: { slot: value.to_i, game_id: game_name }),
         stream_name: "Game$#{game_name}"
       )
-    when "WarDeclared"
+    when "WarStatusChanged"
       event_store.publish(
-        Game::WarDeclared.new(data: { slot: value.to_i, game_id: game_name }),
+        Game::WarStatusChanged.new(data: { slot: value.to_i, game_id: game_name }),
         stream_name: "Game$#{game_name}"
       )
     when "CityConquered"

config/initializers/rails_event_store.rb

@@ -26,7 +26,7 @@
           .new(logger: Rails.logger, event_store: Rails.configuration.event_store)
           .call(event)
       end,
-      to: [Game::NewTurnStarted, Game::PlayerDisconnected, Game::TimerReset, Game::CityFounded, Game::WarDeclared, Game::CityConquered]
+      to: [Game::NewTurnStarted, Game::PlayerDisconnected, Game::TimerReset, Game::CityFounded, Game::WarStatusChanged, Game::CityConquered]
     )
     client.subscribe(
       -> (event) do

game/lib/game.rb

@@ -12,7 +12,7 @@ module Game
   PlayerSlotfhulnessIncreased = Class.new(DomainEvent)
   TimerReset = Class.new(DomainEvent)
   CityFounded = Class.new(DomainEvent)
-  WarDeclared = Class.new(DomainEvent)
+  WarStatusChanged = Class.new(DomainEvent)
   CityConquered = Class.new(DomainEvent)
 
   HostGame = Struct.new(:game_id, :turn_timer)

game/spec/spec_helper.rb

@@ -17,7 +17,7 @@ def event_store
         )
         client.subscribe(
           -> (event) { Notifications::SlackNotifier.new(logger: Rails.logger, event_store: client).call(event) },
-          to: [Game::NewTurnStarted, Game::PlayerDisconnected, Game::CityFounded, Game::WarDeclared, Game::CityConquered]
+          to: [Game::NewTurnStarted, Game::PlayerDisconnected, Game::CityFounded, Game::WarStatusChanged, Game::CityConquered]
         )
       end
   end

logs_parser/lib/logs_parser.rb

@@ -37,7 +37,7 @@ def call(line)
           return Result.new(game_name, "CityFounded", player_number, timestamp)
         elsif war_declared?(line)
           player_number = line.match(/Net RECV \((\d+)\)/)[1]
-          return Result.new(game_name, "WarDeclared", player_number, timestamp)
+          return Result.new(game_name, "WarStatusChanged", player_number, timestamp)
         elsif city_conquered?(line)
           player_number = line.match(/Net RECV \((\d+)\)/)[1]
           return Result.new(game_name, "CityConquered", player_number, timestamp)

logs_parser/spec/service_spec.rb

@@ -97,10 +97,10 @@
     expect(result).to be_nil
   end
 
-  specify "war declared" do
+  specify "war status changed" do
     parser = LogsParser::Service.new("arkency_test", 6)
     result = parser.call("[674000.151] Net RECV (0) :NetChangeWar : Change War, rival team is 33\n")
-    expect_result(result, game_name: "arkency_test", entry_type: "WarDeclared", data: "0", timestamp: "674000.151")
+    expect_result(result, game_name: "arkency_test", entry_type: "WarStatusChanged", data: "0", timestamp: "674000.151")
   end
 
   specify "city conquered via puppet" do

notifications/lib/notifications/slack_notifier.rb

@@ -17,8 +17,8 @@ def call(event)
         notify_about_timer_reset(event)
       when Game::CityFounded
         notify_game_event(event, "A new city has been founded in far away land")
-      when Game::WarDeclared
-        notify_game_event(event, "A war has been declared in far away land")
+      when Game::WarStatusChanged
+        notify_game_event(event, "War status has changed in far away land")
       when Game::CityConquered
         notify_game_event(event, "A city has been conquered in far away land")
       end

notifications/spec/notifications/slack_notifier_spec.rb

@@ -176,14 +176,14 @@ def given(*domain_events)
       expect(stub).to have_been_requested
     end
 
-    specify("war declared notification") do
+    specify("war status changed notification") do
       game_read_model
-      event = Game::WarDeclared.new(data: {slot: 0, game_id: game_id})
+      event = Game::WarStatusChanged.new(data: {slot: 0, game_id: game_id})
       stub = stub_request(:post, "https://slack.com/api/chat.postMessage")
         .with(
           body: {
             "channel" => "#arkency58",
-            "text" => "A war has been declared in far away land"
+            "text" => "War status has changed in far away land"
           },
           headers: {
             "Authorization" => "Bearer xoxb-302139800755-nR1O848GLyVS5ZfNNMpBLm0b",

notifications/spec/spec_helper.rb

@@ -17,7 +17,7 @@ def event_store
         .tap do |client|
           client.subscribe(
             ->(event) { Notifications::SlackNotifier.new(logger: Rails.logger, event_store: client).call(event) },
-            to:  [Game::NewTurnStarted, Game::PlayerDisconnected, Game::TimerReset, Game::CityFounded, Game::WarDeclared, Game::CityConquered]
+            to:  [Game::NewTurnStarted, Game::PlayerDisconnected, Game::TimerReset, Game::CityFounded, Game::WarStatusChanged, Game::CityConquered]
           )
           client.subscribe(
             ->(event) { ReadModel::GameReadModelUpdater.new(logger: Rails.logger).call(event) },

spec/domain_events_from_entries_spec.rb

@@ -59,10 +59,10 @@ def event_store
     expect(event_store).to(have_published(an_event(Game::CityFounded).with_data(slot: 0, game_id: "dummy")))
   end
 
-  specify("WarDeclared") do
-    PitbossEntry.create(timestamp: 0, value: 0, entry_type: "WarDeclared", game_name: "dummy")
+  specify("WarStatusChanged") do
+    PitbossEntry.create(timestamp: 0, value: 0, entry_type: "WarStatusChanged", game_name: "dummy")
 
-    expect(event_store).to(have_published(an_event(Game::WarDeclared).with_data(slot: 0, game_id: "dummy")))
+    expect(event_store).to(have_published(an_event(Game::WarStatusChanged).with_data(slot: 0, game_id: "dummy")))
   end
 
   specify("CityConquered") do