Merge branch 'develop' of https://github.com/code-corps/code-corps-api into develop

Author: zacck

config/test.exs

@@ -22,7 +22,6 @@ config :code_corps, site_url: "http://localhost:4200"
 
 # speed up password hashing
 config :comeonin, :bcrypt_log_rounds, 4
-config :comeonin, :pbkdf2_rounds, 1
 
 # CORS allowed origins
 config :code_corps, allowed_origins: ["http://localhost:4200"]

lib/code_corps/analytics/segment_data_extractor.ex

@@ -7,6 +7,14 @@ defmodule CodeCorps.Analytics.SegmentDataExtractor do
   def get_action(%Plug.Conn{private: %{phoenix_action: action}}), do: action
   def get_action(_), do: nil
 
+  @doc """
+  Tries to extract project id from given resource.
+  Returns `nil` if project id can't be extracted.
+  """
+  @spec get_project_id(CodeCorps.ProjectUser.t) :: String.t | nil
+  def get_project_id(%CodeCorps.ProjectUser{project_id: id}), do: "project_#{id}"
+  def get_project_id(_), do: nil
+
   @spec get_resource(Plug.Conn.t) :: struct
   def get_resource(%Plug.Conn{assigns: %{data: data}}), do: data
   # these are used for delete actions on records that support it

lib/code_corps/analytics/segment_event_name_builder.ex

@@ -14,12 +14,6 @@ defmodule CodeCorps.Analytics.SegmentEventNameBuilder do
   defp get_event_name(:update, %CodeCorps.DonationGoal{}) do
     "Updated Donation Goal"
   end
-  defp get_event_name(:create, %CodeCorps.ProjectUser{}) do
-    "Requested Project Membership"
-  end
-  defp get_event_name(:update, %CodeCorps.ProjectUser{}) do
-    "Approved Project Membership"
-  end
   defp get_event_name(:payment_succeeded, %CodeCorps.StripeInvoice{}) do
     "Processed Subscription Payment"
   end

lib/code_corps/analytics/segment_tracking_support.ex

@@ -11,8 +11,6 @@ defmodule CodeCorps.Analytics.SegmentTrackingSupport do
   def includes?(:update, %CodeCorps.Comment{}), do: true
   def includes?(:create, %CodeCorps.DonationGoal{}), do: true
   def includes?(:update, %CodeCorps.DonationGoal{}), do: true
-  def includes?(:create, %CodeCorps.ProjectUser{}), do: true
-  def includes?(:update, %CodeCorps.ProjectUser{}), do: true
   def includes?(:create, %CodeCorps.StripeConnectAccount{}), do: true
   def includes?(:create, %CodeCorps.StripeConnectCharge{}), do: true
   def includes?(:create, %CodeCorps.StripeConnectPlan{}), do: true

lib/code_corps/analytics/segment_traits_builder.ex

@@ -225,4 +225,9 @@ defmodule CodeCorps.Analytics.SegmentTraitsBuilder do
     }
   end
   defp traits(%{token: _, user_id: _}), do: %{}
+  defp traits(%{acceptor: user, project_user: project_user}) do
+    project_user
+    |> traits()
+    |> Map.merge(%{acceptor_id: user.id, acceptor: user.username})
+  end
 end

lib/code_corps/comment/service.ex

@@ -84,7 +84,7 @@ defmodule CodeCorps.Comment.Service do
   defp create_on_github(%Comment{task: %Task{github_issue: github_issue}} = comment) do
     with {:ok, payload} <- comment |> GitHub.API.Comment.create(),
          {:ok, %GithubComment{} = github_comment} <-
-           Sync.Comment.GithubComment.create_or_update_comment(github_issue, payload) do
+           Sync.GithubComment.create_or_update_comment(github_issue, payload) do
       comment |> link_with_github_changeset(github_comment) |> Repo.update()
     else
       {:error, error} -> {:error, error}
@@ -103,7 +103,7 @@ defmodule CodeCorps.Comment.Service do
        ) do
     with {:ok, payload} <- comment |> GitHub.API.Comment.update(),
          {:ok, %GithubComment{}} <-
