Revert "Return stream object instead of name"

This reverts commit a7e2e55.
RailsEventStore · Jul 25, 2024 · 7d86caa · 7d86caa
1 parent aed52a0
commit 7d86caa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 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
@@ -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
@@ -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