pg_eventstore 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d3773773af377d169523f80ce08e439e019c33b94acd369f9927bf116d9bd4e
-  data.tar.gz: 3d131cf8aab4cc5f2996bc7f78c200d9b0c2455f2430863681056d569852d24e
+  metadata.gz: 2d3a11216fa9cddbd742f03508ab289eeb194f39380fb67719b817ddb6839a7e
+  data.tar.gz: 6a3f35566a0076d37087064e80cf7c79250fd2a0b1ec25b0096cd2e08121084b
 SHA512:
-  metadata.gz: 5b6af4853352632ce2b50306b200c5790e0f41e2063de53fe827985237665c48af5aa080072d8c1612888193f9a82050672888fc3bde0af31a77a35743a69e33
-  data.tar.gz: ee65c7f22d76c2b530783c1eeea8416962c5c969d50188f4a6c0a0d22746b1045ff5fc0b2d9a8ee3dcdeb6d8df6a4d46087ae09c7093fead0d3276bc11f45a98
+  metadata.gz: 1738f6653ff45eec24bbf8803bb36a80ccd2123873e4eba308a75b5be206a73a434c9aa6af7ba6c02cd1ea4c28531ca77dea2114d1a04c1584a1538d2adf603f
+  data.tar.gz: 2f40af96cfa32af630a89f96900d86df163f0b75781f8d30f06a304f3002577e7fa9dec831e274bc5f3d138c2fc58512fcdbf5a2713bf3928321ba10b943bc0b

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [1.3.1]
+- Swap "Search" button and "Add filter" button on Dashboard page
+
+## [1.3.0]
+- Add ability to filter subscriptions by state in admin UI
+- Reset error-related subscription's attributes on subscription restore
+- Reset total processed events number when user changes subscription's position
+- Allow to search event type, stream context and stream name by substring in web UI
+- Relax sinatra version requirement to v3+
+
 ## [1.2.0]
 - Implement `failed_subscription_notifier` subscription hook.
 

data/lib/pg_eventstore/subscriptions/queries/subscription_queries.rb

@@ -45,10 +45,13 @@ module PgEventstore
       pg_result.map(&method(:deserialize))
     end
 
+    # @param state [String, nil]
     # @return [Array<String>]
-    def set_collection
+    def set_collection(state = nil)
+      builder = SQLBuilder.new.from('subscriptions').select('set').group('set').order('set ASC')
+      builder.where('state = ?', state) if state
       connection.with do |conn|
-        conn.exec('SELECT set FROM subscriptions GROUP BY set ORDER BY set ASC')
+        conn.exec_params(*builder.to_exec_params)
       end.map { |attrs| attrs['set'] }
     end
 

data/lib/pg_eventstore/subscriptions/queries/subscriptions_set_queries.rb

@@ -27,6 +27,21 @@ module PgEventstore
       pg_result.to_a.map(&method(:deserialize))
     end
 
+    # @param name [String, nil]
+    # @param state [String]
+    # @return [Array<Hash>]
+    def find_all_by_subscription_state(name:, state:)
+      builder = SQLBuilder.new.select('subscriptions_set.*').from('subscriptions_set')
+      builder.join('JOIN subscriptions ON subscriptions.locked_by = subscriptions_set.id')
+      builder.order('subscriptions_set.name ASC, subscriptions_set.id ASC')
+      builder.where('subscriptions_set.name = ? and subscriptions.state = ?', name, state)
+      builder.group('subscriptions_set.id')
+      pg_result = connection.with do |conn|
+        conn.exec_params(*builder.to_exec_params)
+      end
+      pg_result.to_a.map(&method(:deserialize))
+    end
+
     # @return [Array<String>]
     def set_names
       builder = SQLBuilder.new.select('name').from('subscriptions_set').group('name').order('name ASC')

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

@@ -17,7 +17,9 @@ module PgEventstore
       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'])
+          subscription_runner.subscription.update(
+            last_chunk_greatest_position: nil, current_position: data['position'], total_processed_events: 0
+          )
         end
       end
     end

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

@@ -7,6 +7,14 @@ module PgEventstore
       # @param subscription_runner [PgEventstore::SubscriptionRunner]
       # @return [void]
       def exec_cmd(subscription_runner)
