Skip to content

Commit 32cba11

Browse files
committed
refactor: inline remaining single-use wrappers
Inline terminal key persistence and migration file discovery at their only call sites. Focused lookup/bootstrap tests, lint, RBS validation, and Steep pass. See #79
1 parent b60dec5 commit 32cba11

4 files changed

Lines changed: 4 additions & 22 deletions

File tree

‎lib/solid_objects/executor.rb‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,9 @@ def fail_message(error)
405405
if error.is_a?(NonRetryableError) ||
406406
locked_message.attempt_count >= locked_message.max_attempts
407407
create_dead_letter(message: locked_message, error_details:, now:)
408-
remember_key(instance, locked_message)
408+
if locked_message.idempotency_key
409+
instance.update!(completed_idempotency_keys: remembered_keys(instance, locked_message))
410+
end
409411
dead = true
410412
else
411413
ReadyMessage.create!(
@@ -475,13 +477,6 @@ def matching_claim!
475477
raise LostActivation, "message claim changed"
476478
end
477479

478-
# @rbs (Instance, Message) -> void
479-
def remember_key(instance, message)
480-
return unless message.idempotency_key
481-
482-
instance.update!(completed_idempotency_keys: remembered_keys(instance, message))
483-
end
484-
485480
# @rbs (Instance, Message) -> Array[Hash[String, untyped]]
486481
def remembered_keys(instance, message)
487482
remembered = Array(instance.completed_idempotency_keys)

‎lib/solid_objects/schema_bootstrap.rb‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,11 @@ def install(connection: nil)
1717

1818
# @rbs () -> Array[Class]
1919
def migrations
20-
migration_files.map do |file|
20+
Dir[File.expand_path("../../db/migrate/*.rb", __dir__)].sort.map do |file|
2121
require file
2222
Object.const_get(File.basename(file, ".rb").sub(/\A\d+_/, "").camelize)
2323
end
2424
end
25-
26-
private
27-
28-
# @rbs () -> Array[String]
29-
def migration_files
30-
Dir[File.expand_path("../../db/migrate/*.rb", __dir__)].sort
31-
end
3225
end
3326
end
3427
end

‎sig/generated/lib/solid_objects/executor.rbs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ module SolidObjects
9494
# @rbs () -> ClaimedMessage
9595
def matching_claim!: () -> ClaimedMessage
9696

97-
# @rbs (Instance, Message) -> void
98-
def remember_key: (Instance, Message) -> void
99-
10097
# @rbs (Instance, Message) -> Array[Hash[String, untyped]]
10198
def remembered_keys: (Instance, Message) -> Array[Hash[String, untyped]]
10299

‎sig/generated/lib/solid_objects/schema_bootstrap.rbs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,5 @@ module SolidObjects
77

88
# @rbs () -> Array[Class]
99
def self.migrations: () -> Array[Class]
10-
11-
# @rbs () -> Array[String]
12-
private def self.migration_files: () -> Array[String]
1310
end
1411
end

0 commit comments

Comments
 (0)