Refactor

Mapper argument was unusable before, as it was always and unconditionally overwritten. Co-authored-by: Szymon Fiedler <[email protected]> Co-authored-by: Łukasz Reszke <[email protected]>
RailsEventStore · Feb 7, 2023 · 77b7338 · 77b7338
1 parent ed10117
commit 77b7338
Showing 1 changed file with 24 additions and 27 deletions.
diff --git a/rails_event_store/lib/rails_event_store/json_client.rb b/rails_event_store/lib/rails_event_store/json_client.rb
@@ -3,7 +3,29 @@
 module RailsEventStore
   class JSONClient < Client
     def initialize(
-      mapper: RubyEventStore::Mappers::Default.new,
+      mapper:
+        RubyEventStore::Mappers::PipelineMapper.new(
+          RubyEventStore::Mappers::Pipeline.new(
+            RubyEventStore::Mappers::Transformation::PreserveTypes
+              .new
+              .register(Symbol, serializer: ->(v) { v.to_s }, deserializer: ->(v) { v.to_sym })
+              .register(
+                Time,
+                serializer: ->(v) { v.iso8601(RubyEventStore::TIMESTAMP_PRECISION) },
+                deserializer: ->(v) { Time.iso8601(v) }
+              )
+              .register(
+                ActiveSupport::TimeWithZone,
+                serializer: ->(v) { v.iso8601(RubyEventStore::TIMESTAMP_PRECISION) },
+                deserializer: ->(v) { Time.iso8601(v).in_time_zone },
+                stored_type: ->(*) { "ActiveSupport::TimeWithZone" }
+              )
+              .register(Date, serializer: ->(v) { v.iso8601 }, deserializer: ->(v) { Date.iso8601(v) })
+              .register(DateTime, serializer: ->(v) { v.iso8601 }, deserializer: ->(v) { DateTime.iso8601(v) })
+              .register(BigDecimal, serializer: ->(v) { v.to_s }, deserializer: ->(v) { BigDecimal(v) }),
+            RubyEventStore::Mappers::Transformation::SymbolizeMetadataKeys.new
+          )
+        ),
       repository: RubyEventStore::ActiveRecord::EventRepository.new(serializer: RubyEventStore::NULL),
       subscriptions: RubyEventStore::Subscriptions.new,
       dispatcher: RubyEventStore::ComposedDispatcher.new(
@@ -17,32 +39,7 @@ def initialize(
       request_metadata: default_request_metadata
     )
       super(
-        mapper:
-          RubyEventStore::Mappers::InstrumentedMapper.new(
-            RubyEventStore::Mappers::PipelineMapper.new(
-              RubyEventStore::Mappers::Pipeline.new(
-                RubyEventStore::Mappers::Transformation::PreserveTypes
-                  .new
-                  .register(Symbol, serializer: ->(v) { v.to_s }, deserializer: ->(v) { v.to_sym })
-                  .register(
-                    Time,
-                    serializer: ->(v) { v.iso8601(RubyEventStore::TIMESTAMP_PRECISION) },
-                    deserializer: ->(v) { Time.iso8601(v) }
-                  )
-                  .register(
-                    ActiveSupport::TimeWithZone,
-                    serializer: ->(v) { v.iso8601(RubyEventStore::TIMESTAMP_PRECISION) },
-                    deserializer: ->(v) { Time.iso8601(v).in_time_zone },
-                    stored_type: ->(*) { "ActiveSupport::TimeWithZone" }
-                  )
-                  .register(Date, serializer: ->(v) { v.iso8601 }, deserializer: ->(v) { Date.iso8601(v) })
-                  .register(DateTime, serializer: ->(v) { v.iso8601 }, deserializer: ->(v) { DateTime.iso8601(v) })
-                  .register(BigDecimal, serializer: ->(v) { v.to_s }, deserializer: ->(v) { BigDecimal(v) }),
-                RubyEventStore::Mappers::Transformation::SymbolizeMetadataKeys.new
-              )
-            ),
-            ActiveSupport::Notifications
-          ),
+        mapper: RubyEventStore::Mappers::InstrumentedMapper.new(mapper, ActiveSupport::Notifications),
         repository: RubyEventStore::InstrumentedRepository.new(repository, ActiveSupport::Notifications),
         subscriptions: RubyEventStore::InstrumentedSubscriptions.new(subscriptions, ActiveSupport::Notifications),
         clock: clock,