Skip to content

Commit 85218da

Browse files
begedinbegedin
committed
FLatten out Sync.Comment/Sync.GithubComment structure
1 parent 5cae90e commit 85218da

8 files changed

Lines changed: 30 additions & 31 deletions

File tree

‎lib/code_corps/comment/service.ex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ defmodule CodeCorps.Comment.Service do
8484
defp create_on_github(%Comment{task: %Task{github_issue: github_issue}} = comment) do
8585
with {:ok, payload} <- comment |> GitHub.API.Comment.create(),
8686
{:ok, %GithubComment{} = github_comment} <-
87-
Sync.Comment.GithubComment.create_or_update_comment(github_issue, payload) do
87+
Sync.GithubComment.create_or_update_comment(github_issue, payload) do
8888
comment |> link_with_github_changeset(github_comment) |> Repo.update()
8989
else
9090
{:error, error} -> {:error, error}
@@ -103,7 +103,7 @@ defmodule CodeCorps.Comment.Service do
103103
) do
104104
with {:ok, payload} <- comment |> GitHub.API.Comment.update(),
105105
{:ok, %GithubComment{}} <-
106-
Sync.Comment.GithubComment.create_or_update_comment(github_issue, payload) do
106+
Sync.GithubComment.create_or_update_comment(github_issue, payload) do
107107
{:ok, comment}
108108
else
109109
{:error, error} -> {:error, error}

lib/code_corps/github/sync/comment/comment/changeset.ex renamed to lib/code_corps/github/sync/comment/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.Comment.Comment.Changeset do
1+
defmodule CodeCorps.GitHub.Sync.Comment.Changeset do
22
@moduledoc ~S"""
33
In charge of building a `Changeset` to update a `Comment` with, when handling
44
a GitHub Comment payload.

lib/code_corps/github/sync/comment/comment/comment.ex renamed to lib/code_corps/github/sync/comment/comment.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule CodeCorps.GitHub.Sync.Comment.Comment do
1+
defmodule CodeCorps.GitHub.Sync.Comment do
22
@moduledoc ~S"""
33
In charge of syncing `CodeCorps.Comment` records with a GitHub comment
44
payload.
@@ -43,12 +43,12 @@ defmodule CodeCorps.GitHub.Sync.Comment.Comment do
4343
case find_comment(task, github_comment) do
4444
nil ->
4545
github_comment
46-
|> Sync.Comment.Comment.Changeset.create_changeset(task, user)
46+
|> Sync.Comment.Changeset.create_changeset(task, user)
4747
|> Repo.insert()
4848

4949
%Comment{} = comment ->
5050
comment
51-
|> Sync.Comment.Comment.Changeset.update_changeset(github_comment)
51+
|> Sync.Comment.Changeset.update_changeset(github_comment)
5252
|> Repo.update()
5353
end
5454
end

lib/code_corps/github/sync/comment/github_comment/github_comment.ex renamed to lib/code_corps/github/sync/github_comment/github_comment.ex

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

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ defmodule CodeCorps.GitHub.Sync do
119119

120120
multi =
121121
Multi.new
122-
|> Multi.run(:deleted_comments, fn _ -> Sync.Comment.Comment.delete(github_id) end)
123-
|> Multi.run(:deleted_github_comment, fn _ -> Sync.Comment.GithubComment.delete(github_id) end)
122+
|> Multi.run(:deleted_comments, fn _ -> Sync.Comment.delete(github_id) end)
123+
|> Multi.run(:deleted_github_comment, fn _ -> Sync.GithubComment.delete(github_id) end)
124124

125125
case multi |> Repo.transaction() do
126126
{:ok, %{deleted_comments: _, deleted_github_comment: _} = result} ->
@@ -153,13 +153,13 @@ defmodule CodeCorps.GitHub.Sync do
153153
end)
154154
|> Multi.run(:github_comment, fn %{github_issue: github_issue} ->
155155
github_issue
156-
|> Sync.Comment.GithubComment.create_or_update_comment(comment_payload)
156+
|> Sync.GithubComment.create_or_update_comment(comment_payload)
157157
end)
158158
|> Multi.run(:comment_user, fn %{github_comment: github_comment} ->
159159
github_comment |> Sync.User.RecordLinker.link_to(comment_payload)
160160
end)
161161
|> Multi.run(:comment, fn %{github_comment: github_comment, comment_user: user, task: task} ->
162-
task |> Sync.Comment.Comment.sync(github_comment, user)
162+
task |> Sync.Comment.sync(github_comment, user)
163163
end)
164164

