Skip to content

Commit 0000ef0

Browse files
webmozartwebmozart
committed
Improved architecture of the status changer
1 parent 9727da9 commit 0000ef0

18 files changed

+953
-478
lines changed

‎app/config/config_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
imports:
22
- { resource: config_dev.yml }
3+
- { resource: services_test.yml }
34

45
framework:
56
test: ~

‎app/config/services.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ parameters:
44
# parameter_name: value
55

66
services:
7-
app.github.status_manager:
8-
class: AppBundle\GitHub\StatusManager
9-
arguments: []
10-
11-
app.github_client:
7+
app.github.client:
128
class: Github\Client
139
arguments: []
1410
calls:
@@ -17,6 +13,23 @@ services:
1713
- http_token
1814
- %github_token%
1915

20-
app.issue_status_changer:
21-
class: AppBundle\GitHub\IssueStatusChanger
22-
arguments: ['@app.github_client', '%repository_username%', '%repository_name%']
16+
app.github.issues_api:
17+
class: Github\Api\Issue
18+
factory: ['@app.github.client', api]
19+
arguments: [issue]
20+
21+
app.github.labels_api:
22+
class: Github\Api\Issue\Labels
23+
factory: ['@app.github.issues_api', labels]
24+
25+
app.github.cached_labels_api:
26+
class: AppBundle\Issues\GitHub\CachedLabelsApi
27+
arguments: ['@app.github.labels_api', '%repository_username%', '%repository_name%']
28+
29+
app.status_api:
30+
class: AppBundle\Issues\GitHub\GitHubStatusApi
31+
arguments: ['@app.github.cached_labels_api', '%repository_username%', '%repository_name%']
32+
33+
app.issue_listener:
34+
class: AppBundle\Issues\IssueListener
35+
arguments: ['@app.status_api']

‎app/config/services_test.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
imports:
3+
- { resource: services.yml }
4+
5+
services:
6+
app.status_api:
7+
class: AppBundle\Issues\NullStatusApi

‎src/AppBundle/Controller/DefaultController.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
namespace AppBundle\Controller;
44

5-
use AppBundle\GitHub\StatusManager;
5+
use AppBundle\Issues\IssueListener;
6+
use AppBundle\Issues\Status;
67
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
78
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
89

@@ -14,12 +15,7 @@ class DefaultController extends Controller
1415
public function homepageAction()
1516
{
1617
return $this->render('default/homepage.html.twig', [
17-
'needsReviewUrl' => sprintf(
18-
'https://github.com/%s/%s/labels/%s',
19-
$this->container->getParameter('repository_username'),
20-
$this->container->getParameter('repository_name'),
21-
rawurlencode(StatusManager::getLabelForStatus(StatusManager::STATUS_NEEDS_REVIEW))
22-
)
18+
'needsReviewUrl' => $this->get('app.status_api')->getNeedsReviewUrl(),
2319
]);
2420
}
2521
}

‎src/AppBundle/Controller/WebhookController.php

Lines changed: 22 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace AppBundle\Controller;
44

5-
use AppBundle\GitHub\StatusManager;
5+
use AppBundle\Issues\IssueListener;
66
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
77
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
88
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -23,15 +23,27 @@ public function githubAction(Request $request)
2323
}
2424

2525
$event = $request->headers->get('X-Github-Event');
26+
$listener = $this->get('app.issue_listener');
2627

2728
switch ($event) {
2829
case 'issue_comment':
29-
$responseData = $this->handleIssueCommentEvent($data);
30+
$responseData = [
31+
'issue' => $data['issue']['number'],
32+
'status_change' => $listener->handleCommentAddedEvent(
33+
$data['issue']['number'],
34+
$data['comment']['body']
35+
),
36+
];
3037
break;
3138
case 'pull_request':
3239
switch ($data['action']) {
3340
case 'opened':
34-
$responseData = $this->handlePullRequestCreateEvent($data);
41+
$responseData = [
42+
'pull_request' => $data['pull_request']['number'],
43+
'status_change' => $listener->handlePullRequestCreatedEvent(
44+
$data['pull_request']['number']
45+
),
46+
];
3547
break;
3648
default:
3749
$responseData = [
@@ -42,7 +54,13 @@ public function githubAction(Request $request)
4254
case 'issues':
4355
switch ($data['action']) {
4456
case 'labeled':
45-
$responseData = $this->handleIssueLabelAdd($data);
57+
$responseData = [
58+
'issue' => $data['issue']['number'],
59+
'status_change' => $listener->handleLabelAddedEvent(
60+
$data['issue']['number'],
61+
$data['label']['name']
62+
),
63+
];
4664
break;
4765
default:
4866
$responseData = [
@@ -64,67 +82,4 @@ public function githubAction(Request $request)
6482

6583
// log something to the database?
6684
}
67-
68-
private function handleIssueCommentEvent(array $data)
69-
{
70-
$commentText = $data['comment']['body'];
71-
$issueNumber = $data['issue']['number'];
72-
73-
$newStatus = $this->get('app.github.status_manager')
74-
->getStatusChangeFromComment($commentText);
75-
76-
// hacky way to not actually try to talk to GitHub when testing
77-
if ($this->container->getParameter('kernel.environment') != 'test') {
78-
$this->get('app.issue_status_changer')
79-
->setIssueStatusLabel($issueNumber, $newStatus);
80-
}
81-
82-
return [
83-
'issue' => $issueNumber,
84-
'status_change' => $newStatus,
85-
];
86-
}
87-
88-
private function handlePullRequestCreateEvent(array $data)
89-
{
90-
$prNumber = $data['pull_request']['number'];
91-
$newStatus = StatusManager::STATUS_NEEDS_REVIEW;
92-
93-
// hacky way to not actually try to talk to GitHub when testing
94-
if ($this->container->getParameter('kernel.environment') != 'test') {
95-
$this->get('app.issue_status_changer')
96-
->setIssueStatusLabel($prNumber, $newStatus);
97-
}
98-
99-
return [
100-
'pull_request' => $prNumber,
101-
'status_change' => $newStatus,
102-
];
103-
}
104-
105-
/**
106-
* Changes "Bug" issues to "Needs Review"
107-
*/
108-
private function handleIssueLabelAdd(array $data)
109-
{
110-
$issueNumber = $data['issue']['number'];
111-
$newLabel = $data['label']['name'];
112-
113-
if ($newLabel == 'bug') {
114-
$newStatus = StatusManager::STATUS_NEEDS_REVIEW;
115-
116-
// hacky way to not actually try to talk to GitHub when testing
117-
if ($this->container->getParameter('kernel.environment') != 'test') {
118-
$this->get('app.issue_status_changer')
119-
->setIssueStatusLabel($issueNumber, $newStatus, false);
120-
}
121-
} else {
122-
$newStatus = null;
123-
}
124-
125-
return [
126-
'issue' => $issueNumber,
127-
'status_change' => $newStatus,
128-
];
129-
}
13085
}

‎src/AppBundle/GitHub/IssueStatusChanger.php

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎src/AppBundle/GitHub/StatusManager.php

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)