Server: add association between author and user

3 files changed, 19 insertions, 3 deletions

diff --git a/server/models/author.js b/server/models/author.js
index 8f5b598c8..5835ada99 100644
--- a/server/models/author.js
+++ b/server/models/author.js
@@ -23,6 +23,9 @@ module.exports = function (sequelize, DataTypes) {
         },
         {
           fields: [ 'podId' ]
+        },
+        {
+          fields: [ 'userId' ]
         }
       ],
       classMethods: {
@@ -44,4 +47,12 @@ function associate (models) {
     },
     onDelete: 'cascade'
   })
+
+  this.belongsTo(models.User, {
+    foreignKey: {
+      name: 'userId',
+      allowNull: true
+    },
+    onDelete: 'cascade'
+  })
 }
diff --git a/server/models/oauth-client.js b/server/models/oauth-client.js
index 758c4cf2f..021a34007 100644
--- a/server/models/oauth-client.js
+++ b/server/models/oauth-client.js
@@ -30,8 +30,8 @@ module.exports = function (sequelize, DataTypes) {
         }
       ],
       classMethods: {
+        countTotal,
         getByIdAndSecret,
-        list,
         loadFirstClient
       }
     }
@@ -42,8 +42,8 @@ module.exports = function (sequelize, DataTypes) {
 
 // ---------------------------------------------------------------------------
 
-function list (callback) {
-  return this.findAll().asCallback(callback)
+function countTotal (callback) {
+  return this.count().asCallback(callback)
 }
 
 function loadFirstClient (callback) {
diff --git a/server/models/user.js b/server/models/user.js
index 631cd96c9..36ed723cc 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -94,6 +94,11 @@ function toFormatedJSON () {
 // ------------------------------ STATICS ------------------------------
 
 function associate (models) {
+  this.hasOne(models.Author, {
+    foreignKey: 'userId',
+    onDelete: 'cascade'
+  })
+
   this.hasMany(models.OAuthToken, {
     foreignKey: 'userId',
     onDelete: 'cascade'