+        subscription_runner.within_state(:dead) do
+          subscription_runner.subscription.update(
+            restart_count: 0,
+            last_restarted_at: nil,
+            last_error: nil,
+            last_error_occurred_at: nil
+          )
+        end
         subscription_runner.restore
       end
     end

data/lib/pg_eventstore/version.rb

@@ -2,5 +2,5 @@
 
 module PgEventstore
   # @return [String]
-  VERSION = "1.2.0"
+  VERSION = "1.3.1"
 end

data/lib/pg_eventstore/web/application.rb

@@ -102,6 +102,22 @@ module PgEventstore
         erb :'subscriptions/index'
       end
 
+      get '/subscriptions/:state' do
+        @set_collection = Subscriptions::WithState::SetCollection.new(connection, state: params[:state])
+        @current_set = params[:set_name] || @set_collection.names.first
+        subscriptions_set = Subscriptions::WithState::SubscriptionsSet.new(
+          connection, @current_set, state: params[:state]
+        ).subscriptions_set
+        subscriptions = Subscriptions::WithState::Subscriptions.new(
+          connection, @current_set, state: params[:state]
+        ).subscriptions
+        @association = Subscriptions::SubscriptionsToSetAssociation.new(
+          subscriptions_set: subscriptions_set,
+          subscriptions: subscriptions
+        )
+        erb :'subscriptions/index'
+      end
+
       post '/change_config' do
         config = params[:config]&.to_sym
         config = :default unless PgEventstore.available_configs.include?(config)

data/lib/pg_eventstore/web/paginator/event_types_collection.rb

@@ -16,7 +16,7 @@ module PgEventstore
                   where('context is not null and stream_name is not null').
                   group('event_type').order("event_type #{order}").limit(per_page)
               sql_builder.where("event_type #{direction_operator} ?", starting_id) if starting_id
-              sql_builder.where('event_type ilike ?', "#{options[:query]}%")
+              sql_builder.where('event_type ilike ?', "%#{options[:query]}%")
               connection.with do |conn|
                 conn.exec_params(*sql_builder.to_exec_params)
               end.to_a
@@ -32,7 +32,7 @@ module PgEventstore
             SQLBuilder.new.select('event_type').from('partitions').
               where('context is not null and stream_name is not null').
               where("event_type #{direction_operator} ?", starting_id).
-              where('event_type ilike ?', "#{options[:query]}%").
+              where('event_type ilike ?', "%#{options[:query]}%").
               group('event_type').order("event_type #{order}").limit(1).offset(per_page)
 
           connection.with do |conn|

data/lib/pg_eventstore/web/paginator/stream_contexts_collection.rb

@@ -12,10 +12,11 @@ module PgEventstore
           @_collection ||=
             begin
               sql_builder =
-                SQLBuilder.new.select('context').from('partitions').where('stream_name is null and event_type is null')
-                          .limit(per_page).order("context #{order}")
+                SQLBuilder.new.select('context').from('partitions').
+                  where('stream_name is null and event_type is null').
+                  limit(per_page).order("context #{order}")
               sql_builder.where("context #{direction_operator} ?", starting_id) if starting_id
-              sql_builder.where('context ilike ?', "#{options[:query]}%")
+              sql_builder.where('context ilike ?', "%#{options[:query]}%")
               connection.with do |conn|
                 conn.exec_params(*sql_builder.to_exec_params)
               end.to_a
@@ -29,7 +30,7 @@ module PgEventstore
           starting_id = collection.first['context']
           sql_builder =
             SQLBuilder.new.select('context').from('partitions').where('stream_name is null and event_type is null').
-              where("context #{direction_operator} ?", starting_id).where('context ilike ?', "#{options[:query]}%").
+              where("context #{direction_operator} ?", starting_id).where('context ilike ?', "%#{options[:query]}%").
               limit(1).offset(per_page).order("context #{order}")
 
           connection.with do |conn|

data/lib/pg_eventstore/web/paginator/stream_names_collection.rb

@@ -14,7 +14,7 @@ module PgEventstore
               sql_builder =
                 SQLBuilder.new.select('stream_name').from('partitions').
                   where('event_type is null and context = ?', options[:context]).
