Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/bob/queue.ex
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,18 @@ defmodule Bob.Queue do
end

defp filter_modules(query, []), do: query
defp filter_modules(query, modules), do: where(query, [j], j.module_key in ^modules)

defp filter_modules(query, modules) do
# A module key can be a `{module, key}` tuple, and a list of those reads as a
# keyword list, which Ecto's `in` rejects. Match each key with `==` so the
# Term type dumps it as a single value instead.
conditions =
Enum.reduce(modules, dynamic(false), fn module, acc ->
dynamic([j], ^acc or j.module_key == ^module)
end)

where(query, ^conditions)
end

defp finish(id, state) do
now = DateTime.utc_now()
Expand Down
18 changes: 18 additions & 0 deletions test/bob/queue_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,24 @@ defmodule Bob.QueueTest do
assert length(Queue.running([])) == 2
end

test "filters by a list of only tuple module keys" do
key = {TestJob, :variant}
Queue.add(key, [:a])
Queue.add(Bob.Job.OTPChecker, [:b])

assert [j] = Queue.queued_listing(100, 0, [key])
assert j.module_key == key

{:ok, {id, _}} = Queue.start(key)
assert [r] = Queue.running([key])
assert r.module_key == key

Queue.success(id)
assert [p] = Queue.recent(50, 0, [key])
assert p.module_key == key
assert Queue.finished_count([key]) == 1
end

test "recent/3 and finished_count/1 filter by module" do
Queue.add(TestJob, [:a])
{:ok, {id, _}} = Queue.start(TestJob)
Expand Down
Loading