pg_eventstore 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a69951bc18bd74869eb843b9e017a1c1f238bfc17750400e30b99f7d7b9f2d
-  data.tar.gz: 56ce94941096227944e8d5f11b9c7f9ca2f1fd816ad477cb02abe58604945c47
+  metadata.gz: b824856ac1174e2aa2431388e12cd2997256ad4a5638c319d22ee1863c24f4ea
+  data.tar.gz: 64f73d163abf7a80e9384483857ab1d2cfd38da6d98f2d8f7552a24ac8a7fb3c
 SHA512:
-  metadata.gz: f2f682990d1450b874e3d1ad9cf68e3e1cf7dcd546c78bb101982c5a03c5f355f31101442b2dd9a2c59531535e02eff01b12b119c79beca331f7262e927ebe5c
-  data.tar.gz: 2b2624a388eba5772c6a3bdd601ffe6fbcdb3c08c0d3c4585c1dfcf03862cf94f19e39db453950294f1a5a01a35e5ee33c975632c7ba6a2c966fcb85ff6dbb5d
+  metadata.gz: c37a3572d224ed2706bf31d416da5bdfb91f37323225fd1f60f060eb76cd96ff33907055f32924cc6d155aa8abae44056e1f982eff560dcca27b70f0c43afa3e
+  data.tar.gz: 891b7a1e7697b31f53964aeacfe9ae516294421c63e9a7d7095b0bd9489b5cf56ef9101639317cd5894d2f4e7f72b51be6ea14c9b7e5c238aaee2e25379d7a7b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [1.1.0]
+- Add "Reset position" button on Subscriptions Admin UI page
+
+**Note** This release includes a migration to support new functional. Please don't forget to run `rake pg_eventstore:migrate` to apply latest db changes.
+
 ## [1.0.4]
 - Fix bug which caused slow Subscriptions to stop processing new events
 - Optimize Subscriptions update queries

data/README.md

