chore(works): plural issue

Author: mydearxym

lib/groupher_server_web/schema/Helper/objects.ex

@@ -2,7 +2,7 @@ defmodule GroupherServerWeb.Schema.Helper.Objects do
   @moduledoc """
   general fields used in schema definition
   """
-  import Helper.Utils, only: [get_config: 2]
+  import Helper.Utils, only: [get_config: 2, plural: 1]
 
   @article_threads get_config(:article, :threads)
 
@@ -19,7 +19,7 @@ defmodule GroupherServerWeb.Schema.Helper.Objects do
     @article_threads
     |> Enum.map(
       &quote do
-        object unquote(:"paged_#{&1}s") do
+        object unquote(:"paged_#{plural(&1)}") do
           field(:entries, list_of(unquote(&1)))
           pagination_fields()
         end

lib/groupher_server_web/schema/Helper/queries.ex

@@ -2,7 +2,7 @@ defmodule GroupherServerWeb.Schema.Helper.Queries do
   @moduledoc """
   common fields
   """
-  import Helper.Utils, only: [get_config: 2]
+  import Helper.Utils, only: [get_config: 2, plural: 1]
 
   alias GroupherServerWeb.Middleware, as: M
   alias GroupherServerWeb.Resolvers, as: R
@@ -14,8 +14,9 @@ defmodule GroupherServerWeb.Schema.Helper.Queries do
     @article_threads
     |> Enum.map(fn thread ->
       quote do
-        @desc unquote("paged published #{thread}s")
-        field unquote(:"paged_published_#{thread}s"), unquote(:"paged_#{thread}s") do
+        @desc unquote("paged published #{plural(thread)}")
+        field unquote(:"paged_published_#{plural(thread)}"),
+              unquote(:"paged_#{plural(thread)}") do
           arg(:login, non_null(:string))
           arg(:filter, non_null(:paged_filter))
           arg(:thread, unquote(:"#{thread}_thread"), default_value: unquote(thread))
@@ -32,7 +33,7 @@ defmodule GroupherServerWeb.Schema.Helper.Queries do
     |> Enum.map(fn thread ->
       quote do
         @desc unquote("get #{thread} by id")
-        field unquote(:"search_#{thread}s"), unquote(:"paged_#{thread}s") do
+        field unquote(:"search_#{plural(thread)}"), unquote(:"paged_#{plural(thread)}") do
           arg(:title, non_null(:string))
           arg(:thread, unquote(:"#{thread}_thread"), default_value: unquote(thread))
 
@@ -57,10 +58,10 @@ defmodule GroupherServerWeb.Schema.Helper.Queries do
         resolve(&R.CMS.read_article/3)
       end
 
-      @desc unquote("get paged #{thread}s")
-      field unquote(:"paged_#{thread}s"), unquote(:"paged_#{thread}s") do
+      @desc unquote("get paged #{plural(thread)}")
+      field unquote(:"paged_#{plural(thread)}"), unquote(:"paged_#{plural(thread)}") do
         arg(:thread, unquote(:"#{thread}_thread"), default_value: unquote(thread))
-        arg(:filter, non_null(unquote(:"paged_#{thread}s_filter")))
+        arg(:filter, non_null(unquote(:"paged_#{plural(thread)}_filter")))
 
         middleware(M.PageSizeProof, default_sort: :desc_active)
         resolve(&R.CMS.paged_articles/3)
@@ -81,7 +82,4 @@ defmodule GroupherServerWeb.Schema.Helper.Queries do
       end
     end
   end
-
-  def thread_plural(:works), do: :works
-  def thread_plural(thread), do: :"#{thread}s"
 end

lib/groupher_server_web/schema/cms/cms_metrics.ex

@@ -200,7 +200,7 @@ defmodule GroupherServerWeb.Schema.CMS.Metrics do
 
   @desc "works_filter doc"
   # TODO:
-  input_object :paged_workss_filter do
+  input_object :paged_works_filter do
     pagination_args()
     article_filter_fields()
     field(:sort, :sort_enum)

lib/helper/utils/utils.ex

@@ -50,10 +50,10 @@ defmodule Helper.Utils do
   end
 
   @doc """
-  get plural version of a thread
+  plural version of the thread
   """
-  def thread_plural(:works), do: :works
-  def thread_plural(thread), do: :"#{thread}s"
+  def plural(:works), do: :works
+  def plural(thread), do: :"#{thread}s"
 
   @doc """
   like || in javascript

priv/repo/migrations/20210625134335_add_works_to_cited_artiments.exs

@@ -0,0 +1,9 @@
+defmodule GroupherServer.Repo.Migrations.AddWorksToCitedArtiments do
+  use Ecto.Migration
+
+  def change do
+    alter table(:cited_artiments) do
+      add(:works_id, references(:cms_works, on_delete: :delete_all))
+    end
+  end
+end