Flatten out GitHub.Sync.User to Sync.User and Sync.GithubUser

Author: begedin

lib/code_corps/github/sync/github_comment/github_comment.ex

@@ -50,7 +50,7 @@ defmodule CodeCorps.GitHub.Sync.GithubComment do
   """
   @spec create_or_update_comment(GithubRepo.t, map) :: result
   def create_or_update_comment(%GithubRepo{} = github_repo, %{"id" => _, "issue_url" => _} = attrs) do
-    with {:ok, %GithubUser{} = github_user} <- Sync.User.GithubUser.create_or_update_github_user(attrs),
+    with {:ok, %GithubUser{} = github_user} <- Sync.GithubUser.create_or_update_github_user(attrs),
          {:ok, %GithubComment{} = github_comment} <- do_create_or_update_comment(github_repo, attrs, github_user) do
       {:ok, github_comment}
     else

lib/code_corps/github/sync/github_issue/github_issue.ex

@@ -31,7 +31,7 @@ defmodule CodeCorps.GitHub.Sync.GithubIssue do
   """
   @spec create_or_update_issue(map, GithubRepo.t, GithubPullRequest.t | nil) :: result
   def create_or_update_issue(%{} = payload, %GithubRepo{} = github_repo, github_pull_request \\ nil) do
-    with {:ok, %GithubUser{} = github_user} <- Sync.User.GithubUser.create_or_update_github_user(payload) do
+    with {:ok, %GithubUser{} = github_user} <- Sync.GithubUser.create_or_update_github_user(payload) do
       payload
       |> find_or_init()
       |> GithubIssue.changeset(payload |> Adapters.Issue.to_issue())

…de_corps/github/sync/user/github_user.ex …s/github/sync/github_user/github_user.exlib/code_corps/github/sync/user/github_user.ex renamed to lib/code_corps/github/sync/github_user/github_user.ex lib/code_corps/github/sync/user/github_user.ex renamed to lib/code_corps/github/sync/github_user/github_user.ex

@@ -1,4 +1,4 @@
-defmodule CodeCorps.GitHub.Sync.User.GithubUser do
+defmodule CodeCorps.GitHub.Sync.GithubUser do
   @moduledoc ~S"""
   In charge of syncing to a `GithubUser` record given a GitHub API payload
   containing the user.

lib/code_corps/github/sync/pull_request/pull_request.ex

@@ -32,7 +32,7 @@ defmodule CodeCorps.GitHub.Sync.PullRequest do
   """
   @spec create_or_update_pull_request(map, GithubRepo.t()) :: linking_result
   def create_or_update_pull_request(%{} = payload, %GithubRepo{} = github_repo) do
-    with {:ok, %GithubUser{} = github_user} <- Sync.User.GithubUser.create_or_update_github_user(payload) do
+    with {:ok, %GithubUser{} = github_user} <- Sync.GithubUser.create_or_update_github_user(payload) do
 
       attrs = to_params(payload, github_repo, github_user)
 

lib/code_corps/github/sync/sync.ex

@@ -477,7 +477,7 @@ defmodule CodeCorps.GitHub.Sync do
          {:ok, _comments} <- comment_payloads |> Enum.map(&Sync.GithubComment.create_or_update_comment(repo, &1)) |> ResultAggregator.aggregate |> sync_step(:sync_comments),
          repo <- GithubRepo |> Repo.get(repo.id) |> preload_github_repo(),
          {:ok, repo} <- repo |> mark_repo("syncing_users"),
-         {:ok, _users} <- repo |> Sync.User.User.sync_github_repo() |> sync_step(:sync_users),
+         {:ok, _users} <- repo |> Sync.User.sync_github_repo() |> sync_step(:sync_users),
          {:ok, repo} <- repo |> mark_repo("syncing_tasks"),
          {:ok, _tasks} <- repo |> Sync.Task.sync_github_repo() |> sync_step(:sync_tasks),
          {:ok, repo} <- repo |> mark_repo("syncing_comments"),

lib/code_corps/github/sync/user/user.ex

@@ -1,4 +1,4 @@
-defmodule CodeCorps.GitHub.Sync.User.User do
+defmodule CodeCorps.GitHub.Sync.User do
   @moduledoc ~S"""
   In charge of finding or creating a `User` given a `GithubUser`.
   """