Add support for 3 new game events - CityFounded, WarDeclared and CityConquered.

Author: dysk

app/models/pitboss_entry.rb

@@ -35,6 +35,21 @@ def entry_to_domain_event
         Game::TimerReset.new(data: { slot: value.to_i, game_id: game_name }),
         stream_name: "Game$#{game_name}"
       )
+    when "CityFounded"
+      event_store.publish(
+        Game::CityFounded.new(data: { slot: value.to_i, game_id: game_name }),
+        stream_name: "Game$#{game_name}"
+      )
+    when "WarDeclared"
+      event_store.publish(
+        Game::WarDeclared.new(data: { slot: value.to_i, game_id: game_name }),
+        stream_name: "Game$#{game_name}"
+      )
+    when "CityConquered"
+      event_store.publish(
+        Game::CityConquered.new(data: { slot: value.to_i, game_id: game_name }),
+        stream_name: "Game$#{game_name}"
+      )
     end
   end
 end

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]
+      to: [Game::NewTurnStarted, Game::PlayerDisconnected, Game::TimerReset, Game::CityFounded, Game::WarDeclared, Game::CityConquered]
     )
     client.subscribe(
       -> (event) do

game/lib/game.rb

@@ -11,6 +11,9 @@ module Game
   PlayerUnregistered = Class.new(DomainEvent)
   PlayerSlotfhulnessIncreased = Class.new(DomainEvent)
   TimerReset = Class.new(DomainEvent)
+  CityFounded = Class.new(DomainEvent)
+  WarDeclared = Class.new(DomainEvent)
+  CityConquered = Class.new(DomainEvent)
 
   HostGame = Struct.new(:game_id, :turn_timer)
   RegisterPlayer = Struct.new(:game_id, :player_id, :slot_id)

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]
+          to: [Game::NewTurnStarted, Game::PlayerDisconnected, Game::CityFounded, Game::WarDeclared, Game::CityConquered]
         )
       end
   end

logs_parser/lib/logs_parser.rb

@@ -32,6 +32,15 @@ def call(line)
         elsif timer_reset?(line)
           player_number = line.scan(/\d/)[-3]
           return Result.new(game_name, "TimerReset", player_number, timestamp)
+        elsif city_founded?(line)
+          player_number = line.match(/who is (\d+)/)[1]
+          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)
+        elsif city_conquered?(line)
+          player_number = line.match(/Net RECV \((\d+)\)/)[1]
+          return Result.new(game_name, "CityConquered", player_number, timestamp)
         end
       end
     end
@@ -42,7 +51,9 @@ def call(line)
 
     def contains_relevant_data?(line)
       line.match(/DBG: Game Turn/) || line.match(/:NetTurnComplete/) || line.match(/NetTurnUnready/) ||
-        line.match(/NetPlayerReady/) || line.match(/ConnectionClosed Player\(\d\)/) || line.match(/:NetGiftUnit.+UnitID=-1/)
+        line.match(/NetPlayerReady/) || line.match(/ConnectionClosed Player\(\d\)/) || line.match(/:NetGiftUnit.+UnitID=-1/) ||
+        line.match(/mission is Found City/) || line.match(/:NetChangeWar/) ||
+        line.match(/TASK_CREATE_PUPPET|TASK_ANNEX|TASK_RAZE/)
     end
 
     def split_log_line(line)
@@ -74,6 +85,18 @@ def player_disconnected?(line)
     def timer_reset?(line)
       line.match(/:NetGiftUnit.+UnitID=-1/)
     end
+
+    def city_founded?(line)
+      line.match(/mission is Found City/)
+    end
+
+    def war_declared?(line)
+      line.match(/:NetChangeWar/)
+    end
+
+    def city_conquered?(line)
+      line.match(/TASK_CREATE_PUPPET|TASK_ANNEX|TASK_RAZE/)
+    end
   end
 
   class HttpAdapter

logs_parser/spec/service_spec.rb

@@ -85,6 +85,42 @@
     expect_result(result, game_name: "arkency_test", entry_type: "TimerReset", data: "1", timestamp: "3540015.559")
   end
 
+  specify "city founded" do
+    parser = LogsParser::Service.new("arkency_test", 6)
+    result = parser.call("[672732.150] Net RECV (0) :NetPushMission : Do Mission, who is 0, unit ID is 8192 (Settler), mission is Found City, data1=-1, data2=-1, shift=false\n")
+    expect_result(result, game_name: "arkency_test", entry_type: "CityFounded", data: "0", timestamp: "672732.150")
+  end
+
+  specify "city founded ignores settler move" do
+    parser = LogsParser::Service.new("arkency_test", 6)
+    result = parser.call("[672732.150] Net RECV (0) :NetPushMission : Do Mission, who is 0, unit ID is 8192 (Settler), mission is Move, data1=41, data2=32, shift=false\n")
+    expect(result).to be_nil
+  end
+
+  specify "war declared" 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")
+  end
+
+  specify "city conquered via puppet" do
+    parser = LogsParser::Service.new("arkency_test", 6)
+    result = parser.call("[674043.151] Net RECV (0) :NetDoTask : City ID 16385 (TXT_KEY_CITYSTATE_KUWAIT), doing task 19 (TASK_CREATE_PUPPET), data1 -1, data2 -1\n")
+    expect_result(result, game_name: "arkency_test", entry_type: "CityConquered", data: "0", timestamp: "674043.151")
+  end
+
+  specify "city conquered via annex" do
+    parser = LogsParser::Service.new("arkency_test", 6)
+    result = parser.call("[674043.151] Net RECV (0) :NetDoTask : City ID 16385 (TXT_KEY_CITY_NAME_WARSAW), doing task 20 (TASK_ANNEX), data1 -1, data2 -1\n")
+    expect_result(result, game_name: "arkency_test", entry_type: "CityConquered", data: "0", timestamp: "674043.151")
+  end
+
+  specify "city conquered via raze" do
+    parser = LogsParser::Service.new("arkency_test", 6)
+    result = parser.call("[674043.151] Net RECV (0) :NetDoTask : City ID 16385 (TXT_KEY_CITY_NAME_BERLIN), doing task 21 (TASK_RAZE), data1 -1, data2 -1\n")
+    expect_result(result, game_name: "arkency_test", entry_type: "CityConquered", data: "0", timestamp: "674043.151")
+  end
+
   private
 
   def expect_result(result, game_name:, entry_type:, data:, timestamp:)

