From 1ceebab7c9544ff6f7d71d474520d7f613d5a4f1 Mon Sep 17 00:00:00 2001
From: Vitaly Tomilov <vitaly-t@users.noreply.github.com>
Date: Sat, 21 May 2016 22:26:20 +0100
Subject: [PATCH] Update User.js

* correcting column name formatting
* correcting query for a simple check (can be improved further by using `EXISTS` query).
---
 server/models/User.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/models/User.js b/server/models/User.js
index a3a6725..9438e02 100644
--- a/server/models/User.js
+++ b/server/models/User.js
@@ -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
@@ -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));
     }
 };