fix(user): prevent dupes

42Zavattas · Oct 8, 2015 · 3593039 · 3593039
1 parent 5da7860
commit 3593039
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/api/models/index.js b/api/models/index.js
@@ -10,7 +10,6 @@ q.all([
     Language.sync(),
   ])
   .then(() => { return Text.sync(); })
-  .then(() => { console.log('Success'); })
   .catch(err => { console.log(err); });
 
 export default {

diff --git a/api/models/user.model.js b/api/models/user.model.js
@@ -13,6 +13,6 @@ export default db.define('user', {
   banned: { type: Sequelize.BOOLEAN, defaultValue: false },
   admin: { type: Sequelize.BOOLEAN, defaultValue: false },
 
-  githubId: { type: Sequelize.BIGINT }
+  githubId: { type: Sequelize.BIGINT, unique: true }
 
 });
diff --git a/api/services/user.service.js b/api/services/user.service.js
@@ -12,10 +12,14 @@ exports.getByGithub = id => {
 
 exports.updateOrCreate = (githubId, name, avatar) => {
 
-  return User.upsert({ name, avatar, githubId }, { fields: ['name', 'avatar'] })
+  return exports.getByGithub(githubId)
+    .then(user => {
+      if (!user) { return User.create({ githubId, name, avatar }); }
+      return user;
+    })
     .then(user => {
       if (user.banned) { throw new Error('You are banned from KeyCode.'); }
       return user;
-    });
+    })
 
 };