notifications/lib/notifications/slack_notifier.rb

@@ -15,6 +15,12 @@ def call(event)
         maybe_notify_remaining_players(event)
       when Game::TimerReset
         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::CityConquered
+        notify_game_event(event, "A city has been conquered in far away land")
       end
     rescue => e
       error_message = "Error in Notifications::SlackNotifier: #{e.inspect}"
@@ -62,6 +68,16 @@ def notify_about_timer_reset(event)
       )
     end
 
+    def notify_game_event(event, message)
+      game = ReadModel::GameReadModel.find_by(id: event.data[:game_id])
+      return unless game && game.slack_token
+      CustomSlackClient.post_message(
+        channel: game.slack_channel,
+        text: message,
+        token: game.slack_token
+      )
+    end
+
     attr_reader :logger, :event_store
   end
 end

notifications/spec/notifications/slack_notifier_spec.rb

@@ -155,6 +155,69 @@ def given(*domain_events)
       expect(stub1).to have_been_requested
     end
 
+    specify("city founded notification") do
+      game_read_model
+      event = Game::CityFounded.new(data: {slot: 0, game_id: game_id})
+      stub = stub_request(:post, "https://slack.com/api/chat.postMessage")
+        .with(
+          body: {
+            "channel" => "#arkency58",
+            "text" => "A new city has been founded in far away land"
+          },
+          headers: {
+            "Authorization" => "Bearer xoxb-302139800755-nR1O848GLyVS5ZfNNMpBLm0b",
+            "Accept" => "application/json; charset=utf-8",
+            "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
+            "Content-Type" => "application/json"
+          }
+        )
+        .to_return(status: 200, body: {ok: true}.to_json, headers: {})
+      event_store.publish(event, stream_name: game_id)
+      expect(stub).to have_been_requested
+    end
+
+    specify("war declared notification") do
+      game_read_model
+      event = Game::WarDeclared.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"
+          },
+          headers: {
+            "Authorization" => "Bearer xoxb-302139800755-nR1O848GLyVS5ZfNNMpBLm0b",
+            "Accept" => "application/json; charset=utf-8",
+            "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
+            "Content-Type" => "application/json"
+          }
+        )
+        .to_return(status: 200, body: {ok: true}.to_json, headers: {})
+      event_store.publish(event, stream_name: game_id)
+      expect(stub).to have_been_requested
+    end
+
+    specify("city conquered notification") do
+      game_read_model
+      event = Game::CityConquered.new(data: {slot: 0, game_id: game_id})
+      stub = stub_request(:post, "https://slack.com/api/chat.postMessage")
+        .with(
+          body: {
+            "channel" => "#arkency58",
+            "text" => "A city has been conquered in far away land"
+          },
+          headers: {
+            "Authorization" => "Bearer xoxb-302139800755-nR1O848GLyVS5ZfNNMpBLm0b",
+            "Accept" => "application/json; charset=utf-8",
+            "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
+            "Content-Type" => "application/json"
+          }
+        )
+        .to_return(status: 200, body: {ok: true}.to_json, headers: {})
+      event_store.publish(event, stream_name: game_id)
+      expect(stub).to have_been_requested
+    end
+
     specify("timer reset notification") do
       player_1 = Player.create!(steam_name: "some_player", slack_name: "slack_user")
       game = game_read_model

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]
+            to:  [Game::NewTurnStarted, Game::PlayerDisconnected, Game::TimerReset, Game::CityFounded, Game::WarDeclared, Game::CityConquered]
           )
           client.subscribe(
             ->(event) { ReadModel::GameReadModelUpdater.new(logger: Rails.logger).call(event) },

spec/domain_events_from_entries_spec.rb

@@ -52,4 +52,22 @@ def event_store
 
     expect(event_store).to(have_published(an_event(Game::TimerReset).with_data(slot: 5, game_id: "dummy")))
   end
+
+  specify("CityFounded") do
+    PitbossEntry.create(timestamp: 0, value: 0, entry_type: "CityFounded", game_name: "dummy")
+
+    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")
+
+    expect(event_store).to(have_published(an_event(Game::WarDeclared).with_data(slot: 0, game_id: "dummy")))
+  end
+
+  specify("CityConquered") do
+    PitbossEntry.create(timestamp: 0, value: 0, entry_type: "CityConquered", game_name: "dummy")
+
+    expect(event_store).to(have_published(an_event(Game::CityConquered).with_data(slot: 0, game_id: "dummy")))
+  end
 end