eventsimple 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 985c47a587ea7f6476248e8c5b6257d51482f41832bb6055e6da514e4dbd8914
-  data.tar.gz: 809b1c8d0b3f21b4d4765cd06530e4dedea076ebd3c07b5a027d7822f5bb226f
+  metadata.gz: 73a860de275fa7998ed8048ee53ac70ec2b7b5872456bd1c03422cb4218847cb
+  data.tar.gz: 0aee5f6d22f2630d1a513f3847441fb8e1f28399512f9046be161c65c4cb49f2
 SHA512:
-  metadata.gz: 86d4bb8d7a529d14f287ad54242b2e3c7b305fb6092981e84412b9854bc8c76566d781e122147f9522a7a40da77d57d82a60757e441bedf307a8b72697f36727
-  data.tar.gz: 0e18b342e6ad42462e35101ff10a9890962cd540a3142c8d7cd8d9f87e2ee862d89fb8d9e52a01695728099f526caf14331a2ab4d9b1dd87bc517cb77af42821
+  metadata.gz: a92575ecbabbbf572beb4c61c7f46fff241e339b737d224ee93bf78b24df6dbedeab28a8fa7721d3a213b833e5f799b0a31e76234b41f7c903ea208ff04db2f9
+  data.tar.gz: 358feb4234563044b7609e46130913c161cdd2fa555cbfba7be4faea1e5e3bf3e26b83f546da72ab46142b1de5097976e13dfec56b44105077e80e33609e1f8e

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 1.2.2 - 2023-11-29
+### Changed
+- Add support for filtering events by aggregate model attributes.
+
 ## 1.2.1 - 2023-11-18
 ### Changed
 - Allow timestamp data in events to override default timestamps update.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eventsimple (1.2.1)
+    eventsimple (1.2.2)
       dry-struct (~> 1.6)
       dry-types (~> 1.7)
       pg (~> 1.4)
@@ -158,7 +158,7 @@ GEM
     mini_mime (1.1.5)
     minitest (5.20.0)
     nenv (0.3.0)
-    net-imap (0.4.5)
+    net-imap (0.4.7)
       date
       net-protocol
     net-pop (0.1.2)

data/app/controllers/eventsimple/entities_controller.rb

@@ -8,6 +8,10 @@ module Eventsimple
       @event_id = params[:e] || -1
       @tab_id = (params[:t] == 'event') ? 'event' : 'entity'
 
+      filter_columns = @model_class._filter_attributes
+      params_filters = params.permit(filters: {})[:filters] || {}
+      @filters = filter_columns.to_h { |column| [column, params_filters[column]] }
+
       primary_key = @model_class.event_class._aggregate_id
       @entity = @model_class.find_by!(primary_key => @aggregate_id)
       @entity_event_history = @entity.events.reverse

data/app/controllers/eventsimple/models_controller.rb

@@ -2,9 +2,44 @@ module Eventsimple
   class ModelsController < ApplicationController
     def show
       @model_name = params[:name]
+      model_class = event_classes.find { |d| d.name == @model_name }
 
-      model_event_class = event_classes.find { |d| d.name == @model_name }.event_class
-      @latest_entities = model_event_class.last(20).reverse
+      scope = apply_filter(model_class, model_class.event_class)
+
+      @latest_entities = scope.last(20).reverse
+
+      check_redirect_to_entity
+    end
+
+    private
+
+    def apply_filter(model_class, model_event_class)
+      filter_columns = model_class._filter_attributes
+
+      params_filters = params.permit(filters: {})[:filters] || {}
+      @filters = filter_columns.to_h { |column| [column, params_filters[column]] }
+
+      return model_event_class unless @filters.any?
+
+      aggregate_class_symbol = model_event_class._aggregate_klass.model_name.element.to_sym
+      model_event_class = model_event_class.joins(aggregate_class_symbol)
+      @filters.each do |key, value|
+        next if value.blank?
+        key = model_event_class._aggregate_id if key == :aggregate_id
+        model_event_class = model_event_class.where({ aggregate_class_symbol => { key => value } })
+      end
+
+      model_event_class
+    end
+
+    def check_redirect_to_entity
+      return unless @latest_entities.any?
+
+      first_aggregate_id = @latest_entities.first.aggregate_id
+
+      return unless @latest_entities.all? { |entity| entity.aggregate_id == first_aggregate_id }
+
+      redirect_to model_entity_path(@model_name, first_aggregate_id, filters: @filters)
     end
   end
 end

