Skip to content

Commit 8922d97

Browse files
begedinbegedin
committed
Flatten out GitHub.Sync.Issue into GitHub.Sync.Task/GithubIssue
1 parent 85218da commit 8922d97

File tree

8 files changed

+33
-34
lines changed

8 files changed

+33
-34
lines changed

lib/code_corps/github/sync/issue/github_issue/github_issue.ex renamed to lib/code_corps/github/sync/github_issue/github_issue.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule CodeCorps.GitHub.Sync.Issue.GithubIssue do
1+
defmodule CodeCorps.GitHub.Sync.GithubIssue do
22
@moduledoc ~S"""
33
In charge of finding or creating a `CodeCorps.GithubIssue` to link with a
44
`CodeCorps.Task` when processing a GitHub Issue payload.

‎lib/code_corps/github/sync/sync.ex‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ defmodule CodeCorps.GitHub.Sync do
4343
|> Multi.run(:repo, fn _ -> Finder.find_repo(payload) end)
4444
|> Multi.run(:github_issue, fn %{repo: github_repo} ->
4545
issue_payload
46-
|> Sync.Issue.GithubIssue.create_or_update_issue(github_repo)
46+
|> Sync.GithubIssue.create_or_update_issue(github_repo)
4747
end)
4848
|> Multi.run(:issue_user, fn %{github_issue: github_issue} ->
4949
github_issue |> Sync.User.RecordLinker.link_to(issue_payload)
5050
end)
5151
|> Multi.run(:task, fn %{github_issue: github_issue, issue_user: user} ->
52-
github_issue |> Sync.Issue.Task.sync_github_issue(user)
52+
github_issue |> Sync.Task.sync_github_issue(user)
5353
end)
5454

5555
case multi |> Repo.transaction() do
@@ -143,13 +143,13 @@ defmodule CodeCorps.GitHub.Sync do
143143
end)
144144
|> Multi.run(:github_issue, fn %{repo: github_repo, github_pull_request: github_pull_request} ->
145145
issue_payload
146-
|> Sync.Issue.GithubIssue.create_or_update_issue(github_repo, github_pull_request)
146+
|> Sync.GithubIssue.create_or_update_issue(github_repo, github_pull_request)
147147
end)
148148
|> Multi.run(:issue_user, fn %{github_issue: github_issue} ->
149149
github_issue |> Sync.User.RecordLinker.link_to(issue_payload)
150150
end)
151151
|> Multi.run(:task, fn %{github_issue: github_issue, issue_user: user} ->
152-
github_issue |> Sync.Issue.Task.sync_github_issue(user)
152+
github_issue |> Sync.Task.sync_github_issue(user)
153153
end)
154154
|> Multi.run(:github_comment, fn %{github_issue: github_issue} ->
155155
github_issue
@@ -207,13 +207,13 @@ defmodule CodeCorps.GitHub.Sync do
207207
Multi.new
208208
|> Multi.run(:repo, fn _ -> Finder.find_repo(payload) end)
209209
|> Multi.run(:github_issue, fn %{repo: github_repo} ->
210-
issue_payload |> Sync.Issue.GithubIssue.create_or_update_issue(github_repo)
210+
issue_payload |> Sync.GithubIssue.create_or_update_issue(github_repo)
211211
end)
212212
|> Multi.run(:issue_user, fn %{github_issue: github_issue} ->
213213
github_issue |> Sync.User.RecordLinker.link_to(issue_payload)
214214
end)
215215
|> Multi.run(:task, fn %{github_issue: github_issue, issue_user: user} ->
216-
github_issue |> Sync.Issue.Task.sync_github_issue(user)
216+
github_issue |> Sync.Task.sync_github_issue(user)
217217
end)
218218
|> Multi.run(:github_comment, fn %{github_issue: github_issue} ->
219219
github_issue
@@ -398,13 +398,13 @@ defmodule CodeCorps.GitHub.Sync do
398398
end)
399399
|> Multi.run(:github_issue, fn %{fetch_issue: issue_payload, repo: github_repo, github_pull_request: github_pull_request} ->
400400
issue_payload
401-
|> Sync.Issue.GithubIssue.create_or_update_issue(github_repo, github_pull_request)
401+
|> Sync.GithubIssue.create_or_update_issue(github_repo, github_pull_request)
402402
end)
403403
|> Multi.run(:issue_user, fn %{fetch_issue: issue_payload, github_issue: github_issue} ->
404404
Sync.User.RecordLinker.link_to(github_issue, issue_payload)
405405
end)
406406
|> Multi.run(:task, fn %{github_issue: github_issue, issue_user: user} ->
407-
github_issue |> Sync.Issue.Task.sync_github_issue(user)
407+
github_issue |> Sync.Task.sync_github_issue(user)
408408
end)
409409

410410
case multi |> Repo.transaction() do
@@ -470,7 +470,7 @@ defmodule CodeCorps.GitHub.Sync do
470470
{:ok, issue_payloads} <- repo |> API.Repository.issues |> sync_step(:fetch_issues),
471471
{:ok, repo} <- repo |> mark_repo("syncing_github_issues", %{syncing_issues_count: issue_payloads |> Enum.count}),
472472
paired_issues <- issue_payloads |> pair_issues_payloads_with_prs(pull_requests),
473-
{:ok, _issues} <- paired_issues |> Enum.map(fn {issue_payload, pr} -> issue_payload |> Sync.Issue.GithubIssue.create_or_update_issue(repo, pr) end) |> ResultAggregator.aggregate |> sync_step(:sync_issues),
473+
{:ok, _issues} <- paired_issues |> Enum.map(fn {issue_payload, pr} -> issue_payload |> Sync.GithubIssue.create_or_update_issue(repo, pr) end) |> ResultAggregator.aggregate |> sync_step(:sync_issues),
474474
{:ok, repo} <- repo |> mark_repo("fetching_comments"),
475475
{:ok, comment_payloads} <- repo |> API.Repository.issue_comments |> sync_step(:fetch_comments),
476476
{:ok, repo} <- repo |> mark_repo("syncing_github_comments", %{syncing_comments_count: comment_payloads |> Enum.count}),
@@ -479,7 +479,7 @@ defmodule CodeCorps.GitHub.Sync do
479479
{:ok, repo} <- repo |> mark_repo("syncing_users"),
480480
{:ok, _users} <- repo |> Sync.User.User.sync_github_repo() |> sync_step(:sync_users),
481481
{:ok, repo} <- repo |> mark_repo("syncing_tasks"),
482-
{:ok, _tasks} <- repo |> Sync.Issue.Task.sync_github_repo() |> sync_step(:sync_tasks),
482+
{:ok, _tasks} <- repo |> Sync.Task.sync_github_repo() |> sync_step(:sync_tasks),
483483
{:ok, repo} <- repo |> mark_repo("syncing_comments"),
484484
{:ok, _comments} <- repo |> Sync.Comment.sync_github_repo() |> sync_step(:sync_comments),
485485
{:ok, repo} <- repo |> mark_repo("synced")

lib/code_corps/github/sync/issue/task/changeset.ex renamed to lib/code_corps/github/sync/task/changeset.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule CodeCorps.GitHub.Sync.Issue.Task.Changeset do
1+
defmodule CodeCorps.GitHub.Sync.Task.Changeset do
22
@moduledoc ~S"""
33
In charge of building a `Changeset` to update a `Task` with, when handling an
44
Issues webhook.

