Skip to content

Commit fc280f2

Browse files
author
John Pribesh
committed
Refactors checkStatus event data assignment
1 parent 10dc04f commit fc280f2

File tree

1 file changed

+35
-34
lines changed

1 file changed

+35
-34
lines changed

app.js

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,6 @@ http.createServer(function (req, res) {
3838
})
3939
}).listen(process.env.WEB_PORT);
4040

41-
function syncItem() {
42-
return {
43-
"issue_number": "",
44-
"jira_key": "",
45-
"issue_url": "",
46-
"smart_url": "",
47-
"contributor": "",
48-
"contributor_url": "",
49-
"title": "",
50-
"pr_branch": "",
51-
"base_branch": "",
52-
"statuses_url": "",
53-
"description": "",
54-
"repo": "",
55-
"sha": ""
56-
}
57-
}
58-
5941
// Report error it is occurs
6042
handler.on('error', function (err) {
6143
console.error('Error:', err.message)
@@ -167,22 +149,9 @@ function getBuildStatus(newItem,repo,bambooResults,callback) {
167149

168150
function checkStatus(event,callback) {
169151
if (isNewPr(event) == true) {
170-
var newItem = new syncItem();
171-
newItem.issue_number = event.payload.number;
172-
newItem.contributor = event.payload.sender.login;
173-
newItem.repo = event.payload.repository.full_name;
174-
newItem.contributor_url = event.payload.sender.html_url;
175-
newItem.smart_url = `${event.payload.repository.full_name}#${event.payload.number}`;
176-
newItem.title = event.payload.pull_request.title;
177-
newItem.description = `${event.payload.pull_request.body} \r\n\r\nReferences: ${event.payload.repository.full_name}#${event.payload.number}`;
178-
newItem.pr_branch = event.payload.pull_request.head.ref;
179-
newItem.base_branch = event.payload.pull_request.base.ref;
180-
newItem.issue_url = event.payload.pull_request.issue_url;
181-
newItem.jiraIssue_url = "";
182-
newItem.jira_key = "";
183-
newItem.sha = event.payload.pull_request.head.sha;
184-
newItem.statuses_url = event.payload.pull_request.statuses_url;
185-
var repo = github.getRepo(newItem.repo);
152+
const newItem = buildSyncItem(event);
153+
const repo = github.getRepo(newItem.repo);
154+
186155
repo.updateStatus(newItem.sha, {
187156
state: 'pending', //The state of the status. Can be one of: pending, success, error, or failure.
188157
description: 'Checking your work...',
@@ -378,3 +347,35 @@ handler.on('pull_request', function(event){
378347
console.log('Finished processing');
379348
})
380349
});
350+
351+
function buildSyncItem(event) {
352+
const { number: issue_number, pull_request, repository, sender} = event.payload;
353+
const { full_name: repoName } = repository;
354+
const { login: contributor, html_url: contributor_url} = sender;
355+
const { body, head, issue_url, statuses_url, title } = pull_request;
356+
const smart_url = `${repoName}#${issue_number}`;
357+
const description = `
358+
${body}
359+
360+
References: ${repoName}#${issue_number}
361+
`;
362+
363+
const newItem = {
364+
contributor,
365+
contributor_url,
366+
description,
367+
base_branch: base.ref,
368+
jira_key: '',
369+
jiraIssue_url: '',
370+
issue_number,
371+
issue_url,
372+
pr_branch: head.ref,
373+
repo: repoName,
374+
sha: head.sha,
375+
smart_url,
376+
statuses_url,
377+
title
378+
};
379+
380+
return newItem;
381+
}

0 commit comments

Comments
 (0)