-                  where('stream_name ilike ?', "#{options[:query]}%")
+                  where('stream_name ilike ?', "%#{options[:query]}%")
               sql_builder.where("stream_name #{direction_operator} ?", starting_id) if starting_id
               sql_builder.limit(per_page).order("stream_name #{order}")
               connection.with do |conn|
@@ -31,7 +31,7 @@ module PgEventstore
           sql_builder =
             SQLBuilder.new.select('stream_name').from('partitions').
               where("stream_name #{direction_operator} ?", starting_id).
-              where('stream_name ilike ?', "#{options[:query]}%").
+              where('stream_name ilike ?', "%#{options[:query]}%").
               where('event_type is null and context = ?', options[:context]).
               limit(1).offset(per_page).order("stream_name #{order}")
 

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

@@ -215,3 +215,14 @@ $(function(){
         $(this).find('form').attr('action', $clickedLink.data('url'));
     });
 });
+
+// Display subscriptions of the selected state
+$(function(){
+    "use strict";
+
+    let $subscriptionsState = $('#subscriptions-state');
+    $subscriptionsState.change(function(){
+       let $selected = $(this).find('option:selected');
+       window.location.href = $selected.data('url');
+    });
+});

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

@@ -13,6 +13,21 @@ module PgEventstore
           url("/subscriptions?#{encoded_params}")
         end
 
+        # @param state [String]
+        # @return [String]
+        def subscriptions_state_url(state:, **params)
+          params = params.compact
+          return url("/subscriptions/#{state}") if params.empty?
+
+          encoded_params = Rack::Utils.build_nested_query(params)
+          url("/subscriptions/#{state}?#{encoded_params}")
+        end
+
+        # @return [String, nil]
+        def subscriptions_state
+          params[:state] if PgEventstore::RunnerState::STATES.include?(params[:state])
+        end
+
         # @param set_id [Integer]
         # @param id [Integer]
         # @param cmd [String]

data/lib/pg_eventstore/web/subscriptions/with_state/set_collection.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module Web
+    module Subscriptions
+      module WithState
+        class SetCollection
+          # @!attribute connection
+          #   @return [PgEventstore::Connection]
+          attr_reader :connection
+          private :connection
+
+          # @param connection [PgEventstore::Connection]
+          # @param state [String]
+          def initialize(connection, state:)
+            @connection = connection
+            @state = state
+          end
+
+          # @return [Array<String>]
+          def names
+            @set_collection ||= subscription_queries.set_collection(@state)
+          end
+
+          private
+
+          # @return [PgEventstore::SubscriptionQueries]
+          def subscription_queries
+            SubscriptionQueries.new(connection)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module Web
+    module Subscriptions
+      module WithState
+        class Subscriptions
+          # @!attribute connection
+          #   @return [PgEventstore::Connection]
+          attr_reader :connection
+          private :connection
+
+          # @param connection [PgEventstore::Connection]
+          # @param current_set [String, nil]
+          # @param state [String]
+          def initialize(connection, current_set, state:)
+            @connection = connection
+            @current_set = current_set
+            @state = state
+          end
+
+          # @return [Array<PgEventstore::Subscription>]
+          def subscriptions
+            @subscriptions ||= subscription_queries.find_all(set: @current_set, state: @state).map do |attrs|
+              Subscription.new(**attrs)
+            end
+          end
+
+          private
+
+          # @return [PgEventstore::SubscriptionQueries]
+          def subscription_queries
+            SubscriptionQueries.new(connection)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pg_eventstore/web/subscriptions/with_state/subscriptions_set.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module PgEventstore
+  module Web
+    module Subscriptions
+      module WithState
+        class SubscriptionsSet
+          # @!attribute connection
+          #   @return [PgEventstore::Connection]
+          attr_reader :connection
+          private :connection
+
+          # @param connection [PgEventstore::Connection]
+          # @param current_set [String, nil]
+          # @param state [String]
+          def initialize(connection, current_set, state:)
+            @connection = connection
+            @current_set = current_set
+            @state = state
+          end
+
+          # @return [Array<PgEventstore::SubscriptionsSet>]
+          def subscriptions_set
+            @subscriptions_set ||=
+              subscriptions_set_queries.find_all_by_subscription_state(name: @current_set, state: @state).map do |attrs|
+                PgEventstore::SubscriptionsSet.new(**attrs)
+              end
+          end
+
+          private
+
+          # @return [PgEventstore::SubscriptionsSetQueries]
+          def subscriptions_set_queries
+            SubscriptionsSetQueries.new(connection)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pg_eventstore/web/views/home/dashboard.erb