lib/code_corps/github/sync/issue/task/task.ex renamed to lib/code_corps/github/sync/task/task.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule CodeCorps.GitHub.Sync.Issue.Task do
1+
defmodule CodeCorps.GitHub.Sync.Task do
22
alias CodeCorps.{
33
GitHub.Sync,
44
GitHub.Utils.ResultAggregator,
@@ -60,12 +60,12 @@ defmodule CodeCorps.GitHub.Sync.Issue.Task do
6060
case find_task(repo, issue) do
6161
nil ->
6262
issue
63-
|> Sync.Issue.Task.Changeset.create_changeset(repo, user)
63+
|> Sync.Task.Changeset.create_changeset(repo, user)
6464
|> Repo.insert()
6565

6666
%Task{} = task ->
6767
task
68-
|> Sync.Issue.Task.Changeset.update_changeset(issue, repo)
68+
|> Sync.Task.Changeset.update_changeset(issue, repo)
6969
|> Repo.update()
7070
end
7171
end

‎lib/code_corps/tasks/tasks.ex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ defmodule CodeCorps.Tasks do
7272
with {:ok, payload} <- GitHub.API.Issue.create(task),
7373
{:ok, %GithubIssue{} = github_issue} <-
7474
payload
75-
|> Sync.Issue.GithubIssue.create_or_update_issue(github_repo) do
75+
|> Sync.GithubIssue.create_or_update_issue(github_repo) do
7676
task |> link_with_github_changeset(github_issue) |> Repo.update()
7777
else
7878
{:error, error} -> {:error, error}
@@ -89,7 +89,7 @@ defmodule CodeCorps.Tasks do
8989
defp update_on_github(%Task{github_repo_id: _, github_issue_id: nil} = task), do: task |> create_on_github()
9090
defp update_on_github(%Task{github_repo: github_repo} = task) do
9191
with {:ok, payload} <- GitHub.API.Issue.update(task),
92-
{:ok, %GithubIssue{}} <- payload |> Sync.Issue.GithubIssue.create_or_update_issue(github_repo),
92+
{:ok, %GithubIssue{}} <- payload |> Sync.GithubIssue.create_or_update_issue(github_repo),
9393
%Task{} = task <- Repo.get(Task, task.id) do
9494
{:ok, task}
9595
else

test/lib/code_corps/github/sync/issue/github_issue/github_issue_test.exs renamed to test/lib/code_corps/github/sync/github_issue/github_issue_test.exs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
defmodule CodeCorps.GitHub.Sync.Issue.GithubIssueTest do
1+
defmodule CodeCorps.GitHub.Sync.GithubIssueTest do
22
@moduledoc false
33

44
use CodeCorps.DbAccessCase
55

66
import CodeCorps.GitHub.TestHelpers
77

88
alias CodeCorps.{
9+
GitHub.Adapters,
10+
GitHub.Sync,
911
GithubIssue,
1012
Repo
1113
}
12-
alias CodeCorps.GitHub.Sync.Issue.GithubIssue, as: GithubIssueSyncer
13-
alias CodeCorps.GitHub.Adapters.Issue, as: IssueAdapter
1414

1515
@issue_event_payload load_event_fixture("issues_opened")
1616

@@ -19,13 +19,13 @@ defmodule CodeCorps.GitHub.Sync.Issue.GithubIssueTest do
1919
%{"issue" => attrs} = @issue_event_payload
2020
github_repo = insert(:github_repo)
2121
{:ok, %GithubIssue{} = created_issue} =
22-
attrs |> GithubIssueSyncer.create_or_update_issue(github_repo)
22+
attrs |> Sync.GithubIssue.create_or_update_issue(github_repo)
2323

2424
assert Repo.one(GithubIssue)
2525

2626
created_attributes =
2727
attrs
28-
|> IssueAdapter.to_issue
28+
|> Adapters.Issue.to_issue
2929
|> Map.delete(:closed_at)
3030
|> Map.delete(:repository_url)
3131

@@ -42,7 +42,7 @@ defmodule CodeCorps.GitHub.Sync.Issue.GithubIssueTest do
4242
insert(:github_issue, github_id: issue_id, github_repo: github_repo)
4343

4444
{:ok, %GithubIssue{} = updated_issue} =
45-
attrs |> GithubIssueSyncer.create_or_update_issue(github_repo)
45+
attrs |> Sync.GithubIssue.create_or_update_issue(github_repo)
4646

4747
assert updated_issue.id == issue.id
4848
assert updated_issue.github_repo_id == github_repo.id
@@ -54,7 +54,7 @@ defmodule CodeCorps.GitHub.Sync.Issue.GithubIssueTest do
5454
github_pull_request = insert(:github_pull_request, github_repo: github_repo)
5555
{:ok, %GithubIssue{} = created_issue} =
5656
attrs
57-
|> GithubIssueSyncer.create_or_update_issue(github_repo, github_pull_request)
57+
|> Sync.GithubIssue.create_or_update_issue(github_repo, github_pull_request)
5858

5959
assert created_issue.github_pull_request_id == github_pull_request.id
6060
end
@@ -68,7 +68,7 @@ defmodule CodeCorps.GitHub.Sync.Issue.GithubIssueTest do
6868

6969
{:ok, %GithubIssue{} = updated_issue} =
7070
attrs
71-
|> GithubIssueSyncer.create_or_update_issue(github_repo, github_pull_request)
71+
|> Sync.GithubIssue.create_or_update_issue(github_repo, github_pull_request)
7272

7373
assert updated_issue.id == issue.id
7474
assert updated_issue.github_pull_request_id == github_pull_request.id
@@ -79,7 +79,7 @@ defmodule CodeCorps.GitHub.Sync.Issue.GithubIssueTest do
7979
%{"issue" => attrs} = bad_payload
8080
github_repo = insert(:github_repo)
8181

82-
{:error, changeset} = attrs |> GithubIssueSyncer.create_or_update_issue(github_repo)
82+
{:error, changeset} = attrs |> Sync.GithubIssue.create_or_update_issue(github_repo)
8383
refute changeset.valid?
8484
end
8585
end

test/lib/code_corps/github/sync/issue/task/changeset_test.exs renamed to test/lib/code_corps/github/sync/task/changeset_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
defmodule CodeCorps.GitHub.Sync.Issue.Task.ChangesetTest do
1+
defmodule CodeCorps.GitHub.Sync.Task.ChangesetTest do
22
@moduledoc false
33

44
use CodeCorps.DbAccessCase
55

6-
alias CodeCorps.GitHub.Sync.Issue.Task
6+
alias CodeCorps.GitHub.Sync.Task
77
alias Ecto.Changeset
88

99
describe "create_changeset/4" do

test/lib/code_corps/github/sync/issue/task/task_test.exs renamed to test/lib/code_corps/github/sync/task/task_test.exs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
defmodule CodeCorps.GitHub.Sync.Issue.TaskTest do
1+
defmodule CodeCorps.GitHub.Sync.TaskTest do
22
@moduledoc false
33

44
use CodeCorps.DbAccessCase
55

6-
alias CodeCorps.{Repo, Task}
7-
alias CodeCorps.GitHub.Sync.Issue.Task, as: IssueTaskSyncer
6+
alias CodeCorps.{GitHub.Sync, Repo, Task}
87

98
describe "sync all/3" do
109
defp setup_test_data do
@@ -35,7 +34,7 @@ defmodule CodeCorps.GitHub.Sync.Issue.TaskTest do
3534
existing_task =
3635
insert(:task, project: project, github_issue: github_issue, github_repo: github_repo, user: user)
3736

38-
{:ok, task} = github_issue |> IssueTaskSyncer.sync_github_issue(user)
37+
{:ok, task} = github_issue |> Sync.Task.sync_github_issue(user)
3938

4039
assert Repo.aggregate(Task, :count, :id) == 1
4140

@@ -48,7 +47,7 @@ defmodule CodeCorps.GitHub.Sync.Issue.TaskTest do
4847

4948
test "sets task :modified_from to 'github'" do
5049
%{github_issue: github_issue, user: user} = setup_test_data()
51-
{:ok, task} = github_issue |> IssueTaskSyncer.sync_github_issue(user)
50+
{:ok, task} = github_issue |> Sync.Task.sync_github_issue(user)
5251
assert task.modified_from == "github"
5352
end
5453

@@ -61,7 +60,7 @@ defmodule CodeCorps.GitHub.Sync.Issue.TaskTest do
6160

6261
insert(:task_list, project: project, inbox: true)
6362

64-
{:error, changeset} = github_issue |> IssueTaskSyncer.sync_github_issue(user)
63+
{:error, changeset} = github_issue |> Sync.Task.sync_github_issue(user)
6564

6665
refute changeset.valid?
6766
end

0 commit comments

Comments
 (0)