From 7d86caa82fc9543abbeb8c2a08ee9f288e046569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Reszke?= Date: Thu, 25 Jul 2024 09:34:11 +0200 Subject: [PATCH] Revert "Return stream object instead of name" This reverts commit a7e2e559ca8010231359890d4fc9cfd43f2d10f7. --- .../active_record/event_repository_reader.rb | 2 +- .../spec/event_repository_spec.rb | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ruby_event_store-active_record/lib/ruby_event_store/active_record/event_repository_reader.rb b/ruby_event_store-active_record/lib/ruby_event_store/active_record/event_repository_reader.rb index 99b96beae1..4fe46d2af1 100644 --- a/ruby_event_store-active_record/lib/ruby_event_store/active_record/event_repository_reader.rb +++ b/ruby_event_store-active_record/lib/ruby_event_store/active_record/event_repository_reader.rb @@ -58,7 +58,7 @@ def event_in_stream?(event_id, stream) end def search_streams(stream) - @stream_klass.where("stream LIKE ?", "#{stream}%").order("position ASC").pluck(:stream).map { |name| Stream.new(name) } + @stream_klass.where("stream LIKE ?", "#{stream}%").pluck(:stream).uniq end private diff --git a/ruby_event_store-active_record/spec/event_repository_spec.rb b/ruby_event_store-active_record/spec/event_repository_spec.rb index 7cee0a75b2..65bb504739 100644 --- a/ruby_event_store-active_record/spec/event_repository_spec.rb +++ b/ruby_event_store-active_record/spec/event_repository_spec.rb @@ -186,26 +186,26 @@ module ActiveRecord specify "finds streams that match the search phrase" do repository.append_to_stream( [SRecord.new(event_id: e1 = SecureRandom.uuid)], - s1 = Stream.new("Dummy$#{e1}"), + Stream.new("Dummy$#{e1}"), ExpectedVersion.any ) repository.append_to_stream( [SRecord.new(event_id: e2 = SecureRandom.uuid)], - s2 = Stream.new("Dummy$#{e2}"), + Stream.new("Dummy$#{e2}"), ExpectedVersion.any ) repository.append_to_stream( [SRecord.new(event_id: e3 = SecureRandom.uuid)], - s3 = Stream.new("Dummy$#{e3}"), + Stream.new("Dummy$#{e3}"), ExpectedVersion.any ) - expect(repository.search_streams("Du")).to eq([s1, s2, s3]) - expect(repository.search_streams("du")).to eq([s1, s2, s3]) - expect(repository.search_streams("dum")).to eq([s1, s2, s3]) - expect(repository.search_streams("dumm")).to eq([s1, s2, s3]) - expect(repository.search_streams("dummy")).to eq([s1, s2, s3]) - expect(repository.search_streams("Dummy")).to eq([s1, s2, s3]) + expect(repository.search_streams("Du")).to eq(["Dummy$#{e1}", "Dummy$#{e2}", "Dummy$#{e3}"]) + expect(repository.search_streams("du")).to eq(["Dummy$#{e1}", "Dummy$#{e2}", "Dummy$#{e3}"]) + expect(repository.search_streams("dum")).to eq(["Dummy$#{e1}", "Dummy$#{e2}", "Dummy$#{e3}"]) + expect(repository.search_streams("dumm")).to eq(["Dummy$#{e1}", "Dummy$#{e2}", "Dummy$#{e3}"]) + expect(repository.search_streams("dummy")).to eq(["Dummy$#{e1}", "Dummy$#{e2}", "Dummy$#{e3}"]) + expect(repository.search_streams("Dummy")).to eq(["Dummy$#{e1}", "Dummy$#{e2}", "Dummy$#{e3}"]) end specify "finds no streams when search phrase doesn't match anything" do