@@ -39,9 +39,6 @@
               <div class="ln_solid"></div>
               <div class="item form-group">
                 <div class="col-md-6 col-sm-6 offset-md-5">
-                  <div class="btn-group">
-                    <button type="submit" class="btn btn-success">Search</button>
-                  </div>
                   <div class="btn-group">
                     <div class="dropdown">
                       <button class="btn btn-secondary dropdown-toggle" type="button"
@@ -54,6 +51,9 @@
                       </div>
                     </div>
                   </div>
+                  <div class="btn-group">
+                    <button type="submit" class="btn btn-success">Search</button>
+                  </div>
                 </div>
               </div>
             </form>

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

@@ -4,6 +4,18 @@
       <div class="title_left">
         <h3>Subscriptions</h3>
       </div>
+      <div class="title_right">
+        <div class="col-md-5 col-sm-5 form-group pull-right top_search">
+          <div class="input-group">
+            <select class="form-control" id="subscriptions-state" autocomplete="off">
+              <option value="" data-url="<%= subscriptions_url %>" <% unless subscriptions_state %> selected <% end %>>All</option>
+              <% PgEventstore::RunnerState::STATES.values.each do |state| %>
+                <option value="<%= state %>" <% if state == subscriptions_state %> selected <% end %> data-url="<%= subscriptions_state_url(state: state) %>"><%= state.capitalize %></option>
+              <% end %>
+            </select>
+          </div>
+        </div>
+      </div>
     </div>
 
     <div class="clearfix"></div>
@@ -11,7 +23,7 @@
     <ul class="nav nav-tabs bg-white">
       <% @set_collection.names.each do |set_name| %>
         <li class="nav-item">
-          <a class="nav-link <%= "active bg-dark text-white" if @current_set == set_name %>" href="<%= subscriptions_url(set_name: set_name) %>">
+          <a class="nav-link <%= "active bg-dark text-white" if @current_set == set_name %>" href="<%= subscriptions_state ? subscriptions_state_url(state: subscriptions_state, set_name: set_name) : subscriptions_url(set_name: set_name) %>">
             <%= set_name %>
           </a>
         </li>

data/lib/pg_eventstore/web.rb

@@ -13,6 +13,9 @@ require_relative 'web/subscriptions/set_collection'
 require_relative 'web/subscriptions/subscriptions'
 require_relative 'web/subscriptions/subscriptions_set'
 require_relative 'web/subscriptions/subscriptions_to_set_association'
+require_relative 'web/subscriptions/with_state/set_collection'
+require_relative 'web/subscriptions/with_state/subscriptions'
+require_relative 'web/subscriptions/with_state/subscriptions_set'
 require_relative 'web/subscriptions/helpers'
 require_relative 'web/application'
 

data/pg_eventstore.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "pg", "~> 1.5"
   spec.add_dependency "connection_pool", "~> 2.4"
-  spec.add_dependency "sinatra", "~> 4.0"
+  spec.add_dependency "sinatra", ">= 3", '< 5'
 end

data/sig/pg_eventstore/subscriptions/queries/subscription_queries.rbs

@@ -12,7 +12,7 @@ module PgEventstore
     # _@param_ `attrs`
     def find_all: (::Hash[untyped, untyped] attrs) -> ::Array[::Hash[untyped, untyped]]
 
-    def set_collection: () -> ::Array[String]
+    def set_collection: (?String? state) -> ::Array[String]
 
     # _@param_ `id`
     def find!: (Integer id) -> ::Hash[untyped, untyped]

data/sig/pg_eventstore/subscriptions/queries/subscriptions_set_queries.rbs

@@ -11,6 +11,8 @@ module PgEventstore
     # The same as #find_all, but returns first result
     def find_by: (::Hash[untyped, untyped] attrs) -> ::Hash[untyped, untyped]?
 
