add data time graphql

package.json

@@ -60,6 +60,7 @@
     "font-awesome": "^4.7.0",
     "formiojs": "^4.13.0",
     "graphql": "^14.7.0",
+    "graphql-iso-date": "^3.6.1",
     "graphql-request": "^3.3.0",
     "graphql-type-json": "^0.3.2",
     "inquirer": "^7.3.3",

server.js

@@ -34,6 +34,7 @@ mongoose.set('useCreateIndex', true);
 mongoose.connect(process.env.MONGODB_URL, {
   useNewUrlParser: true,
   useUnifiedTopology: true,
+  useFindAndModify: false
 });
 const User = require("./server/schema/models/user");
 

server/page-builder/js/page-builder.js

@@ -683,6 +683,8 @@ async function editInstanceUser(payload, refresh, contentType = "content") {
   // }
 
   await dataService.userUpdate(payload);
+
+  fullPageUpdate();
   //update user
   // return axiosInstance
   //   .put(`/api/${contentType}/${id}`, payload)

server/schema/schema.js

@@ -22,6 +22,12 @@ const {
   GraphQLBoolean,
 } = graphql;
 
+const {
+  GraphQLDate,
+  GraphQLTime,
+  GraphQLDateTime
+} = require('graphql-iso-date');
+
 //Schema defines data on the Graph like object types(book type), relation between
 //these object types and describes how it can reach into the graph to interact with
 //the data to retrieve or mutate the data
@@ -32,12 +38,14 @@ const UserType = new GraphQLObjectType({
     id: { type: GraphQLID },
     username: { type: GraphQLString },
     password: { type: GraphQLString },
-    book: {
-      type: new GraphQLList(UserType),
-      resolve(parent, args) {
-        return User.find({ userId: parent.id });
-      },
-    },
+    lastLoginOn: { type: GraphQLDateTime},
+    profile: { type: GraphQLJSONObject },
+    // book: {
+    //   type: new GraphQLList(UserType),
+    //   resolve(parent, args) {
+    //     return User.find({ userId: parent.id });
+    //   },
+    // },
   }),
 });
 
@@ -385,7 +393,7 @@ const Mutation = new GraphQLObjectType({
         let userDoc = User.findByIdAndUpdate(args.id, {
           lastLoginOn: new Date(),
           profile: profileObj,
-        });
+        }, false);
         userDoc.exec();
       },
     },
@@ -440,14 +448,14 @@ const Mutation = new GraphQLObjectType({
         let tagDoc = Tag.findByIdAndUpdate(
           args.tagId,
           { $push: { contents: args.contentId } },
-          { new: true, useFindAndModify: false }
+          { new: true }
         );
         tagDoc.exec();
 
         let contentDoc = Content.findByIdAndUpdate(
           args.contentId,
           { $push: { tags: args.tagId } },
-          { new: true, useFindAndModify: false }
+          { new: true }
         );
         contentDoc.exec();
 

server/services/auth.service.js

@@ -96,6 +96,9 @@ module.exports = authService = {
           }
 
           req.session.userId = user.id;
+
+          //TODO: add roles
+          userService.getRoles()
 
           if(!req.session.returnTo){
             return res.redirect('/admin');

server/services/data.service.js

@@ -125,7 +125,7 @@ if (typeof module !== "undefined" && module.exports) {
             `,
     });
 
-    return result.data.data.contentType;
+    return result.data;
   }),
     (exports.rolesGet = async function () {
       let result = await this.getAxios().post(apiUrl, {

server/services/user.service.js

@@ -89,6 +89,8 @@ module.exports = userService = {
       user(id:"${id}"){
         id
         username
+        lastLoginOn
+        profile
       }
       }
         `;