@@ -5,7 +5,8 @@ Implements database and API to store and read events in event sourced systems.
 ## Requirements
 
 - `pg_eventstore` requires a PostgreSQL database with jsonb data type support (which means you need to have v9.2+). However it is recommended to use a non [EOL](https://www.postgresql.org/support/versioning/) PostgreSQL version, because the development of this gem is targeted at current PostgreSQL versions. 
-- It is recommend you to have the default value set for `default_transaction_isolation` PostgreSQL config setting(`"read committed"`) as the implementation relies on it. All other transaction isolation levels(`"repeatable read"` and `"serializable"`) may cause unexpected serialization errors which you will have to handle by yourself(e.g. by always wrapping your code using [`#multiple`](docs/multiple_commands.md)).
+- It is recommended you to have the default value set for `default_transaction_isolation` PostgreSQL config setting(`"read committed"`) as the implementation relies on it. All other transaction isolation levels(`"repeatable read"` and `"serializable"`) may cause unexpected serialization errors.
+- It is recommended to use a connection pooler (for example [PgBouncer](https://www.pgbouncer.org/)) in `transaction` pool mode to lower the load on a database.
 - `pg_eventstore` requires ruby v3+. The development of this gem is targeted at [current](https://endoflife.date/ruby) ruby versions.
 
 ## Installation

data/db/migrations/6_add_commands_data.sql

@@ -0,0 +1,2 @@
+ALTER TABLE subscription_commands ADD COLUMN data jsonb DEFAULT '{}'::jsonb;
+ALTER TABLE subscriptions_set_commands ADD COLUMN data jsonb DEFAULT '{}'::jsonb;

data/docs/configuration.md

@@ -116,8 +116,3 @@ end
 
 Taking this into account you may want to increase `connection_pool_size` up to the number of your application's threads(
 or subscriptions).
-
-### Usage of external connection pooler
-
-`pg_eventstore` does not use any session-specific features of PostgreSQL. You can use any PostgreSQL connection pooler
-you like, such as [PgBouncer](https://www.pgbouncer.org/) for example. 

data/lib/pg_eventstore/queries.rb

@@ -5,10 +5,6 @@ require_relative 'query_builders/events_filtering_query'
 require_relative 'queries/transaction_queries'
 require_relative 'queries/event_queries'
 require_relative 'queries/partition_queries'
-require_relative 'queries/subscription_queries'
-require_relative 'queries/subscriptions_set_queries'
-require_relative 'queries/subscription_command_queries'
-require_relative 'queries/subscriptions_set_command_queries'
 require_relative 'queries/links_resolver'
 
 module PgEventstore

data/lib/pg_eventstore/stream.rb

@@ -72,6 +72,8 @@ module PgEventstore
       hash == another.hash
     end
 
+    # @param other_stream [Stream]
+    # @return [Boolean]
     def ==(other_stream)
       return false unless other_stream.is_a?(Stream)
 

data/lib/pg_eventstore/subscriptions/basic_runner.rb

@@ -182,6 +182,16 @@ module PgEventstore
       @state.to_s
     end
 
+    # @param state [Symbol]
+    # @return [Object] a result of evaluating of passed block
+    def within_state(state, &blk)
+      synchronize do
+        return unless @state.public_send("#{RunnerState::STATES.fetch(state)}?")
+
+        yield
+      end
+    end
+
     private
 
     def synchronize

data/lib/pg_eventstore/subscriptions/command_handlers/subscription_feeder_commands.rb

@@ -3,8 +3,6 @@
 module PgEventstore
   module CommandHandlers
     class SubscriptionFeederCommands
-      AVAILABLE_COMMANDS = %i[StopAll StartAll Restore Stop].to_h { [_1, _1.to_s] }.freeze
-
       # @param config_name [Symbol]
       # @param subscription_feeder [PgEventstore::SubscriptionFeeder]
       def initialize(config_name, subscription_feeder)
@@ -16,15 +14,8 @@ module PgEventstore
       # @return [void]
       def process
         queries.find_commands(@subscription_feeder.id).each do |command|
-          unless AVAILABLE_COMMANDS.values.include?(command[:name])
-            PgEventstore.logger&.warn(
-              "#{self.class.name}: Don't know how to handle #{command[:name].inspect}. Details: #{command.inspect}."
-            )
-            next
-          end
-          send(Utils.underscore_str(command[:name]))
-        ensure
-          queries.delete(command[:id])
+          command.exec_cmd(@subscription_feeder)
+          queries.delete(command.id)
         end
       end
 
@@ -39,22 +30,6 @@ module PgEventstore
       def connection
         PgEventstore.connection(@config_name)
       end
-
-      def stop_all
-        @subscription_feeder.stop_all
-      end
-
-      def start_all
-        @subscription_feeder.start_all
-      end
-
-      def restore
-        @subscription_feeder.restore
-      end
-
-      def stop
-        @subscription_feeder.stop
-      end
     end
   end
 end

data/lib/pg_eventstore/subscriptions/command_handlers/subscription_runners_commands.rb

@@ -3,30 +3,21 @@
 module PgEventstore
   module CommandHandlers
     class SubscriptionRunnersCommands
-      AVAILABLE_COMMANDS = %i[Start Stop Restore].to_h { [_1, _1.to_s] }.freeze
-
       # @param config_name [Symbol]
       # @param runners [Array<PgEventstore::SubscriptionRunner>]
       # @param subscriptions_set_id [Integer]
       def initialize(config_name, runners, subscriptions_set_id)
         @config_name = config_name
-        @runners = runners
+        @runners = runners.to_h { |runner| [runner.id, runner] }
         @subscriptions_set_id = subscriptions_set_id
       end
 
       # Look up commands for all given SubscriptionRunner-s and execute them
       # @return [void]
       def process
-        queries.find_commands(@runners.map(&:id), subscriptions_set_id: @subscriptions_set_id).each do |command|
-          unless AVAILABLE_COMMANDS.values.include?(command[:name])
-            PgEventstore.logger&.warn(
-              "#{self.class.name}: Don't know how to handle #{command[:name].inspect}. Details: #{command.inspect}."
-            )
-            next
-          end
-          send(Utils.underscore_str(command[:name]), command[:subscription_id])
-        ensure
-          queries.delete(command[:id])
+        queries.find_commands(@runners.keys, subscriptions_set_id: @subscriptions_set_id).each do |command|
+          command.exec_cmd(@runners[command.subscription_id]) if @runners[command.subscription_id]
+          queries.delete(command.id)
         end
       end
 
@@ -41,30 +32,6 @@ module PgEventstore
       def connection
         PgEventstore.connection(@config_name)
       end
-
-      # @param subscription_id [Integer]
-      # @return [PgEventstore::SubscriptionRunner, nil]
-      def find_subscription_runner(subscription_id)
-        @runners.find { |runner| runner.id == subscription_id }
-      end
-
-      # @param subscription_id [Integer]
-      # @return [void]
-      def start(subscription_id)
-        find_subscription_runner(subscription_id)&.start
-      end
-
-      # @param subscription_id [Integer]
-      # @return [void]
-      def restore(subscription_id)
-        find_subscription_runner(subscription_id)&.restore
-      end
-
-      # @param subscription_id [Integer]
-      # @return [void]
-      def stop(subscription_id)
-        find_subscription_runner(subscription_id)&.stop_async
-      end
     end
   end
 end

data/lib/pg_eventstore/subscriptions/commands_handler.rb

@@ -11,7 +11,7 @@ module PgEventstore
     extend Forwardable
 
     RESTART_DELAY = 5 # seconds
-    PULL_INTERVAL = 1
+    PULL_INTERVAL = 1 # seconds
 
     def_delegators :@basic_runner, :start, :stop, :state, :stop_async, :wait_for_finish
 

data/lib/pg_eventstore/subscriptions/events_processor.rb

@@ -7,7 +7,8 @@ module PgEventstore
     include Extensions::CallbacksExtension
     extend Forwardable
 
-    def_delegators :@basic_runner, :state, :start, :stop, :wait_for_finish, :stop_async, :restore, :running?
+    def_delegators :@basic_runner, :state, :start, :stop, :wait_for_finish, :stop_async, :restore, :running?,
+                   :within_state
 
     # @param handler [#call]
     def initialize(handler)
@@ -22,8 +23,10 @@ module PgEventstore
     def feed(raw_events)
       raise EmptyChunkFedError.new("Empty chunk was fed!") if raw_events.empty?
 
-      callbacks.run_callbacks(:feed, global_position(raw_events.last))
-      @raw_events.push(*raw_events)
+      within_state(:running) do
+        callbacks.run_callbacks(:feed, global_position(raw_events.last))
+        @raw_events.push(*raw_events)
+      end
     end
 
     # Number of unprocessed events which are currently in a queue
@@ -32,6 +35,11 @@ module PgEventstore
       @raw_events.size
     end
 
+    # @return [void]
+    def clear_chunk
+      @raw_events.clear
+    end
+
     private
 
     # @param raw_event [Hash]

data/lib/pg_eventstore/subscriptions/extensions/base_command_extension.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module Extensions
+    module BaseCommandExtension
+      def self.included(klass)
+        super
+        klass.extend(ClassMethods)
+
+        # Detects whether command is a known command. Known commands are commands, inherited from Base class.
+        # @return [Boolean]
+        klass.define_singleton_method(:known_command?) do
+          self < klass
+        end
+      end
+
+      module ClassMethods
+        # @param data [Hash]
+        # @return [Hash]
+        def parse_data(data)
+          {}
+        end
+      end
+
+      # @return [Integer]
+      def hash
+        options_hash.hash
+      end
+
+      # @param another [Object]
+      # @return [Boolean]
+      def eql?(another)
+        return false unless another.is_a?(self.class)
+
+        hash == another.hash
+      end
+
+      # @param another [Object]
+      # @return [Boolean]
+      def ==(another)
+        return false unless another.is_a?(self.class)
+
+        options_hash == another.options_hash
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/extensions/command_class_lookup_extension.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module Extensions
+    module CommandClassLookupExtension
+      # @param cmd_name [String, Symbol]
+      # @return [Class]
+      def command_class(cmd_name)
+        const_get(cmd_name, false)
+      rescue NameError
+        self::Base
+      end
+    end
+  end
+end

data/lib/pg_eventstore/{queries → subscriptions/queries}/subscription_command_queries.rb

@@ -11,18 +11,22 @@ module PgEventstore
       @connection = connection
     end
 
-    # @see #find_by or #create for available arguments
-    # @return [Hash]
-    def find_or_create_by(...)
+    # @param subscription_id [Integer]
+    # @param subscriptions_set_id [Integer]
+    # @param command_name [String]
+    # @param data [Hash]
+    # @return [PgEventstore::SubscriptionRunnerCommands::Abstract]
+    def find_or_create_by(subscription_id:, subscriptions_set_id:, command_name:, data:)
       transaction_queries.transaction do
-        find_by(...) || create(...)
+        find_by(subscription_id: subscription_id, subscriptions_set_id: subscriptions_set_id, command_name: command_name) ||
+          create(subscription_id: subscription_id, subscriptions_set_id: subscriptions_set_id, command_name: command_name, data: data)
       end
     end
 
     # @param subscription_id [Integer]
     # @param subscriptions_set_id [Integer]
     # @param command_name [String]
-    # @return [Hash, nil]
+    # @return [PgEventstore::SubscriptionRunnerCommands::Abstract, nil]
     def find_by(subscription_id:, subscriptions_set_id:, command_name:)
       sql_builder =
         SQLBuilder.new.
@@ -43,22 +47,23 @@ module PgEventstore
     # @param subscription_id [Integer]
     # @param subscriptions_set_id [Integer]
     # @param command_name [String]
-    # @return [Hash]
-    def create(subscription_id:, subscriptions_set_id:, command_name:)
+    # @param data [Hash]
+    # @return [PgEventstore::SubscriptionRunnerCommands::Abstract]
+    def create(subscription_id:, subscriptions_set_id:, command_name:, data:)
       sql = <<~SQL
-        INSERT INTO subscription_commands (name, subscription_id, subscriptions_set_id) 
-          VALUES ($1, $2, $3)
+        INSERT INTO subscription_commands (name, subscription_id, subscriptions_set_id, data) 
+          VALUES ($1, $2, $3, $4)
           RETURNING *
       SQL
       pg_result = connection.with do |conn|
-        conn.exec_params(sql, [command_name, subscription_id, subscriptions_set_id])
+        conn.exec_params(sql, [command_name, subscription_id, subscriptions_set_id, data])
       end
       deserialize(pg_result.to_a.first)
     end
 
     # @param subscription_ids [Array<Integer>]
     # @param subscriptions_set_id [Integer]
-    # @return [Array<Hash>]
+    # @return [Array<PgEventstore::SubscriptionRunnerCommands::Abstract>]
     def find_commands(subscription_ids, subscriptions_set_id:)
       return [] if subscription_ids.empty?
 
@@ -93,9 +98,10 @@ module PgEventstore
     end
 
     # @param hash [Hash]
-    # @return [Hash]
+    # @return [PgEventstore::SubscriptionRunnerCommands::Base]
     def deserialize(hash)
-      hash.transform_keys(&:to_sym)
+      attrs = hash.transform_keys(&:to_sym)
+      SubscriptionRunnerCommands.command_class(attrs[:name]).new(**attrs)
     end
   end
 end

data/lib/pg_eventstore/{queries → subscriptions/queries}/subscriptions_set_command_queries.rb

@@ -11,16 +11,20 @@ module PgEventstore
       @connection = connection
     end
 
-    # @return [Hash]
-    def find_or_create_by(...)
+    # @param subscriptions_set_id [Integer]
+    # @param command_name [String]
+    # @param data [Hash]
+    # @return [PgEventstore::SubscriptionFeederCommands::Abstract]
+    def find_or_create_by(subscriptions_set_id:, command_name:, data:)
       transaction_queries.transaction do
-        find_by(...) || create(...)
+        find_by(subscriptions_set_id: subscriptions_set_id, command_name: command_name) ||
+          create(subscriptions_set_id: subscriptions_set_id, command_name: command_name, data: data)
       end
     end
 
     # @param subscriptions_set_id [Integer]
     # @param command_name [String]
-    # @return [Hash, nil]
+    # @return [PgEventstore::SubscriptionFeederCommands::Abstract, nil]
     def find_by(subscriptions_set_id:, command_name:)
       sql_builder =
         SQLBuilder.new.
@@ -37,21 +41,22 @@ module PgEventstore
 
     # @param subscriptions_set_id [Integer]
     # @param command_name [String]
-    # @return [Hash]
-    def create(subscriptions_set_id:, command_name:)
+    # @param data [Hash]
+    # @return [PgEventstore::SubscriptionFeederCommands::Abstract]
+    def create(subscriptions_set_id:, command_name:, data:)
       sql = <<~SQL
-        INSERT INTO subscriptions_set_commands (name, subscriptions_set_id) 
-          VALUES ($1, $2)
+        INSERT INTO subscriptions_set_commands (name, subscriptions_set_id, data) 
+          VALUES ($1, $2, $3)
           RETURNING *
       SQL
       pg_result = connection.with do |conn|
-        conn.exec_params(sql, [command_name, subscriptions_set_id])
+        conn.exec_params(sql, [command_name, subscriptions_set_id, data])
       end
       deserialize(pg_result.to_a.first)
     end
 
     # @param subscriptions_set_id [Integer]
-    # @return [Array<Hash>]
+    # @return [Array<PgEventstore::SubscriptionFeederCommands::Abstract>]
     def find_commands(subscriptions_set_id)
       sql_builder =
         SQLBuilder.new.select('*').
@@ -75,9 +80,10 @@ module PgEventstore
     private
 
     # @param hash [Hash]
-    # @return [Hash]
+    # @return [PgEventstore::SubscriptionFeederCommands::Base]
     def deserialize(hash)
-      hash.transform_keys(&:to_sym)
+      attrs = hash.transform_keys(&:to_sym)
+      SubscriptionFeederCommands.command_class(attrs[:name]).new(**attrs)
     end
 
     # @return [PgEventstore::TransactionQueries]

data/lib/pg_eventstore/subscriptions/subscription_feeder_commands/base.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionFeederCommands
+    # @!visibility private
+    class Base
+      include Extensions::OptionsExtension
+      include Extensions::BaseCommandExtension
+
+      # @!attribute id
+      #   @return [Integer]
+      attribute(:id)
+      # @!attribute name
+      #   @return [String]
+      attribute(:name) { self.class.name.split('::').last }
+      # @!attribute subscriptions_set_id
+      #   @return [Integer]
+      attribute(:subscriptions_set_id)
+      # @!attribute data
+      #   @return [Hash]
+      attribute(:data) { {} }
+      # @!attribute created_at
+      #   @return [Time]
+      attribute(:created_at)
+
+      # @param subscription_feeder [PgEventstore::SubscriptionFeeder]
+      # @return [void]
+      def exec_cmd(subscription_feeder)
+        # Implement it in the subclass
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_feeder_commands/restore.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionFeederCommands
+    # @!visibility private
+    class Restore < Base
+      # @param subscription_feeder [PgEventstore::SubscriptionFeeder]
+      # @return [void]
+      def exec_cmd(subscription_feeder)
+        subscription_feeder.restore
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_feeder_commands/start_all.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionFeederCommands
+    # @!visibility private
+    class StartAll < Base
+      # @param subscription_feeder [PgEventstore::SubscriptionFeeder]
+      # @return [void]
+      def exec_cmd(subscription_feeder)
+        subscription_feeder.start_all
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_feeder_commands/stop.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionFeederCommands
+    # @!visibility private
+    class Stop < Base
+      # @param subscription_feeder [PgEventstore::SubscriptionFeeder]
+      # @return [void]
+      def exec_cmd(subscription_feeder)
+        subscription_feeder.stop
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_feeder_commands/stop_all.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionFeederCommands
+    # @!visibility private
+    class StopAll < Base
+      # @param subscription_feeder [PgEventstore::SubscriptionFeeder]
+      # @return [void]
+      def exec_cmd(subscription_feeder)
+        subscription_feeder.stop_all
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_feeder_commands.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative 'subscription_feeder_commands/base'
+require_relative 'subscription_feeder_commands/restore'
+require_relative 'subscription_feeder_commands/start_all'
+require_relative 'subscription_feeder_commands/stop'
+require_relative 'subscription_feeder_commands/stop_all'
+
+module PgEventstore
+  # @!visibility private
+  module SubscriptionFeederCommands
+    extend Extensions::CommandClassLookupExtension
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_runner.rb

@@ -16,7 +16,8 @@ module PgEventstore
 
     attr_reader :subscription
 
-    def_delegators :@events_processor, :start, :stop, :stop_async, :feed, :wait_for_finish, :restore, :state, :running?
+    def_delegators :@events_processor, :start, :stop, :stop_async, :feed, :wait_for_finish, :restore, :state, :running?,
+                   :clear_chunk, :within_state
     def_delegators :@subscription, :lock!, :id
 
     # @param stats [PgEventstore::SubscriptionHandlerPerformance]

data/lib/pg_eventstore/subscriptions/subscription_runner_commands/base.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionRunnerCommands
+    # @!visibility private
+    class Base
+      include Extensions::OptionsExtension
+      include Extensions::BaseCommandExtension
+
+      # @!attribute id
+      #   @return [Integer]
+      attribute(:id)
+      # @!attribute name
+      #   @return [String]
+      attribute(:name) { self.class.name.split('::').last }
+      # @!attribute subscription_id
+      #   @return [Integer]
+      attribute(:subscription_id)
+      # @!attribute subscriptions_set_id
+      #   @return [Integer]
+      attribute(:subscriptions_set_id)
+      # @!attribute data
+      #   @return [Hash]
+      attribute(:data) { {} }
+      # @!attribute created_at
+      #   @return [Time]
+      attribute(:created_at)
+
+      # @param subscription_runner [PgEventstore::SubscriptionRunner]
+      # @return [void]
+      def exec_cmd(subscription_runner)
+        # Implement it in the subclass
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_runner_commands/reset_position.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionRunnerCommands
+    # @!visibility private
+    class ResetPosition < Base
+      class << self
+        # @param data [Hash]
+        # @return [Hash]
+        def parse_data(data)
+          { 'position' => Integer(data['position']) }
+        end
+      end
+
+      # @param subscription_runner [PgEventstore::SubscriptionRunner]
+      # @return [void]
+      def exec_cmd(subscription_runner)
+        subscription_runner.within_state(:stopped) do
+          subscription_runner.clear_chunk
+          subscription_runner.subscription.update(last_chunk_greatest_position: nil, current_position: data['position'])
+        end
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_runner_commands/restore.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionRunnerCommands
+    # @!visibility private
+    class Restore < Base
+      # @param subscription_runner [PgEventstore::SubscriptionRunner]
+      # @return [void]
+      def exec_cmd(subscription_runner)
+        subscription_runner.restore
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_runner_commands/start.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionRunnerCommands
+    # @!visibility private
+    class Start < Base
+      # @param subscription_runner [PgEventstore::SubscriptionRunner]
+      # @return [void]
+      def exec_cmd(subscription_runner)
+        subscription_runner.start
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_runner_commands/stop.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module SubscriptionRunnerCommands
+    # @!visibility private
+    class Stop < Base
+      # @param subscription_runner [PgEventstore::SubscriptionRunner]
+      # @return [void]
+      def exec_cmd(subscription_runner)
+        subscription_runner.stop_async
+      end
+    end
+  end
+end

data/lib/pg_eventstore/subscriptions/subscription_runner_commands.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative 'subscription_runner_commands/base'
+require_relative 'subscription_runner_commands/reset_position'
+require_relative 'subscription_runner_commands/restore'
+require_relative 'subscription_runner_commands/start'
+require_relative 'subscription_runner_commands/stop'
+
+module PgEventstore
+  # @!visibility private
+  module SubscriptionRunnerCommands
+    extend Extensions::CommandClassLookupExtension
+  end
+end

data/lib/pg_eventstore/subscriptions/subscriptions_manager.rb

@@ -1,15 +1,23 @@
 # frozen_string_literal: true
 
 require 'forwardable'
+require_relative 'runner_state'
 require_relative 'basic_runner'
 require_relative 'subscription'
 require_relative 'events_processor'
 require_relative 'subscription_handler_performance'
 require_relative 'subscription_runner'
-require_relative 'runner_state'
 require_relative 'subscriptions_set'
 require_relative 'subscription_runners_feeder'
 require_relative 'subscription_feeder'
+require_relative 'extensions/command_class_lookup_extension'
+require_relative 'extensions/base_command_extension'
+require_relative 'subscription_feeder_commands'
+require_relative 'subscription_runner_commands'
+require_relative 'queries/subscription_command_queries'
+require_relative 'queries/subscription_queries'
+require_relative 'queries/subscriptions_set_command_queries'
+require_relative 'queries/subscriptions_set_queries'
 require_relative 'commands_handler'
 
 module PgEventstore

data/lib/pg_eventstore/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgEventstore
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/lib/pg_eventstore/web/application.rb

@@ -145,19 +145,25 @@ module PgEventstore
       end
 
       post '/subscription_cmd/:set_id/:id/:cmd' do
-        puts SubscriptionCommandQueries.new(connection).find_or_create_by(
+        validate_subscription_cmd(params[:cmd])
+        cmd_class = SubscriptionRunnerCommands.command_class(params[:cmd])
+        SubscriptionCommandQueries.new(connection).find_or_create_by(
           subscriptions_set_id: params[:set_id],
           subscription_id: params[:id],
-          command_name: CommandHandlers::SubscriptionRunnersCommands::AVAILABLE_COMMANDS.fetch(params[:cmd].to_sym)
+          command_name: cmd_class.new.name,
+          data: cmd_class.parse_data(Hash(params[:data]))
         )
 
         redirect redirect_back_url(fallback_url: url('/subscriptions'))
       end
 
       post '/subscriptions_set_cmd/:id/:cmd' do
+        validate_subscriptions_set_cmd(params[:cmd])
+        cmd_class = SubscriptionFeederCommands.command_class(params[:cmd])
         SubscriptionsSetCommandQueries.new(connection).find_or_create_by(
           subscriptions_set_id: params[:id],
-          command_name: CommandHandlers::SubscriptionFeederCommands::AVAILABLE_COMMANDS.fetch(params[:cmd].to_sym)
+          command_name: cmd_class.new.name,
+          data: cmd_class.parse_data(Hash(params[:data]))
         )
 
         redirect redirect_back_url(fallback_url: url('/subscriptions'))

data/lib/pg_eventstore/web/public/javascripts/pg_eventstore.js

@@ -197,3 +197,21 @@ $(function(){
         handleMethod(e.target);
     });
 });
+
+// Reset position action handling
+$(function(){
+    "use strict";
+
+    let $resetPositionModal = $('#reset-position-modal');
+
+    $resetPositionModal.on('hide.bs.modal', function(){
+        $(this).find('.subscription-name').html('');
+        $(this).find('form').removeAttr('action');
+    });
+
+    $resetPositionModal.on('show.bs.modal', function(e){
+       let $clickedLink = $(e.relatedTarget);
+        $(this).find('.subscription-name').html($clickedLink.data('subscription-name'));
+        $(this).find('form').attr('action', $clickedLink.data('url'));
+    });
+});

data/lib/pg_eventstore/web/subscriptions/helpers.rb

@@ -28,14 +28,36 @@ module PgEventstore
           url("/subscriptions_set_cmd/#{id}/#{cmd}")
         end
 
-        # @return [Hash{Symbol => String}]
-        def subscriptions_set_cmds
-          CommandHandlers::SubscriptionFeederCommands::AVAILABLE_COMMANDS
+        # @param cmd_name [String] command name
+        # @return [String] command name
+        def subscriptions_set_cmd(cmd_name)
+          validate_subscriptions_set_cmd(cmd_name)
+
+          cmd_name
+        end
+
+        # @param cmd_name [String]
+        # @return [void]
+        # @raise [RuntimeError] in case if command class is not found
+        def validate_subscriptions_set_cmd(cmd_name)
+          cmd_class = SubscriptionFeederCommands.command_class(cmd_name)
+          raise "SubscriptionsSet command #{cmd_name.inspect} does not exist" unless cmd_class.known_command?
+        end
+
+        # @param cmd_name [String] command name
+        # @return [String] command name
+        def subscription_cmd(cmd_name)
+          validate_subscription_cmd(cmd_name)
+
+          cmd_name
         end
 
-        # @return [Hash{Symbol => String}]
-        def subscriptions_cmds
-          CommandHandlers::SubscriptionRunnersCommands::AVAILABLE_COMMANDS
+        # @param cmd_name [String]
+        # @return [void]
+        # @raise [RuntimeError] in case if command class is not found
+        def validate_subscription_cmd(cmd_name)
+          cmd_class = SubscriptionRunnerCommands.command_class(cmd_name)
+          raise "Subscription command #{cmd_name.inspect} does not exist" unless cmd_class.known_command?
         end
 
         # @param state [String]

data/lib/pg_eventstore/web/views/subscriptions/index.erb

@@ -69,12 +69,12 @@
                             <td><%= subscriptions_set.last_error_occurred_at %></td>
                             <td>
                               <% if subscriptions_set.state == PgEventstore::RunnerState::STATES[:dead] %>
-                                <a class="btn btn-success" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmds[:Restore]) %>">
+                                <a class="btn btn-success" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmd('Restore')) %>">
                                   Restore
                                 </a>
                               <% end %>
                               <% if PgEventstore::RunnerState::STATES.values_at(:running, :dead).include?(subscriptions_set.state) %>
-                                <a class="btn btn-warning" data-confirm="You are about to stop SubscriptionsSet#<%= subscriptions_set.id %>. This will also delete it and will result in stopping all related Subscriptions. Continue?" data-confirm-title="Stop SubscriptionsSet" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmds[:Stop]) %>" data-toggle="tooltip" title="This action will delete Subscriptions Set and release all related Subscriptions.">
+                                <a class="btn btn-warning" data-confirm="You are about to stop SubscriptionsSet#<%= subscriptions_set.id %>. This will also delete it and will result in stopping all related Subscriptions. Continue?" data-confirm-title="Stop SubscriptionsSet" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmd('Stop')) %>" data-toggle="tooltip" title="This action will delete Subscriptions Set and release all related Subscriptions.">
                                   Stop
                                 </a>
                               <% end %>
