Skip to content

Update User.js #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vitaly-t wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Update User.js #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions server/models/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const db = require('../db');

const User = {
findByUsername(username, extraFields) {
const extra = extraFields ? `, ${extraFields.join(', ')}`: '';
const extra = extraFields ? (','+ extraFields.map(pgp.as.name).join()): '';
return db.one(`
SELECT id, username ${extra}
FROM users WHERE username = $1
Expand Down Expand Up @@ -122,10 +122,10 @@ const User = {
},

checkAvailability(prop, value) {
return db.result(`
SELECT id FROM users WHERE $1~ = $2
return db.one(`
SELECT count(id) FROM users WHERE $1~ = $2
`, [prop, value])
.then(result => !result.rowCount);
.then(data => parseInt(data.count));
}
};

Expand Down