Standardize pagination to Keyword.get pattern

Closes #137.

lib/music_library/online_store_templates.ex

@@ -8,6 +8,8 @@ defmodule MusicLibrary.OnlineStoreTemplates do
   alias MusicLibrary.OnlineStoreTemplates.OnlineStoreTemplate
   alias MusicLibrary.Repo
 
+  @pagination Application.compile_env!(:music_library, :pagination)
+
   @spec list_enabled_templates() :: [OnlineStoreTemplate.t()]
   def list_enabled_templates do
     OnlineStoreTemplate
@@ -32,19 +34,13 @@ defmodule MusicLibrary.OnlineStoreTemplates do
       |> order_by([t], fragment("? COLLATE NOCASE ASC", t.name))
       |> filter_templates(opts)
 
-    query =
+    offset = Keyword.get(opts, :offset, 0)
-      case Keyword.get(opts, :offset) do
+    limit = Keyword.get(opts, :limit, @pagination[:default_page_size])
-        nil -> query
-        offset -> from(t in query, offset: ^offset)
-      end
 
-    query =
+    query
-      case Keyword.get(opts, :limit) do
+    |> offset(^offset)
-        nil -> query
+    |> limit(^limit)
-        limit -> from(t in query, limit: ^limit)
+    |> Repo.all()
-      end
-
-    Repo.all(query)
   end
 
   @spec count_templates(list_opts()) :: non_neg_integer()

lib/music_library/scrobble_rules.ex

@@ -11,6 +11,8 @@ defmodule MusicLibrary.ScrobbleRules do
   alias MusicLibrary.Repo
   alias MusicLibrary.ScrobbleRules.ScrobbleRule
 
+  @pagination Application.compile_env!(:music_library, :pagination)
+
   @type list_opts :: [
           type: atom(),
           enabled: boolean(),
@@ -27,27 +29,13 @@ defmodule MusicLibrary.ScrobbleRules do
       |> order_scrobble_rules(Keyword.get(opts, :order, :inserted_at))
       |> filter_scrobble_rules(opts)
 
-    query =
+    offset = Keyword.get(opts, :offset, 0)
-      case Keyword.get(opts, :offset) do
+    limit = Keyword.get(opts, :limit, @pagination[:default_page_size])
-        nil ->
-          query
 
-        offset ->
+    query
-          from r in query,
+    |> offset(^offset)
-            offset: ^offset
+    |> limit(^limit)
-      end
+    |> Repo.all()
-
-    query =
-      case Keyword.get(opts, :limit) do
-        nil ->
-          query
-
-        limit ->
-          from r in query,
-            limit: ^limit
-      end
-
-    Repo.all(query)
   end
 
   @spec count_scrobble_rules(list_opts()) :: non_neg_integer()