@@ -101,10 +101,10 @@
                       </div>
                       <div class="float-right">
                         <% if subscriptions_set.id %>
-                          <a class="btn btn-success" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmds[:StartAll]) %>">
+                          <a class="btn btn-success" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmd('StartAll')) %>">
                             Start All
                           </a>
-                          <a class="btn btn-danger" data-confirm="You are about to stop all Subscriptions. Continue?" data-confirm-title="Stop all Subscriptions" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmds[:StopAll]) %>">
+                          <a class="btn btn-danger" data-confirm="You are about to stop all Subscriptions. Continue?" data-confirm-title="Stop all Subscriptions" data-method="post" href="<%= subscriptions_set_cmd_url(subscriptions_set.id, subscriptions_set_cmd('StopAll')) %>">
                             Stop All
                           </a>
                         <% else %>
@@ -170,17 +170,20 @@
                             <td>
                               <% if subscriptions_set.id %>
                                 <% if subscription.state == PgEventstore::RunnerState::STATES[:stopped] %>
-                                  <a class="btn btn-success" data-method="post" href="<%= subscription_cmd_url(subscriptions_set.id, subscription.id, subscriptions_cmds[:Start]) %>">
+                                  <a class="btn btn-success" data-method="post" href="<%= subscription_cmd_url(subscriptions_set.id, subscription.id, subscription_cmd('Start')) %>">
                                     Start
                                   </a>
