Merge pull request hernansartorio#50 from kumargugloth/develop

join date

Author: kumargugloth

chat/ChatroomManager.js

@@ -34,7 +34,8 @@ module.exports = function () {
     const conversation = await Conversation.create(obj).then(convo=>{
      return User.find({_id: {$in : convo.members}},{activity_log:0,followers:0,following:0,}).then(users=> {
        const x = users.map((u)=>{ return ({user_id:u._id,last_active:u.last_active ? u.last_active : new Date()})})
-       return Conversation.findByIdAndUpdate({_id:convo._id},{last_active:x}).then(conversation=>{
+       const y = users.map((u)=>{ return ({user_id:u._id,join_date:u.join_date ? u.join_date : new Date()})})
+       return Conversation.findByIdAndUpdate({_id:convo._id},{last_active:x,join_date:y}).then(conversation=>{
         return convo
        }).catch((e)=>console.log(e))
        }).catch((e)=>console.log(e))
@@ -253,7 +254,8 @@ module.exports = function () {
         return  Game.findByIdAndUpdate({_id: game_id},{ $addToSet: { users: { $each: [userId] } } }).then(game=> {
          return Conversation.findByIdAndUpdate({_id: game.conversation},{ $pull: { invites: userId } }).then(conversation1=> {
           return Conversation.findByIdAndUpdate({_id: game.conversation},{ $addToSet: { members: { $each: [userId] } } }).then(conversation1=> {
-            return Conversation.findByIdAndUpdate({_id: game.conversation},{ $addToSet: { last_active: { $each: [{user_id:userId,last_active:new Date()}] } } }).then(conversation1=> {
+            return Conversation.findByIdAndUpdate({_id: game.conversation},{ $addToSet: { join_date: { $each: [{user_id:userId,join_date:new Date()}] } } },{ $addToSet: { last_active: { $each: [{user_id:userId,last_active:new Date()}] } } }).then(conversation1=> {
+              console.log("convera",conversation1)
             //above to update below to show and save message
             return Conversation.findById({_id: game.conversation}).lean().populate('members','_id device_token').then(conversation2=> {
               return User.findById({_id: userId},{activity_log:0,}).lean().then(user=> {

models/conversation.js

@@ -19,6 +19,7 @@ const schema = new Schema({
   unread:Number,
   members: [{ type: Schema.Types.ObjectId, ref: 'user' }] ,
   type:String,
+  join_date:Array
 });
 
 //Model

routes/user.js

@@ -484,7 +484,8 @@ router.post('/host_game',verifyToken, (req, res, next) => {
             Message.create({conversation:convo._id,message:`${req.name} created the game`,read_status:false,name:req.name,author:req.body.userId,type:'bot',created_at:new Date()}).then(message1=>{
               User.find({_id: {$in : convo.members}},{activity_log:0,followers:0,following:0,}).then(users=> {
                 const x = users.map((u)=>{ return ({user_id:u._id,last_active:u.last_active ? u.last_active : new Date()})})
-              Conversation.findByIdAndUpdate({_id:message1.conversation},{last_active:x,last_message:message1._id,last_updated:new Date()}).then(conversation=>{
+                const y = users.map((u)=>{ return ({user_id:u._id,join_date:u.join_date ? u.join_date : new Date()})})
+                Conversation.findByIdAndUpdate({_id:message1.conversation},{last_active:x,join_date:y,last_message:message1._id,last_updated:new Date()}).then(conversation=>{
                 console.log(conversation)
             //since he is a host who is accessing this api
             convo['invite'] = false
@@ -888,7 +889,8 @@ router.post('/book_slot_and_host', verifyToken, (req, res, next) => {
             Message.create({conversation:convo._id,message:`${req.name} created the game`,read_status:false,name:req.name,author:req.userId,type:'bot',created_at:new Date()}).then(message1=>{
               User.find({_id: {$in : convo.members}},{activity_log:0,followers:0,following:0,}).then(users=> {
                 const x = users.map((u)=>{ return ({user_id:u._id,last_active:u.last_active ? u.last_active : new Date()})})
-              Conversation.findByIdAndUpdate({_id:message1.conversation},{last_active:x,last_message:message1._id,last_updated:new Date()}).then(conversation=>{
+                const y = users.map((u)=>{ return ({user_id:u._id,join_date:u.join_date ? u.join_date : new Date()})})
+                Conversation.findByIdAndUpdate({_id:message1.conversation},{last_active:x,join_date:y,last_message:message1._id,last_updated:new Date()}).then(conversation=>{
                 convo['invite'] = false
             res.send({status:"success", message:"slot booked",data: {game:game,convo:convo}})
         let booking_id = values[0].booking_id