Separating of Storage context

lib/mobilizon/events/events.ex

@@ -3,17 +3,18 @@ defmodule Mobilizon.Events do
   The Events context.
   """
 
-  import Ecto.Query, warn: false
-  import Mobilizon.Ecto
+  import Ecto.Query
+
+  import Mobilizon.Storage.Ecto
 
-  alias Mobilizon.Repo
-  alias Mobilizon.Events.{Event, Comment, Participant}
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Users.User
   alias Mobilizon.Addresses.Address
+  alias Mobilizon.Events.{Event, Comment, Participant}
+  alias Mobilizon.Storage.{Page, Repo}
+  alias Mobilizon.Users.User
 
   def data() do
-    Dataloader.Ecto.new(Mobilizon.Repo, query: &query/2)
+    Dataloader.Ecto.new(Repo, query: &query/2)
   end
 
   def query(queryable, _params) do
@@ -36,7 +37,7 @@ defmodule Mobilizon.Events do
           :picture
         ]
       )
-      |> paginate(page, limit)
+      |> Page.paginate(page, limit)
 
     events = Repo.all(query)
 
@@ -301,7 +302,7 @@ defmodule Mobilizon.Events do
         e in Event,
         preload: [:organizer_actor, :participants]
       )
-      |> paginate(page, limit)
+      |> Page.paginate(page, limit)
       |> sort(sort, direction)
       |> restrict_future_events(future)
       |> allow_unlisted(unlisted)
@@ -348,7 +349,7 @@ defmodule Mobilizon.Events do
           ),
         preload: [:organizer_actor]
       )
-      |> paginate(page, limit)
+      |> Page.paginate(page, limit)
 
     total = Task.async(fn -> Repo.aggregate(query, :count, :id) end)
     elements = Task.async(fn -> Repo.all(query) end)
@@ -493,7 +494,7 @@ defmodule Mobilizon.Events do
   def list_tags(page \\ nil, limit \\ nil) do
     Repo.all(
       Tag
-      |> paginate(page, limit)
+      |> Page.paginate(page, limit)
     )
   end
 
@@ -514,7 +515,7 @@ defmodule Mobilizon.Events do
         on: t.id == e.tag_id,
         where: e.event_id == ^id
       )
-      |> paginate(page, limit)
+      |> Page.paginate(page, limit)
     )
   end
 
@@ -744,7 +745,7 @@ defmodule Mobilizon.Events do
       where: e.uuid == ^uuid,
       preload: [:actor]
     )
-    |> paginate(page, limit)
+    |> Page.paginate(page, limit)
   end
 
   @doc """
@@ -769,7 +770,7 @@ defmodule Mobilizon.Events do
         where: a.id == ^id and p.role != ^:not_approved,
         preload: [:picture, :tags]
       )
-      |> paginate(page, limit)
+      |> Page.paginate(page, limit)
     )
   end
 
@@ -789,7 +790,7 @@ defmodule Mobilizon.Events do
         where: p.event_id == ^id and p.role == ^:creator,
         preload: [:actor]
       )
-      |> paginate(page, limit)
+      |> Page.paginate(page, limit)
     )
   end
 
@@ -1159,7 +1160,7 @@ defmodule Mobilizon.Events do
           :event
         ]
       )
-      |> paginate(page, limit)
+      |> Page.paginate(page, limit)
 
     comments = Repo.all(query)
 

lib/mobilizon/events/tag.ex

@@ -1,36 +1,3 @@
-defmodule Mobilizon.Events.Tag.TitleSlug do
-  @moduledoc """
-  Generates slugs for tags
-  """
-  alias Mobilizon.Events.Tag
-  import Ecto.Query
-  alias Mobilizon.Repo
-  use EctoAutoslugField.Slug, from: :title, to: :slug
-
-  def build_slug(sources, changeset) do
-    slug = super(sources, changeset)
-    build_unique_slug(slug, changeset)
-  end
-
-  defp build_unique_slug(slug, changeset) do
-    query =
-      from(
-        t in Tag,
-        where: t.slug == ^slug
-      )
-
-    case Repo.one(query) do
-      nil ->
-        slug
-
-      _tag ->
-        slug
-        |> Mobilizon.Ecto.increment_slug()
-        |> build_unique_slug(changeset)
-    end
-  end
-end
-
 defmodule Mobilizon.Events.Tag do
   @moduledoc """
   Represents a tag for events
@@ -57,4 +24,17 @@ defmodule Mobilizon.Events.Tag do
     |> validate_required([:title, :slug])
     |> TitleSlug.unique_constraint()
   end
+
+  def increment_slug(slug) do
+    case List.pop_at(String.split(slug, "-"), -1) do
+      {nil, _} ->
+        slug
+
+      {suffix, slug_parts} ->
+        case Integer.parse(suffix) do
+          {id, _} -> Enum.join(slug_parts, "-") <> "-" <> Integer.to_string(id + 1)
+          :error -> slug <> "-1"
+        end
+    end
+  end
 end

lib/mobilizon/events/tag/title_slug.ex

@@ -0,0 +1,33 @@
+defmodule Mobilizon.Events.Tag.TitleSlug do
+  @moduledoc """
+  Generates slugs for tags
+  """
+
+  alias Mobilizon.Events.Tag
+  import Ecto.Query
+  alias Mobilizon.Storage.Repo
+  use EctoAutoslugField.Slug, from: :title, to: :slug
+
+  def build_slug(sources, changeset) do
+    slug = super(sources, changeset)
+    build_unique_slug(slug, changeset)
+  end
+
+  defp build_unique_slug(slug, changeset) do
+    query =
+      from(
+        t in Tag,
+        where: t.slug == ^slug
+      )
+
+    case Repo.one(query) do
+      nil ->
+        slug
+
+      _tag ->
+        slug
+        |> Tag.increment_slug()
+        |> build_unique_slug(changeset)
+    end
+  end
+end