+                                  <a class="btn btn-warning" href="#" data-toggle="modal" data-target="#reset-position-modal" data-subscription-name="<%= h subscription.name %>" data-url="<%= subscription_cmd_url(subscriptions_set.id, subscription.id, subscription_cmd('ResetPosition')) %>">
+                                    Reset position
+                                  </a>
                                 <% end %>
                                 <% if PgEventstore::RunnerState::STATES.values_at(:running, :dead).include?(subscription.state) %>
-                                  <a class="btn btn-warning" data-method="post" href="<%= subscription_cmd_url(subscriptions_set.id, subscription.id, subscriptions_cmds[:Stop]) %>">
+                                  <a class="btn btn-warning" data-method="post" href="<%= subscription_cmd_url(subscriptions_set.id, subscription.id, subscription_cmd('Stop')) %>">
                                     Stop
                                   </a>
                                 <% end %>
                                 <% if subscription.state == PgEventstore::RunnerState::STATES[:dead] %>
-                                  <a class="btn btn-success" data-method="post" href="<%= subscription_cmd_url(subscriptions_set.id, subscription.id, subscriptions_cmds[:Restore]) %>">
+                                  <a class="btn btn-success" data-method="post" href="<%= subscription_cmd_url(subscriptions_set.id, subscription.id, subscription_cmd('Restore')) %>">
                                     Restore
                                   </a>
                                 <% end %>
