4 files changed, 48 insertions, 27 deletions

diff --git a/src/hooks/populate-user.js b/src/hooks/populate-user.js
index dfa58cf..177bd9f 100644
--- a/src/hooks/populate-user.js
+++ b/src/hooks/populate-user.js
@@ -1,9 +1,24 @@
 // Use this hook to manipulate incoming or outgoing data.
 // For more information on hooks see: http://docs.feathersjs.com/api/hooks.html
 
-// eslint-disable-next-line no-unused-vars
-module.exports = function (options = {}) {
+module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
   return async context => {
+    // Get `app`, `method`, `params` and `result` from the hook context
+    const {app, method, result, params} = context;
+
+    // Make sure that we always have a list of posts either by wrapping
+    // a single post into an array or by getting the `data` from the `find` method's result
+    const posts = method === 'find' ? result.data : [result];
+
+    // Asynchronously get user object from each post's `userId`
+    // and add it to the post
+    await Promise.all(posts.map(async post => {
+      // Also pass the original `params` to the service call
+      // so that it has the same information available (e.g. who is requesting it)
+      post.user = await app.service('users').get(post.userId, params);
+    }));
+
+    // Best practice: hooks should always return the context
     return context;
   };
 };
diff --git a/src/hooks/process-post.js b/src/hooks/process-post.js
index d23f451..553bb59 100644
--- a/src/hooks/process-post.js
+++ b/src/hooks/process-post.js
@@ -4,32 +4,30 @@
 // eslint-disable-next-line no-unused-vars
 module.exports = function (options = {}) {
   return async context => {
-    return async context => {
-      const {data} = context;
+    const {data} = context;
 
-      // Throw an error if we didn't get a text
-      if (!data.text) {
-        throw new Error('A post must have a text');
-      }
+    // Throw an error if we didn't get a text
+    if (!data.text) {
+      throw new Error('A post must have a text');
+    }
 
-      // The authenticated user
-      const user = context.params.user;
-      // The actual message text
-      const text = context.data.text
-      // Posts can't be longer than 400 characters
-        .substring(0, 400);
+    // The authenticated user
+    const user = context.params.user;
+    // The actual message text
+    const text = context.data.text
+    // Posts can't be longer than 400 characters
+      .substring(0, 400);
 
-      // Override the original data (so that people can't submit additional stuff)
-      context.data = {
-        text,
-        // Set the user id
-        userId: user._id,
-        // Add the current date
-        createdAt: new Date().getTime()
-      };
-
-      // Best practise, hooks should always return the context
-      return context;
+    // Override the original data (so that people can't submit additional stuff)
+    context.data = {
+      text,
+      // Set the user id
+      userId: user.id,
+      // Add the current date
+      createdAt: new Date().getTime()
     };
+
+    // Best practise, hooks should always return the context
+    return context;
   };
 };
diff --git a/src/models/posts.model.js b/src/models/posts.model.js
index e46117c..a48d2f6 100644
--- a/src/models/posts.model.js
+++ b/src/models/posts.model.js
@@ -6,6 +6,10 @@ const DataTypes = Sequelize.DataTypes;
 module.exports = function (app) {
   const sequelizeClient = app.get('sequelizeClient');
   const posts = sequelizeClient.define('posts', {
+    userId: {
+      type: DataTypes.INTEGER,
+      allowNull: false
+    },
     text: {
       type: DataTypes.STRING,
       allowNull: false
diff --git a/src/services/posts/posts.hooks.js b/src/services/posts/posts.hooks.js
index 39ac996..f86bb74 100644
--- a/src/services/posts/posts.hooks.js
+++ b/src/services/posts/posts.hooks.js
@@ -1,18 +1,22 @@
 const {authenticate} = require('@feathersjs/authentication').hooks;
 
+const processPost = require('../../hooks/process-post');
+
+const populateUser = require('../../hooks/populate-user');
+
 module.exports = {
   before: {
     all: [authenticate('jwt')],
     find: [],
     get: [],
-    create: [],
+    create: [processPost()],
     update: [],
     patch: [],
     remove: []
   },
 
   after: {
-    all: [],
+    all: [populateUser()],
     find: [],
     get: [],
     create: [],