Skip to content

Commit

Permalink
Improve code quality, clean up old code, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
Glavin001 committed Jun 15, 2016
1 parent 960d333 commit 1466cbc
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 26 deletions.
2 changes: 0 additions & 2 deletions src/api/github.js
Expand Up @@ -37,8 +37,6 @@ module.exports = function(socket) {
per_page: 100
});
socket.github.getAllPages(socket.github.repos.getAll, options, function(err, res) {
// console.log(res.map(function(repo) { return repo['full_name']; }));
// console.log(res.length);
return cb(err && err.message, res);
});

Expand Down
6 changes: 3 additions & 3 deletions src/api/index.js
Expand Up @@ -17,20 +17,20 @@ const handlers = _.chain(fs.readdirSync(__dirname))

// Bind event listeners to new sockets
module.exports = function(socket, io) {
console.log('a user connected');
// console.log('a user connected');

/**
When socket disconnects
*/
socket.on('disconnect', function() {
console.log('user disconnected');
// console.log('user disconnected');
});

/**
Authenticate Socket with GitHub token
*/
socket.on(EVENTS.AUTHENTICATE, (token, cb) => {
console.log(EVENTS.AUTHENTICATE, token);
// console.log(EVENTS.AUTHENTICATE, token);
const github = new GitHubApi({
debug: false,
});
Expand Down
18 changes: 8 additions & 10 deletions src/api/repository.js
Expand Up @@ -37,7 +37,7 @@ module.exports = function(socket, io) {

// Repository specific progress emitter
let progress = (data) => {
console.log('Progress', data);
// console.log('Progress', data);
io.sockets. in(repoRoom).emit(EVENTS.REPOSITORY_SYNC_PROGRESS, data);
};

Expand Down Expand Up @@ -86,7 +86,7 @@ module.exports = function(socket, io) {
}
getIssues(socket.github, owner, name, showProgress)
.then((results) => {
console.log('Has Issues!', results.length);
// console.log('Has Issues!', results.length);
// Transform GitHub Issues list
let issues = _.map(results, Issue.transformFields);

Expand All @@ -95,7 +95,7 @@ module.exports = function(socket, io) {
percent: 1
});

console.log('Finished getting issues!');
// console.log('Finished getting issues!');
cb(null, issues);
})
.catch((err) => {
Expand All @@ -106,7 +106,7 @@ module.exports = function(socket, io) {
Create records for Repository and Issues
*/
records: ['repo', 'issues', (results, cb) => {
console.log('Bulk insert records!');
// console.log('Bulk insert records!');

progress({
task: REPOSITORY_SYNC_TASKS.DATABASE,
Expand Down Expand Up @@ -180,7 +180,7 @@ module.exports = function(socket, io) {
}
}, (err) => {
if (err) {
console.log('webhook error', err);
// console.log('webhook error', err);
let errorMessage = err && err.message;
try {
errorMessage = _.get(JSON.parse(err.message), 'errors[0].message');
Expand All @@ -189,6 +189,8 @@ module.exports = function(socket, io) {
// These errors are likely because of duplicate webhook.
// We can write webhooks but cannot read, so we write assuming it does not exist
// and fail silently otherwise.

// TODO: Check if error message is related to this being a duplicate webhook
}
progress({
task: REPOSITORY_SYNC_TASKS.WEBHOOK,
Expand All @@ -202,7 +204,6 @@ module.exports = function(socket, io) {
});
}
return cb();
// return cb(err && err.message);
});
}],
/**
Expand Down Expand Up @@ -286,12 +287,9 @@ module.exports = function(socket, io) {
return cb();
}]
}, (err, results) => {
console.log('Done!', err, Object.keys(results));
// console.log('Done!', err, Object.keys(results));
socket.leave(repoRoom);

// TOOD:
return cb(err && err.message, results);

});

} else {
Expand Down
10 changes: 5 additions & 5 deletions src/index.js
Expand Up @@ -45,20 +45,20 @@ sequelize.sync({
});

app.post('/webhook', (req, res) => {
console.log('webhooks!');
// console.log('Webhook received!');
webhookHandler(req, res, (err) => {
console.error(err);
console.log('Webhook error:', err);
res.statusCode = 404;
res.end('no such location');
res.end('no such location');
});
});

githubOAuth.on('error', function(err) {
console.error('there was a login error', err);
console.log('GitHub Login error: ', err);
});

githubOAuth.on('token', function(token, res) {
console.log('here is your shiny new github oauth token', token);
// console.log('here is your shiny new github oauth token', token);
let access_token = token.access_token;
// res.end(JSON.stringify(token));
res.redirect(`${config.get('app.base_url')}/#/setup?access_token=${access_token}`);
Expand Down
4 changes: 0 additions & 4 deletions src/issues.js
Expand Up @@ -17,12 +17,8 @@ module.exports = {

getIssues(github, user, repo, progressCb) {


return new Promise((resolve, reject) => {

// FIXME: make this dynamic
// let numOfIssues = 5000;

github.search.issues({
q: `repo:${user}/${repo}`,
page: 1,
Expand Down
2 changes: 0 additions & 2 deletions test/classifier.js
Expand Up @@ -11,7 +11,6 @@ describe('Classifier', function() {
let issues = require('./fixtures/issues_1.json');
return train('labels', [owner, repo, issues, []])
.then((results) => {
// console.log(results);
assert.equal(results.ok, true);
assert.equal(results.issues.total, issues.length);
});
Expand All @@ -20,7 +19,6 @@ describe('Classifier', function() {
it('should return error complaining not enough issues', function () {
return train('labels', [owner, repo, [], []])
.then((results) => {
// console.log(results);
assert.equal(results.ok, false);
assert.equal(results.error_message, "Number of different labels provided was insufficient.");
});
Expand Down

0 comments on commit 1466cbc

Please sign in to comment.