@@ -218,3 +221,32 @@
     </div>
   </div>
 </div>
+
+<div class="modal fade" id="reset-position-modal" tabindex="-1" role="dialog" aria-labelledby="reset-position-modal" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"> Reset Subscription's position</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body font-weight-bold text-break">
+        <span>Reset position of</span><pre class="subscription-name"></pre><span>Subscription?</span>
+        <form id="reset-position-form" data-parsley-validate="" class="form-horizontal form-label-left" novalidate="" method="POST">
+          <div class="item form-group">
+            <label class="col-form-label col-md-3 col-sm-3 label-align" for="subscription-position">Position <span class="required">*</span>
+            </label>
+            <div class="col-md-6 col-sm-6 ">
+              <input type="number" id="subscription-position" name="data[position]" required="required" autocomplete="off" value="0" class="form-control">
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+        <button type="submit" class="btn btn-primary" form="reset-position-form">Reset</button>
+      </div>
+    </div>
+  </div>
+</div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_eventstore
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Ivan Dzyzenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-10 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -69,6 +69,7 @@ files:
 - db/migrations/3_create_subscription_commands.sql
 - db/migrations/4_create_subscriptions_set_commands.sql
 - db/migrations/5_partitions.sql
+- db/migrations/6_add_commands_data.sql
 - docs/appending_events.md
 - docs/configuration.md
 - docs/events_and_streams.md