-           Sync.Comment.GithubComment.create_or_update_comment(github_issue, payload) do
+           Sync.GithubComment.create_or_update_comment(github_issue, payload) do
       {:ok, comment}
     else
       {:error, error} -> {:error, error}

lib/code_corps/emails/message_initiated_by_project_email.ex

@@ -11,7 +11,7 @@ defmodule CodeCorps.Emails.MessageInitiatedByProjectEmail do
     WebClient
   }
 
-  @spec create(User.t, String.t) :: Bamboo.Email.t
+  @spec create(Message.t, Conversation.t) :: Bamboo.Email.t
   def create(
     %Message{project: %Project{} = project},
     %Conversation{user: %User{} = user} = conversation) do

lib/code_corps/github/event/installation/installation.ex

@@ -6,7 +6,10 @@ defmodule CodeCorps.GitHub.Event.Installation do
 
   @behaviour CodeCorps.GitHub.Event.Handler
 
-  alias CodeCorps.{GitHub.Sync, GitHub.Event.Installation}
+  alias CodeCorps.{
+    GitHub.Sync,
+    GitHub.Event.Installation
+  }
 
 
   @doc """
@@ -17,6 +20,7 @@ defmodule CodeCorps.GitHub.Event.Installation do
 
   `CodeCorps.GitHub.Sync.installation_event/1`
   """
+  @impl CodeCorps.GitHub.Event.Handler
   @spec handle(map) ::
     Sync.installation_event_outcome() | {:error, :unexpected_payload}
   def handle(payload) do

lib/code_corps/github/event/installation_repositories/installation_repositories.ex

@@ -10,16 +10,9 @@ defmodule CodeCorps.GitHub.Event.InstallationRepositories do
 
   alias CodeCorps.{
     GitHub.Sync,
-    GithubRepo,
     GitHub.Event.InstallationRepositories
   }
 
-  @type outcome :: {:ok, list(GithubRepo.t())} |
-                   {:error, :unmatched_installation} |
-                   {:error, :unexpected_payload} |
-                   {:error, :validation_error_on_syncing_repos} |
-                   {:error, :unexpected_transaction_outcome}
-
   @doc """
   Handles an "InstallationRepositories" GitHub Webhook event. The event could be
   of subtype "added" or "removed" and is handled differently based on that.
@@ -34,7 +27,10 @@ defmodule CodeCorps.GitHub.Event.InstallationRepositories do
       - if the GitHub payload for a repo is not matched with a record in our
         database, just skip deleting it
   """
-  @spec handle(map) :: outcome
+  @impl CodeCorps.GitHub.Event.Handler
+  @spec handle(map) ::
+    Sync.installation_repositories_event_outcome() |
+    {:error, :unexpected_payload}
   def handle(payload) do
     with {:ok, :valid} <- payload |> validate_payload() do
       Sync.installation_repositories_event(payload)

lib/code_corps/github/event/issue_comment/issue_comment.ex

@@ -8,10 +8,9 @@ defmodule CodeCorps.GitHub.Event.IssueComment do
   @behaviour CodeCorps.GitHub.Event.Handler
 
   alias CodeCorps.{
-    GitHub,
+    GitHub.Sync,
     GitHub.Event.IssueComment.Validator
   }
-  alias GitHub.Sync
 
   @doc ~S"""
   Handles the "IssueComment" GitHub webhook
@@ -23,7 +22,8 @@ defmodule CodeCorps.GitHub.Event.IssueComment do
   - sync the comment using `CodeCorps.GitHub.Sync.Comment`
   """
   @impl CodeCorps.GitHub.Event.Handler
-  @spec handle(map) :: {:ok, any} | {:error, atom}
+  @spec handle(map) ::
+    Sync.issue_comment_event_outcome() | {:error, :unexpected_payload}
   def handle(payload) do
     with {:ok, :valid} <- validate_payload(payload) do
       Sync.issue_comment_event(payload)