Merge pull request #261 from coderplanets/upgrade-absinthe

chore(deps): upgrade absinthe to latest (1.6)

Author: mydearxym

lib/groupher_server/mailer/email.ex

@@ -7,11 +7,10 @@ defmodule GroupherServer.Email do
   import Bamboo.Email
   import Helper.Utils, only: [get_config: 2]
 
-  alias GroupherServer.{Accounts, Billing, CMS, Email, Mailer}
+  alias GroupherServer.{Accounts, Billing, Email, Mailer}
 
   alias Accounts.User
   alias Billing.BillRecord
-  # alias CMS.{Post, Job, Repo, Video}
   alias Email.Templates
   alias Mailer
 

lib/groupher_server_web/controller/og_controller.ex

@@ -26,7 +26,7 @@ defmodule GroupherServerWeb.Controller.OG do
     error_response(conn, url)
   end
 
-  defp ok_response(conn, url, %OpenGraph{title: nil, description: description} = info)
+  defp ok_response(conn, _url, %OpenGraph{title: nil, description: description} = info)
        when not is_nil(description) do
     json(conn, %{
       success: 1,
@@ -40,7 +40,7 @@ defmodule GroupherServerWeb.Controller.OG do
     })
   end
 
-  defp ok_response(conn, url, info) do
+  defp ok_response(conn, _url, info) do
     json(conn, %{
       success: 1,
       meta: %{

lib/groupher_server_web/schema/account/account_queries.ex

@@ -71,7 +71,7 @@ defmodule GroupherServerWeb.Schema.Account.Queries do
       resolve(&R.Accounts.list_favorite_categories/3)
     end
 
-    @doc "paged stared posts"
+    @desc "paged stared posts"
     field :stared_posts, :paged_posts do
       arg(:user_id, non_null(:id))
       arg(:filter, non_null(:paged_filter))
@@ -81,7 +81,7 @@ defmodule GroupherServerWeb.Schema.Account.Queries do
       resolve(&R.Accounts.stared_contents/3)
     end
 
-    @doc "paged stared jobs"
+    @desc "paged stared jobs"
     field :stared_jobs, :paged_jobs do
       arg(:user_id, non_null(:id))
       arg(:filter, non_null(:paged_filter))
@@ -91,7 +91,7 @@ defmodule GroupherServerWeb.Schema.Account.Queries do
       resolve(&R.Accounts.stared_contents/3)
     end
 
-    @doc "paged stared videos"
+    @desc "paged stared videos"
     field :stared_videos, :paged_videos do
       arg(:user_id, non_null(:id))
       arg(:filter, non_null(:paged_filter))

lib/groupher_server_web/schema/account/account_types.ex

@@ -100,23 +100,23 @@ defmodule GroupherServerWeb.Schema.Account.Types do
       resolve(&R.Accounts.editable_communities/3)
     end
 
-    @doc "get follower users count"
+    @desc "get follower users count"
     field :followers_count, :integer do
       arg(:count, :count_type, default_value: :count)
 
       resolve(dataloader(Accounts, :followers))
       middleware(M.ConvertToInt)
     end
 
-    @doc "get following users count"
+    @desc "get following users count"
     field :followings_count, :integer do
       arg(:count, :count_type, default_value: :count)
 
       resolve(dataloader(Accounts, :followings))
       middleware(M.ConvertToInt)
     end
 
-    @doc "wether viewer has followed"
+    @desc "wether viewer has followed"
     field :viewer_has_followed, :boolean do
       arg(:viewer_did, :viewer_did_type, default_value: :viewer_did)
 
@@ -126,7 +126,7 @@ defmodule GroupherServerWeb.Schema.Account.Types do
       middleware(M.ViewerDidConvert)
     end
 
-    @doc "paged stared posts"
+    @desc "paged stared posts"
     field :stared_posts, :paged_posts do
       arg(:filter, non_null(:paged_filter))
       arg(:thread, :post_thread, default_value: :post)
@@ -135,7 +135,7 @@ defmodule GroupherServerWeb.Schema.Account.Types do
       resolve(&R.Accounts.stared_contents/3)
     end
 
-    @doc "paged stared jobs"
+    @desc "paged stared jobs"
     field :stared_jobs, :paged_jobs do
       arg(:filter, non_null(:paged_filter))
       arg(:thread, :job_thread, default_value: :job)
@@ -144,7 +144,7 @@ defmodule GroupherServerWeb.Schema.Account.Types do
       resolve(&R.Accounts.stared_contents/3)
     end
 
-    @doc "paged stared videos"
+    @desc "paged stared videos"
     field :stared_videos, :paged_videos do
       arg(:filter, non_null(:paged_filter))
       arg(:thread, :video_thread, default_value: :video)
@@ -153,7 +153,7 @@ defmodule GroupherServerWeb.Schema.Account.Types do
       resolve(&R.Accounts.stared_contents/3)
     end
 
-    @doc "paged favorited posts"
+    @desc "paged favorited posts"
     field :favorited_posts, :paged_posts do
       arg(:filter, non_null(:paged_filter))
       arg(:thread, :post_thread, default_value: :post)
@@ -162,7 +162,7 @@ defmodule GroupherServerWeb.Schema.Account.Types do
       resolve(&R.Accounts.favorited_contents/3)
     end
 
-    @doc "paged favorited jobs"
+    @desc "paged favorited jobs"
     field :favorited_jobs, :paged_jobs do
       arg(:filter, non_null(:paged_filter))
       arg(:thread, :job_thread, default_value: :job)
@@ -171,7 +171,7 @@ defmodule GroupherServerWeb.Schema.Account.Types do
       resolve(&R.Accounts.favorited_contents/3)
     end
 
-    @doc "paged favorited videos"
+    @desc "paged favorited videos"
     field :favorited_videos, :paged_videos do
       arg(:filter, non_null(:paged_filter))
       arg(:thread, :video_thread, default_value: :video)
@@ -180,7 +180,7 @@ defmodule GroupherServerWeb.Schema.Account.Types do
       resolve(&R.Accounts.favorited_contents/3)
     end
 
-    @doc "paged favorited repos"
+    @desc "paged favorited repos"
     field :favorited_repos, :paged_repos do
       arg(:filter, non_null(:paged_filter))
       arg(:thread, :repo_thread, default_value: :repo)
@@ -189,55 +189,55 @@ defmodule GroupherServerWeb.Schema.Account.Types do
       resolve(&R.Accounts.favorited_contents/3)
     end
 
-    @doc "total count of stared posts count"
+    @desc "total count of stared posts count"
     field :stared_posts_count, :integer do
       arg(:count, :count_type, default_value: :count)
 
       resolve(dataloader(Accounts, :stared_posts))
       middleware(M.ConvertToInt)
     end
 
-    @doc "total count of stared jobs count"
+    @desc "total count of stared jobs count"
     field :stared_jobs_count, :integer do
       arg(:count, :count_type, default_value: :count)
 
       resolve(dataloader(Accounts, :stared_jobs))
       middleware(M.ConvertToInt)
     end
 
-    @doc "total count of stared videos count"
+    @desc "total count of stared videos count"
     field :stared_videos_count, :integer do
       arg(:count, :count_type, default_value: :count)
 
       resolve(dataloader(Accounts, :stared_videos))
       middleware(M.ConvertToInt)
     end
 
-    @doc "total count of favorited posts count"
+    @desc "total count of favorited posts count"
     field :favorited_posts_count, :integer do
       arg(:count, :count_type, default_value: :count)
 
       resolve(dataloader(Accounts, :favorited_posts))
       middleware(M.ConvertToInt)
     end
 
-    @doc "total count of favorited jobs count"
+    @desc "total count of favorited jobs count"
     field :favorited_jobs_count, :integer do
       arg(:count, :count_type, default_value: :count)
 
       resolve(dataloader(Accounts, :favorited_jobs))
       middleware(M.ConvertToInt)
     end
 
-    @doc "total count of favorited videos count"
+    @desc "total count of favorited videos count"
     field :favorited_videos_count, :integer do
       arg(:count, :count_type, default_value: :count)
 
       resolve(dataloader(Accounts, :favorited_videos))
       middleware(M.ConvertToInt)
     end
 
-    @doc "total count of favorited videos count"
+    @desc "total count of favorited videos count"
     field :favorited_repos_count, :integer do
       arg(:count, :count_type, default_value: :count)
 

lib/groupher_server_web/schema/cms/cms_types.ex

@@ -267,16 +267,16 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     field(:threads, list_of(:thread), resolve: dataloader(CMS, :threads))
     field(:categories, list_of(:category), resolve: dataloader(CMS, :categories))
 
-    @doc "total count of post contents"
+    @desc "total count of post contents"
     content_counts_field(:post, CMS.Post)
 
-    @doc "total count of job contents"
+    @desc "total count of job contents"
     content_counts_field(:job, CMS.Job)
 
-    @doc "total count of video contents"
+    @desc "total count of video contents"
     content_counts_field(:video, CMS.Video)
 
-    @doc "total count of repo contents"
+    @desc "total count of repo contents"
     content_counts_field(:repo, CMS.Repo)
 
     field :subscribers, list_of(:user) do

lib/groupher_server_web/schema/delivery/delivery_types.ex

@@ -1,6 +1,5 @@
 defmodule GroupherServerWeb.Schema.Delivery.Types do
   use Absinthe.Schema.Notation
-  use Absinthe.Ecto, repo: GroupherServer.Repo
 
   import GroupherServerWeb.Schema.Utils.Helper
   import Helper.Utils, only: [get_config: 2]
@@ -34,16 +33,16 @@ defmodule GroupherServerWeb.Schema.Delivery.Types do
     field(:read, :boolean)
   end
 
-  object :sys_notification do
-    field(:id, :id)
+  # object :sys_notification do
+  #   field(:id, :id)
 
-    field(:source_id, :string)
-    field(:source_title, :string)
-    field(:source_preview, :string)
-    field(:source_type, :string)
+  #   field(:source_id, :string)
+  #   field(:source_title, :string)
+  #   field(:source_preview, :string)
+  #   field(:source_type, :string)
 
-    field(:read, :boolean)
-  end
+  #   field(:read, :boolean)
+  # end
 
   object :notification do
     field(:id, :id)

lib/groupher_server_web/schema/statistics/statistics_types.ex

@@ -1,6 +1,5 @@
 defmodule GroupherServerWeb.Schema.Statistics.Types do
   use Absinthe.Schema.Notation
-  use Absinthe.Ecto, repo: GroupherServer.Repo
 
   # import GroupherServerWeb.Schema.Utils.Helper
 

lib/groupher_server_web/schema/utils/common_types.ex

@@ -5,7 +5,6 @@ defmodule GroupherServerWeb.Schema.Utils.CommonTypes do
   import GroupherServerWeb.Schema.Utils.Helper
 
   use Absinthe.Schema.Notation
-  use Absinthe.Ecto, repo: GroupherServer.Repo
 
   object :status do
     field(:done, :boolean)

lib/helper/gql_schema_suite.ex

@@ -6,7 +6,6 @@ defmodule Helper.GqlSchemaSuite do
   defmacro __using__(_opts) do
     quote do
       use Absinthe.Schema.Notation
-      use Absinthe.Ecto, repo: GroupherServer.Repo
 
       alias GroupherServerWeb.Resolvers, as: R
       alias GroupherServerWeb.Middleware, as: M

mix.exs

@@ -62,10 +62,9 @@ defmodule GroupherServer.Mixfile do
       {:plug_cowboy, "~> 2.4.1"},
       {:plug, "~> 1.11.0"},
       # GraphQl tool
-      {:absinthe, "~> 1.4.16"},
-      {:absinthe_ecto, "~> 0.1.3"},
+      {:absinthe, "~> 1.6.1"},
       # Plug support for Absinthe
-      {:absinthe_plug, "~> 1.4.6"},
+      {:absinthe_plug, "~> 1.5.4"},
       # Password hashing lib
       {:comeonin, "~> 5.1.1"},
       # CORS
@@ -80,7 +79,7 @@ defmodule GroupherServer.Mixfile do
       # {:scrivener_ecto, "~> 2.0.0"},
       {:guardian, "~> 2.0"},
       {:timex, "~> 3.6.1"},
-      {:dataloader, "~> 1.0.2"},
+      {:dataloader, "~> 1.0.7"},
       {:mix_test_watch, "~> 1.0.2", only: :dev, runtime: false},
       {:ex_unit_notifier, "~> 0.1", only: :test},
       {:apollo_tracing, "~> 0.4.3"},