@@ -107,10 +108,6 @@ files:
 - lib/pg_eventstore/queries/event_queries.rb
 - lib/pg_eventstore/queries/links_resolver.rb
 - lib/pg_eventstore/queries/partition_queries.rb
-- lib/pg_eventstore/queries/subscription_command_queries.rb
-- lib/pg_eventstore/queries/subscription_queries.rb
-- lib/pg_eventstore/queries/subscriptions_set_command_queries.rb
-- lib/pg_eventstore/queries/subscriptions_set_queries.rb
 - lib/pg_eventstore/queries/transaction_queries.rb
 - lib/pg_eventstore/query_builders/events_filtering_query.rb
 - lib/pg_eventstore/rspec/has_option_matcher.rb
@@ -122,11 +119,29 @@ files:
 - lib/pg_eventstore/subscriptions/command_handlers/subscription_runners_commands.rb
 - lib/pg_eventstore/subscriptions/commands_handler.rb
 - lib/pg_eventstore/subscriptions/events_processor.rb
+- lib/pg_eventstore/subscriptions/extensions/base_command_extension.rb
+- lib/pg_eventstore/subscriptions/extensions/command_class_lookup_extension.rb
+- lib/pg_eventstore/subscriptions/queries/subscription_command_queries.rb
+- lib/pg_eventstore/subscriptions/queries/subscription_queries.rb
+- lib/pg_eventstore/subscriptions/queries/subscriptions_set_command_queries.rb
+- lib/pg_eventstore/subscriptions/queries/subscriptions_set_queries.rb
 - lib/pg_eventstore/subscriptions/runner_state.rb
 - lib/pg_eventstore/subscriptions/subscription.rb
 - lib/pg_eventstore/subscriptions/subscription_feeder.rb
