Merge branch 'master' of https://github.com/TheCodeCamp/CodeCamp

drcoolsanjeev · drcoolsanjeev · commit d59e19ae3482 · 2018-03-04T20:13:56.000+05:30
diff --git a/contest/models/contest/contest.js b/contest/models/contest/contest.js
@@ -23,7 +23,7 @@ var contestSchema = new mongoose.Schema({
         type:String
     },
     'questions':[{
-        type: mongoose.Schema.Types.ObjectId,
+        type: mongoose.Schema.Types.String,
         ref:'Problem'
     }]
 })
diff --git a/judge/result/input/MARCH18/aa.txt b/judge/result/input/MARCH18/aa.txt
@@ -1 +1 @@
-fdhdjdjdrs
+fdhdjdjd
diff --git a/judge/result/input/MARCH18/adb.txt b/judge/result/input/MARCH18/adb.txt
@@ -0,0 +1 @@
+fdhdjdjd
diff --git a/judge/result/input/MARCH18/add.txt b/judge/result/input/MARCH18/add.txt
@@ -0,0 +1 @@
+fdhdjdjd
diff --git a/judge/result/input/MARCH18/agd.txt b/judge/result/input/MARCH18/agd.txt
@@ -0,0 +1 @@
+fdhdjdjd
diff --git a/judge/result/input/MARCH18/agjd.txt b/judge/result/input/MARCH18/agjd.txt
@@ -0,0 +1 @@
+fdhdjdjd
diff --git a/judge/result/output/MARCH18/adb.txt b/judge/result/output/MARCH18/adb.txt
@@ -0,0 +1 @@
+fdhdjdjd
diff --git a/judge/result/output/MARCH18/add.txt b/judge/result/output/MARCH18/add.txt
@@ -0,0 +1 @@
+fdhdjdjd
diff --git a/judge/result/output/MARCH18/agd.txt b/judge/result/output/MARCH18/agd.txt
@@ -0,0 +1 @@
+fdhdjdjd
diff --git a/judge/result/output/MARCH18/agjd.txt b/judge/result/output/MARCH18/agjd.txt
@@ -0,0 +1 @@
+fdhdjdjd
diff --git a/server/app.js b/server/app.js
@@ -48,6 +48,9 @@ app.use('/contest', contest);
 app.use('/users', users);
 app.use('/solution',solutions);
 app.use('/rankings',rankings);
+app.get('/',(req,res)=>{
+  res.send('Hello')
+})
 
 const port = process.env.PORT || 3000;
 app.listen(port);
diff --git a/server/routes/contest.js b/server/routes/contest.js
@@ -49,34 +49,43 @@ router.use('/:id/problems',problemRoute)
 
 router.get('/:id',(req,res)=>{
     const id = req.params.id;
-    var Projection={
-        _id:false,
-        'questions.name':true,
-        'questions.code':true
+    // var Projection={
+    //     _id:false,
+    //     'questions.name':true,
+    //     'questions.code':true
 
-    }
-    Contest.findOne({'id':id},Projection,(err,contest)=>{
-        if(err){
-            return res.status(400).json({
-                    'success':false,
-                    'msg':'Wrong Request'
-                })
-        }else if(!contest){
-            return res 
-                    .status(404)
-                    .json({
+    // }
+    Contest.find({'id':id}).
+        populate({
+            path: 'questions',
+            select:['name','code'],
+            model: 'Problem'
+        }).
+        exec(function(err,question){
+            console.log(err)
+            if(err){
+                return res.status(400).json({
                         'success':false,
-                        'msg':'Can\'t find any contest with given id'
+                        'msg':'Wrong Request'
                     })
-        }
-        res 
-            .status(200)
-            .json({
-                'success':true,
-                'msg':contest
-            })
-    })
+            }else if(!question){
+                return res 
+                        .status(404)
+                        .json({
+                            'success':false,
+                            'msg':'Can\'t find any contest with given id'
+                        })
+            }
+            
+            res 
+                .status(200)
+                .json({
+                    'success':true,
+                    'msg':question
+                })
+        })
 })
+    
 router.delete('/:id', (req,res) => {
     res.send(req.body);
 })
@@ -144,7 +153,7 @@ router.post('/:id' , (req,res)=>{
         })
         
         Contest.findOneAndUpdate({"id":id},{ "$push": { "questions": problem._id } },(err,con)=>{
-            //console.log(err)
+           //console.log(con) 
             //con.questions.push(body)
             res.status(200)
             .json({
diff --git a/server/routes/ranking.js b/server/routes/ranking.js
@@ -8,12 +8,11 @@ const {compare} = require('./../utils/compare');
 router.get('/:id',(req,res)=>{
     //console.log(id);
     const id = req.params.id;
-    console.log(id);
     Contest.findOne({'name':id},(err,contest)=>{
         const startTime = contest.startTime;
         User.find({'contest':{"$elemMatch":{'name':id}}},(err,users)=>{
 
-            //console.log(users);
+           // console.log(users);
             /*var participant = {
                 'username',
                 problemSolved,
@@ -43,7 +42,6 @@ router.get('/:id',(req,res)=>{
                     return {name:x.username,score:x.contest[index].count*100,time:time};
                 }
             });
-           console.log(userTry.sort(compare));
             res.send(users)
         });
 
