Add Travis

Author: aayushgupta05

.env.travis

@@ -0,0 +1,4 @@
+NODE_ENV = "travis"
+DATABASE_URL="http://127.0.0.1:27017"
+JWT_SECRET = "somesupersecretkey"
+PORT=8080

.travis.yml

@@ -0,0 +1,11 @@
+language: node_js
+node_js:
+  - 12.19.0
+services:
+  - mongodb
+install:
+  - npm install
+before_script:
+  - sleep 15
+script:
+  - npm run travisTest

graphql/resolvers/auth.js

@@ -2,17 +2,21 @@ const bcrypt = require("bcryptjs");
 const jwt = require("jsonwebtoken");
 require("dotenv").config();
 const User = require("../../models/user");
+const {
+  passwordError,
+  noUserError,
+} = require("../variables/errorMessages");
 
 module.exports = {
   login: async (args) => {
     try {
       const user = await User.findOne({ email: args.email });
       if (!user) {
-        throw new Error("User not registered");
+        throw new Error(noUserError);
       }
       const isequal = await bcrypt.compare(args.password, user.password);
       if (!isequal) {
-        throw new Error("Incorrect password provided");
+        throw new Error(passwordError);
       }
       const token = jwt.sign(
         {

graphql/resolvers/category.js

@@ -52,7 +52,7 @@ module.exports = {
     try {
       const category = await Category.findById(
         args.categoryFindInput._id
-      ).populate('topics', ['name', 'description', 'tags', 'isArchived']);
+      ).populate('topics', ['name', 'description', 'tags', 'isArchived', 'createdBy']);
       if (!category) {
         throw new Error(categoryRemovedError);
       }

graphql/resolvers/message.js

@@ -1,5 +1,6 @@
 const Message = require("../../models/message");
 const Topic = require("../../models/topic");
+const User = require("../../models/user");
 const {
   authenticationError,
   blockRemoveUserError,
@@ -35,6 +36,8 @@ module.exports = {
         const saveTopic = await Topic.findById(args.messageInput.parentTopic);
         saveTopic.chats.push(message);
         await saveTopic.save();
+        let user = User.findById(req.currentUser.id, "_id name");
+        saveMessage._doc.user = user;
         return { ...saveMessage._doc };
       } else {
         throw new Error(topicArchivedError);
@@ -57,6 +60,8 @@ module.exports = {
       if (message.userId.toString() == req.currentUser.id) {
         message.description = args.messageInput.description;
         const updateMessage = await message.save();
+        let user = User.findById(req.currentUser.id, "_id name");
+        updateMessage._doc.user = user;
         return { ...updateMessage._doc };
       }
       throw new Error(noAuthorizationError);

graphql/resolvers/organization.js

@@ -220,8 +220,14 @@ module.exports = {
     try {
       if (req.currentUser.isAdmin) {
         const organization = await Organization.findOne({})
-          .populate("adminIds", "_id name email isFirstAdmin")
-          .populate("moderatorIds", "_id name email isFirstAdmin");
+          .populate(
+            "adminIds",
+            "_id name email info isAdmin isModerator isActivated isRemoved"
+          )
+          .populate(
+            "moderatorIds",
+            "_id name email info isAdmin isModerator isActivated isRemoved"
+          );
         return {
           admins: organization.adminIds,
           moderators: organization.moderatorIds,

graphql/resolvers/user.js

@@ -24,7 +24,7 @@ module.exports = {
       if (req.currentUser.isAdmin) {
         const users = await User.find(
           { isRemoved: false },
-          "name email info isAdmin isModerator isActivated"
+          "name email info isAdmin isModerator isActivated isRemoved"
         );
         return users;
       } else {
@@ -96,6 +96,7 @@ module.exports = {
             name: args.userInput.name,
             phone: args.userInput.phone,
             info: args.userInput.info,
+            socialMedia: args.userInput.socialMedia,
           },
         }
       );

graphql/schema/message.js

@@ -11,7 +11,7 @@ type message {
   replyTo: String
   description: String!
   parentTopic: String!
-  likes: Boolean!
+  likes: Int!
   isPinned: Boolean!
   isTasked: Boolean!
   isAnnounced: Boolean!

graphql/variables/errorMessages.js

@@ -10,6 +10,7 @@ module.exports.firstAdminBlockError = "First Admin can't be blocked";
 module.exports.firstAdminRemoveError = "First Admin can't be removed";
 module.exports.blockRemoveUserError = "User blocked or removed";
 module.exports.noAuthorizationError = "No rights to perform this action";
+module.exports.passwordError = "Incorrect password provided";
 
 //organizations
 module.exports.noOrganizationError = "Organization to be created first";

models/message.js

@@ -8,7 +8,7 @@ const messageSchema = new Schema({
   },
   replyTo: {
     type: Schema.Types.ObjectId,
-    ref: "User",
+    ref: "Message",
   },
   description: {
     type: String,