+    def find_all_by_subscription_state: (name: String?, state: String) -> ::Array[::Hash[untyped, untyped]]
+
     # _@param_ `id`
     def find!: (Integer id) -> ::Hash[untyped, untyped]
 

data/sig/pg_eventstore/web/subscriptions/helpers.rbs

@@ -5,6 +5,10 @@ module PgEventstore
         # _@param_ `set_name`
         def subscriptions_url: (?set_name: String?) -> String
 
+        def subscriptions_state_url: (state: String, **untyped params) -> String
+
+        def subscriptions_state: -> String?
+
         # _@param_ `set_id`
         #
         # _@param_ `id`

data/sig/pg_eventstore/web/subscriptions/with_state/set_collection.rbs

@@ -0,0 +1,21 @@
+module PgEventstore
+  module Web
+    module Subscriptions
+      module WithState
+        class SetCollection
+          @state: String
+
+          attr_reader connection: PgEventstore::Connection
+
+          def initialize: (PgEventstore::Connection connection, state: String) -> void
+          
+          def names: -> Array[String]
+
+          private
+
+          def subscription_queries: -> PgEventstore::SubscriptionQueries
+        end
+      end
+    end
+  end
+end

data/sig/pg_eventstore/web/subscriptions/with_state/subscriptions.rbs

@@ -0,0 +1,23 @@
+module PgEventstore
+  module Web
+    module Subscriptions
+      module WithState
+        class Subscriptions
+          @current_set: String?
+
+          @state: String
+
+          attr_reader connection: PgEventstore::Connection
+
+          def initialize: (PgEventstore::Connection connection, String? current_set, state: String) -> void
+
+          def subscriptions: -> Array[PgEventstore::Subscription]
+
+          private
+
+          def subscription_queries: -> PgEventstore::SubscriptionQueries
+        end
+      end
+    end
+  end
+end

data/sig/pg_eventstore/web/subscriptions/with_state/subscriptions_set.rbs

@@ -0,0 +1,23 @@
+module PgEventstore
+  module Web
+    module Subscriptions
+      module WithState
+        class SubscriptionsSet
+          @current_set: String?
+
+          @state: String
+
+          attr_reader connection: PgEventstore::Connection
+
+          def initialize: (PgEventstore::Connection connection, String? current_set, state: String) -> untyped
+
+          def subscriptions_set: -> Array[PgEventstore::SubscriptionsSet]
+
+          private
+
+          def subscriptions_set_queries: -> PgEventstore::SubscriptionsSetQueries
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_eventstore
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ivan Dzyzenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-29 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -42,16 +42,22 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
 description: EventStore implementation using PostgreSQL
 email:
 - ivan.dzyzenko@gmail.com
@@ -182,6 +188,9 @@ files:
 - lib/pg_eventstore/web/subscriptions/subscriptions.rb
 - lib/pg_eventstore/web/subscriptions/subscriptions_set.rb
 - lib/pg_eventstore/web/subscriptions/subscriptions_to_set_association.rb
+- lib/pg_eventstore/web/subscriptions/with_state/set_collection.rb
+- lib/pg_eventstore/web/subscriptions/with_state/subscriptions.rb
+- lib/pg_eventstore/web/subscriptions/with_state/subscriptions_set.rb
 - lib/pg_eventstore/web/views/home/dashboard.erb
 - lib/pg_eventstore/web/views/home/partials/event_filter.erb
 - lib/pg_eventstore/web/views/home/partials/events.erb
@@ -278,6 +287,9 @@ files:
 - sig/pg_eventstore/web/subscriptions/subscriptions.rbs
 - sig/pg_eventstore/web/subscriptions/subscriptions_set.rbs
 - sig/pg_eventstore/web/subscriptions/subscriptions_to_set_association.rbs
+- sig/pg_eventstore/web/subscriptions/with_state/set_collection.rbs
+- sig/pg_eventstore/web/subscriptions/with_state/subscriptions.rbs
+- sig/pg_eventstore/web/subscriptions/with_state/subscriptions_set.rbs
 homepage: https://github.com/yousty/pg_eventstore
 licenses:
 - MIT