165165
case multi |> Repo.transaction() do
@@ -217,13 +217,13 @@ defmodule CodeCorps.GitHub.Sync do
217217
end)
218218
|> Multi.run(:github_comment, fn %{github_issue: github_issue} ->
219219
github_issue
220-
|> Sync.Comment.GithubComment.create_or_update_comment(comment_payload)
220+
|> Sync.GithubComment.create_or_update_comment(comment_payload)
221221
end)
222222
|> Multi.run(:comment_user, fn %{github_comment: github_comment} ->
223223
github_comment |> Sync.User.RecordLinker.link_to(comment_payload)
224224
end)
225225
|> Multi.run(:comment, fn %{github_comment: github_comment, comment_user: user, task: task} ->
226-
task |> Sync.Comment.Comment.sync(github_comment, user)
226+
task |> Sync.Comment.sync(github_comment, user)
227227
end)
228228

229229
case multi |> Repo.transaction() do
@@ -474,14 +474,14 @@ defmodule CodeCorps.GitHub.Sync do
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}),
477-
{:ok, _comments} <- comment_payloads |> Enum.map(&Sync.Comment.GithubComment.create_or_update_comment(repo, &1)) |> ResultAggregator.aggregate |> sync_step(:sync_comments),
477+
{:ok, _comments} <- comment_payloads |> Enum.map(&Sync.GithubComment.create_or_update_comment(repo, &1)) |> ResultAggregator.aggregate |> sync_step(:sync_comments),
478478
repo <- GithubRepo |> Repo.get(repo.id) |> preload_github_repo(),
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"),
482482
{:ok, _tasks} <- repo |> Sync.Issue.Task.sync_github_repo() |> sync_step(:sync_tasks),
483483
{:ok, repo} <- repo |> mark_repo("syncing_comments"),
484-
{:ok, _comments} <- repo |> Sync.Comment.Comment.sync_github_repo() |> sync_step(:sync_comments),
484+
{:ok, _comments} <- repo |> Sync.Comment.sync_github_repo() |> sync_step(:sync_comments),
485485
{:ok, repo} <- repo |> mark_repo("synced")
486486
do
487487
{:ok, repo}

test/lib/code_corps/github/sync/comment/comment/changeset_test.exs renamed to test/lib/code_corps/github/sync/comment/changeset_test.exs

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

44
use CodeCorps.DbAccessCase
@@ -14,7 +14,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.Comment.ChangesetTest do
1414

1515
changeset =
1616
github_comment
17-
|> Sync.Comment.Comment.Changeset.create_changeset(task, user)
17+
|> Sync.Comment.Changeset.create_changeset(task, user)
1818

1919
expected_body =
2020
github_comment.body
@@ -45,7 +45,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.Comment.ChangesetTest do
4545

4646
changeset =
4747
comment
48-
|> Sync.Comment.Comment.Changeset.update_changeset(github_comment)
48+
|> Sync.Comment.Changeset.update_changeset(github_comment)
4949

5050
expected_body =
5151
github_comment.body
@@ -76,7 +76,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.Comment.ChangesetTest do
7676

7777
changeset =
7878
comment
79-
|> Sync.Comment.Comment.Changeset.update_changeset(github_comment)
79+
|> Sync.Comment.Changeset.update_changeset(github_comment)
8080

8181
refute changeset.valid?
8282
assert changeset.errors[:modified_at] ==

test/lib/code_corps/github/sync/comment/comment/comment_test.exs renamed to test/lib/code_corps/github/sync/comment/comment_test.exs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.CommentTest do
2121
|> Map.update!(:github_updated_at, &Timex.shift(&1, minutes: 1))
2222

2323
{:ok, comment} =
24-
task |> Sync.Comment.Comment.sync(github_comment, user)
24+
task |> Sync.Comment.sync(github_comment, user)
2525

2626
assert comment.user_id == user.id
2727
assert comment.markdown == github_comment.body
@@ -47,7 +47,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.CommentTest do
4747
|> Map.update!(:github_updated_at, &Timex.shift(&1, minutes: 1))
4848

