Skip to content

Commit a5e365c

Browse files
pjurewiczfidel
authored andcommitted
Use only EventNotFound for a better backwards compatibility
1 parent 067e9b7 commit a5e365c

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

ruby_event_store-active_record/lib/ruby_event_store/active_record/event_repository_reader.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def start_condition(specification)
140140
@stream_klass.table_name
141141
)
142142
rescue ::ActiveRecord::RecordNotFound
143-
raise EventNotFoundInStream
143+
raise EventNotFound.new(specification.start)
144144
end
145145

146146
def stop_condition(specification)
@@ -150,7 +150,7 @@ def stop_condition(specification)
150150
@stream_klass.table_name
151151
)
152152
rescue ::ActiveRecord::RecordNotFound
153-
raise EventNotFoundInStream
153+
raise EventNotFound.new(specification.stop)
154154
end
155155

156156
def start_condition_in_global_stream(specification)

ruby_event_store/lib/ruby_event_store/in_memory_repository.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,8 @@ def read_scope(spec)
150150
serialized_records = serialized_records.select { |e| spec.with_types.any? { |x| x.eql?(e.event_type) } } if spec
151151
.with_types?
152152
serialized_records = serialized_records.reverse if spec.backward?
153-
begin
154-
serialized_records = serialized_records.drop(index_of(serialized_records, spec.start) + 1) if spec.start
155-
serialized_records = serialized_records.take(index_of(serialized_records, spec.stop)) if spec.stop
156-
rescue EventNotFound => e
157-
raise spec.stream.global? ? e : EventNotFoundInStream
158-
end
153+
serialized_records = serialized_records.drop(index_of(serialized_records, spec.start) + 1) if spec.start
154+
serialized_records = serialized_records.take(index_of(serialized_records, spec.stop)) if spec.stop
159155
serialized_records = serialized_records.take(spec.limit) if spec.limit?
160156
serialized_records = serialized_records.select { |sr| Time.iso8601(time_comparison_field(spec, sr)) < spec.older_than } if spec
161157
.older_than

ruby_event_store/lib/ruby_event_store/spec/event_repository_lint.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,15 +1060,15 @@ def read_events_backward(repository, stream = nil, from: nil, to: nil, count: ni
10601060
repository.append_to_stream([event], Stream.new('dummy'), ExpectedVersion.any)
10611061
expect do
10621062
repository.read(specification.stream('another').from(event.event_id).result).to_a
1063-
end.to raise_error(RubyEventStore::EventNotFoundInStream)
1063+
end.to raise_error(RubyEventStore::EventNotFound, "Event not found: #{event.event_id}")
10641064
end
10651065

10661066
specify do
10671067
event = SRecord.new
10681068
repository.append_to_stream([event], Stream.new('dummy'), ExpectedVersion.any)
10691069
expect do
10701070
repository.read(specification.stream('another').to(event.event_id).result).to_a
1071-
end.to raise_error(RubyEventStore::EventNotFoundInStream)
1071+
end.to raise_error(RubyEventStore::EventNotFound, "Event not found: #{event.event_id}")
10721072
end
10731073

10741074
specify do

ruby_event_store/spec/client_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,10 @@ module RubyEventStore
398398
end
399399

400400
expect { client.read.stream("stream_name").from(SecureRandom.uuid).limit(100).to_a }.to raise_error(
401-
EventNotFoundInStream
401+
EventNotFound
402402
)
403403
expect { client.read.backward.stream("stream_name").from(SecureRandom.uuid).limit(100).to_a }.to raise_error(
404-
EventNotFoundInStream
404+
EventNotFound
405405
)
406406
end
407407

0 commit comments

Comments
 (0)