+- lib/pg_eventstore/subscriptions/subscription_feeder_commands.rb
+- lib/pg_eventstore/subscriptions/subscription_feeder_commands/base.rb
+- lib/pg_eventstore/subscriptions/subscription_feeder_commands/restore.rb
+- lib/pg_eventstore/subscriptions/subscription_feeder_commands/start_all.rb
+- lib/pg_eventstore/subscriptions/subscription_feeder_commands/stop.rb
+- lib/pg_eventstore/subscriptions/subscription_feeder_commands/stop_all.rb
 - lib/pg_eventstore/subscriptions/subscription_handler_performance.rb
 - lib/pg_eventstore/subscriptions/subscription_runner.rb
+- lib/pg_eventstore/subscriptions/subscription_runner_commands.rb
+- lib/pg_eventstore/subscriptions/subscription_runner_commands/base.rb
+- lib/pg_eventstore/subscriptions/subscription_runner_commands/reset_position.rb
+- lib/pg_eventstore/subscriptions/subscription_runner_commands/restore.rb
+- lib/pg_eventstore/subscriptions/subscription_runner_commands/start.rb
+- lib/pg_eventstore/subscriptions/subscription_runner_commands/stop.rb
 - lib/pg_eventstore/subscriptions/subscription_runners_feeder.rb
 - lib/pg_eventstore/subscriptions/subscriptions_manager.rb
 - lib/pg_eventstore/subscriptions/subscriptions_set.rb