4949
{:ok, comment} =
50-
task |> Sync.Comment.Comment.sync(github_comment, user)
50+
task |> Sync.Comment.sync(github_comment, user)
5151

5252
assert comment.user_id == user.id
5353
assert comment.markdown == github_comment.body
@@ -75,7 +75,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.CommentTest do
7575
%{user: user} = insert(:comment, task: task, github_comment: github_comment)
7676

7777
{:error, changeset} =
78-
task |> Sync.Comment.Comment.sync(github_comment, user)
78+
task |> Sync.Comment.sync(github_comment, user)
7979

8080
refute changeset.valid?
8181
end
@@ -91,7 +91,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.CommentTest do
9191

9292
{:ok, deleted_comments} =
9393
github_comment.github_id
94-
|> Sync.Comment.Comment.delete
94+
|> Sync.Comment.delete()
9595

9696
assert Enum.count(deleted_comments) == 2
9797
assert Repo.aggregate(Comment, :count, :id) == 1
@@ -107,7 +107,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.CommentTest do
107107

108108
{:ok, deleted_comments} =
109109
github_comment.github_id
110-
|> Sync.Comment.Comment.delete
110+
|> Sync.Comment.delete()
111111

112112
assert Enum.count(deleted_comments) == 0
113113
end

test/lib/code_corps/github/sync/comment/github_comment/github_comment_test.exs renamed to test/lib/code_corps/github/sync/github_comment/github_comment_test.exs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@ defmodule CodeCorps.GitHub.Sync.Comment.GithubCommentTest do
77

88
alias CodeCorps.{
99
GitHub.Adapters,
10+
GitHub.Sync,
1011
GithubComment,
1112
Repo
1213
}
13-
alias CodeCorps.GitHub.Sync.Comment.GithubComment, as: GithubCommentSyncer
14-
1514
@payload load_event_fixture("issue_comment_created")
1615

1716
describe "create_or_update_comment/1" do
1817
test "creates comment if none exists" do
1918
%{"comment" => attrs} = @payload
2019
github_issue = insert(:github_issue)
21-
{:ok, %GithubComment{} = created_comment} = GithubCommentSyncer.create_or_update_comment(github_issue, attrs)
20+
{:ok, %GithubComment{} = created_comment} = Sync.GithubComment.create_or_update_comment(github_issue, attrs)
2221

2322
assert Repo.one(GithubComment)
2423

@@ -34,7 +33,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.GithubCommentTest do
3433
github_issue = insert(:github_issue)
3534
github_comment = insert(:github_comment, github_id: comment_id, github_issue: github_issue)
3635

37-
{:ok, %GithubComment{} = updated_comment} = GithubCommentSyncer.create_or_update_comment(github_issue, attrs)
36+
{:ok, %GithubComment{} = updated_comment} = Sync.GithubComment.create_or_update_comment(github_issue, attrs)
3837

3938
assert updated_comment.id == github_comment.id
4039
assert updated_comment.github_issue_id == github_issue.id
@@ -45,7 +44,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.GithubCommentTest do
4544
%{"comment" => attrs} = bad_payload
4645
github_issue = insert(:github_issue)
4746

48-
{:error, changeset} = GithubCommentSyncer.create_or_update_comment(github_issue, attrs)
47+
{:error, changeset} = Sync.GithubComment.create_or_update_comment(github_issue, attrs)
4948
refute changeset.valid?
5049
end
5150
end
@@ -56,7 +55,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.GithubCommentTest do
5655

5756
{:ok, deleted_github_comment} =
5857
github_comment.github_id
59-
|> GithubCommentSyncer.delete()
58+
|> Sync.GithubComment.delete()
6059

6160
assert Repo.aggregate(GithubComment, :count, :id) == 0
6261
assert deleted_github_comment.id == github_comment.id
@@ -67,7 +66,7 @@ defmodule CodeCorps.GitHub.Sync.Comment.GithubCommentTest do
6766

6867
{:ok, %GithubComment{} = empty_github_comment} =
6968
"123"
70-
|> GithubCommentSyncer.delete()
69+
|> Sync.GithubComment.delete()
7170

7271
refute empty_github_comment.id
7372
end

0 commit comments

Comments
 (0)