chore: Merge branch 'dev'

Author: mydearxym

config/config.exs

@@ -66,6 +66,15 @@ config :groupher_server, :customization,
 
 config :groupher_server, GroupherServerWeb.Gettext, default_locale: "zh_CN", locales: ~w(en zh_CN)
 
+#  config email services
+config :groupher_server, :system_emails,
+  support: "coderplanets <support@group.coderplanets.com>",
+  admin: "mydearxym@qq.com"
+
+config :groupher_server, GroupherServer.Mailer,
+  adapter: Bamboo.MailgunAdapter,
+  domain: "mailer.coderplanets.com"
+
 import_config "#{Mix.env()}.exs"
 
 if File.exists?("config/#{Mix.env()}.secret.exs") do

config/dev.exs

@@ -54,3 +54,6 @@ config :groupher_server, GroupherServer.Repo,
 config :groupher_server, :github_oauth,
   client_id: System.get_env("OAUTH_GITHUB_CLIENT_ID"),
   client_secret: System.get_env("OAUTH_GITHUB_CLIENT_SECRET")
+
+#  config email services
+config :groupher_server, GroupherServer.Mailer, api_key: System.get_env("MAILER_API_KEY")

config/mock.exs

@@ -19,3 +19,6 @@ config :groupher_server, GroupherServer.Repo,
   database: "groupher_server_mock",
   hostname: "localhost",
   pool_size: 10
+
+#  config email services
+config :groupher_server, GroupherServer.Mailer, adapter: Bamboo.LocalAdapter

config/prod.exs

@@ -95,3 +95,6 @@ config :sentry,
     env: "production"
   },
   included_environments: [:prod]
+
+#  config email services
+config :groupher_server, GroupherServer.Mailer, api_key: System.get_env("MAILER_API_KEY")

config/test.exs

@@ -25,3 +25,6 @@ config :groupher_server, GroupherServer.Repo,
 config :groupher_server, :github_oauth,
   client_id: "3b4281c5e54ffd801f85",
   client_secret: "51f04dd8239b27f00a39a647ef3704de4c5ddc26"
+
+#  config email services
+config :groupher_server, GroupherServer.Mailer, adapter: Bamboo.TestAdapter

cover/excoveralls.json

@@ -10,6 +10,7 @@ defmodule GroupherServer.Accounts.Delegate.Profile do
   alias Helper.{Guardian, ORM, QueryBuilder, RadarSearch}
   alias GroupherServer.Accounts.{Achievement, GithubUser, User, Social}
   alias GroupherServer.{CMS, Repo}
+  alias GroupherServer.Email
 
   alias Ecto.Multi
 
@@ -149,7 +150,16 @@ defmodule GroupherServer.Accounts.Delegate.Profile do
     |> register_github_result
   end
 
-  defp register_github_result({:ok, %{create_user: user}}), do: gen_token(user)
+  defp register_github_result({:ok, %{create_user: create_user}}) do
+    {:ok, user} = ORM.find(User, create_user.id, preload: :github_profile)
+
+    with {:ok, result} <- gen_token(user) do
+      Email.welcome(user)
+      Email.notify_admin(user, :new_register)
+
+      {:ok, result}
+    end
+  end
 
   defp register_github_result({:error, :create_user, %Ecto.Changeset{} = result, _steps}),
     do: {:error, result}

lib/groupher_server/accounts/delegates/profile.ex

@@ -67,9 +67,9 @@ defmodule GroupherServer.Accounts.User do
 
     has_many(:favorite_categories, {"favorite_categories", FavoriteCategory})
 
-    field(:sponsor_member, :boolean)
-    field(:paid_member, :boolean)
-    field(:platinum_member, :boolean)
+    # field(:sponsor_member, :boolean)
+    # field(:paid_member, :boolean)
+    # field(:platinum_member, :boolean)
 
     has_one(:customization, Customization)
     has_one(:purchase, Purchase)

lib/groupher_server/accounts/user.ex

@@ -4,8 +4,11 @@ defmodule GroupherServer.Billing.Delegate.Actions do
   """
   import Helper.Utils, only: [get_config: 2]
 
+  alias Helper.ORM
+
   alias GroupherServer.Accounts
   alias GroupherServer.Billing.BillRecord
+  alias GroupherServer.Email
 
   alias Accounts.User
 
@@ -15,29 +18,39 @@ defmodule GroupherServer.Billing.Delegate.Actions do
     plan = if amount >= @senior_amount_threshold, do: :senior, else: :donate
 
     with {:ok, _} <- Accounts.upgrade_by_plan(%User{id: record.user_id}, plan) do
+      send_thanks_email(record)
       {:ok, record}
     end
   end
 
   def after_bill(%BillRecord{payment_usage: "senior"} = record, :done) do
     with {:ok, _} <- Accounts.upgrade_by_plan(%User{id: record.user_id}, :senior) do
+      send_thanks_email(record)
       {:ok, record}
     end
   end
 
   def after_bill(%BillRecord{payment_usage: "girls_code_too_plan"} = record, :done) do
     with {:ok, _} <- Accounts.upgrade_by_plan(%User{id: record.user_id}, :senior) do
+      send_thanks_email(record)
       {:ok, record}
     end
   end
 
   def after_bill(%BillRecord{payment_usage: "sponsor"} = record, :done) do
     with {:ok, _} <- Accounts.upgrade_by_plan(%User{id: record.user_id}, :sponsor) do
+      send_thanks_email(record)
       {:ok, record}
     end
   end
 
   def after_bill(%BillRecord{payment_usage: _payment_usage}, _state) do
     {:error, "mismatch action"}
   end
+
+  defp send_thanks_email(%BillRecord{} = record) do
+    with {:ok, user} <- ORM.find(User, record.user_id, preload: :achievement) do
+      Email.thanks_donation(user, record)
+    end
+  end
 end

lib/groupher_server/billing/delegates/actions.ex

@@ -12,6 +12,7 @@ defmodule GroupherServer.Billing.Delegate.CURD do
   alias GroupherServer.Billing.BillRecord
   alias GroupherServer.Billing.Delegate.Actions
   alias GroupherServer.Repo
+  alias GroupherServer.Email
 
   alias Ecto.Multi
 
@@ -87,6 +88,10 @@ defmodule GroupherServer.Billing.Delegate.CURD do
       |> Map.merge(~m(user_id hash_id state)a)
       |> map_atom_value(:string)
 
-    BillRecord |> ORM.create(attrs)
+    with {:ok, record} <- ORM.create(BillRecord, attrs) do
+      Email.notify_admin(record, :payment)
+
+      {:ok, record}
+    end
   end
 end