data/app/views/eventsimple/shared/_header.html.erb

@@ -1,26 +1,20 @@
 <!-- Header Search Start -->
 <header class="container mb-4">
-  <div class="row">
-    <div class="col col-sm-3">
-      <select id="form-search-model-name" class="form-select" aria-label="Model select" onchange="document.location.href=this.value" required>
-        <option value="">Choose event source model</option>
-        <% event_class_names.each do |klass| %>
-          <% is_active = klass === @model_name ? 'selected' : '' %>
-          <option value="<%= model_path(klass) %>" <%= is_active %>><%= klass %></option>
-        <% end %>
-      </select>
-    </div>
-
-    <% if @model_name %>
-      <div class="col col-sm-7">
-        <%= form_with url: model_entity_path(@model_name, ''), id: 'model-search' do |f| %>
-          <%= f.search_field :event_id, class: 'form-control', placeholder: 'Canonical identifier', value: @aggregate_id, required: true, aria: { label: 'Entity canonical identifier' }  %>
+  <% if @model_name %>
+    <%= form_with scope: :filters, url: model_path(@model_name), method: :get, id: 'model-filter' do |f| %>
+      <div class="row">
+        <label for="filters_keys[keys]" class="col-sm-2 col-form-label">Filter attribute</label>
+        <div class="form-group col-sm-3">
+          <%= select :filters_keys, :keys, @filters.keys, { selected: @filters.compact.keys&.first }, { class:"form-select", onchange: "document.getElementById('model-filter-value').name=`filters[${this.value}]`" } %>
         </div>
-        <div class="col col-sm-2">
+        <div class="form-group col-sm-5">
+          <%= f.search_field @filters.compact.keys&.first || @filters.keys.first, id: 'model-filter-value', value: @filters.compact.values&.first, class:"form-control", placeholder: "Filter value" %>
+        </div>
+        <div class="form-group col-sm-2">
           <%= f.submit 'Search', class: 'btn btn-primary' %>
-        <% end %>
+        </div>
       </div>
     <% end %>
-  </div>
+  <% end %>
 </header>
 <!-- Header Search End -->

data/app/views/layouts/eventsimple/application.html.erb

@@ -62,12 +62,6 @@
           query.set(param, value);
           link.attr("href",window.location.pathname + '?' + query.toString());
         });
-
-        $('#model-search').on('submit', (event) => {
-          event.preventDefault();
-          const form = $(event.currentTarget);
-          window.location = form.attr('action') + form.children('#event_id').val();
-        });
       });
     </script>
 

data/lib/eventsimple/entity.rb

@@ -2,7 +2,7 @@ module Eventsimple
   module Entity
     DEFAULT_IGNORE_PROPS = %w[id lock_version].freeze
 
-    def event_driven_by(event_klass, aggregate_id:)
+    def event_driven_by(event_klass, aggregate_id:, filter_attributes: [])
       has_many :events, class_name: event_klass.name.to_s,
         foreign_key: :aggregate_id,
         primary_key: aggregate_id,
@@ -13,6 +13,9 @@ module Eventsimple
 
       class_attribute :ignored_for_projection, default: []
 
+      class_attribute :_filter_attributes
+      self._filter_attributes = [aggregate_id] | Array.wrap(filter_attributes)
+
       # disable automatic timestamp updates
       self.record_timestamps = false
 

data/lib/eventsimple/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Eventsimple
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventsimple
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Zulfiqar Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct