working

Author: iamsaquib8

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 server/solutions/
-judge0/result/
+judge0/result/
+solutions/

contest/models/contest.js contest/models/contest/contest.jscontest/models/contest.js renamed to contest/models/contest/contest.js

@@ -1,5 +1,5 @@
 const mongoose = require('mongoose');
-const {Problem} = require('./problem/problem')
+const {Problem} = require('./../problem/problem')
 
 var contestSchema = new mongoose.Schema({
     'name':{

contest/models/contest.json contest/models/contest/contest.jsoncontest/models/contest.json renamed to contest/models/contest/contest.json

@@ -0,0 +1,5 @@
+{
+    "user":{
+        "type":"string"
+    }
+}

contest/models/ranking/rank.json

@@ -114,7 +114,6 @@ async function compileAndRunProblem(contest,problem,id,lang ,description){
     const result= await runCompiled(lang,file,contest,problem);
     const serverRes= await serverResult(contest,problem);
     const Result = await checkResult(result,serverRes);
-    console.log(Result)
     return Result;
 
 }

judge/compileProblem.js

@@ -1 +1 @@
-fdhdjdjd
+fdhdjdjd

judge/result/output/MARH1/ab22.txt

@@ -14,12 +14,11 @@ router.get('/:id',(req,res)=>{
        }else if(solution){
         const sol2 = Object.assign({}, solution);
         const contest = sol2._doc.contest;
-        const problem = solution._doc.problem;
-        const description=solution._doc.description;
-        const id = solution._doc.id;
-        const language= solution._doc.language;
+        const problem = sol2._doc.problem;
+        const description=sol2._doc.description;
+        const id = sol2._doc.id;
+        const language= sol2._doc.language;
 
-       // console.log(sol2._doc.contest);
         judge.compileAndRunProblem(contest,problem,id,language ,description).then((result)=>{        
           res.send(result + '***' + req.params.id);
         }).catch((e)=>{

judge/routes/solution.js

@@ -2,7 +2,7 @@ const express = require('express');
 const fs = require('fs');
 const path = require('path');
 const _ = require('lodash');
-const Contest = require('./../../contest/models/contest');
+const Contest = require('./../../contest/models/contest/contest');
 const Problem = require('./../../contest/models/problem/problem');
 const problemRoute = require('./problems')
 

server/routes/contest.js

@@ -2,7 +2,7 @@ const express = require('express');
 const _ = require('lodash')
 const db = require('./../utils/db/db');
 const Problem = require('./../../contest/models/problem/problem');
-const Contest = require('./../../contest/models/contest')
+const Contest = require('./../../contest/models/contest/contest')
 const router = express.Router({mergeParams: true})
 
 router.get('/:code',(req,res)=>{

server/routes/problems.js

@@ -12,19 +12,50 @@ const db = require('./../utils/db/db');
 const Solution = require('./../models/solution/solution');
 const router = express.Router();
 
+<<<<<<< HEAD
 //var upload  = multer({dest:'solutions/'})
 //var originalname = 'solution';
 router.post('/',async (req,res)=>{
       var count =await Solution.getObjCount(req.body.username,req.body.contest,req.body.problem)+1;
      var solution = new Solution({ 
+=======
+var upload  = multer({dest:'solutions/'})
+var originalname = 'solution';
+router.post('/',upload.single(originalname),async (req,res)=>{
+    var solution;
+     if(req.file){
+      var count =await Solution.getObjCount(req.body.username,req.body.contest,req.body.problem)+1;
+      solution = new Solution({ 
+        problem:req.body.problem,
+        contest:req.body.contest,
+        username:req.body.username,
+        id:req.body.contest+req.body.problem+req.body.username+count,
+        language:req.body.language.toLowerCase(),
+        description:new Buffer(fs.readFileSync(req.file.path)).toString('base64'),
+        submitted_on:new Date() 
+      });
+    }
+       
+    else if (!req.file) {
+      var count =await Solution.getObjCount(req.body.username,req.body.contest,req.body.problem)+1;
+      solution = new Solution({ 
+>>>>>>> 5b116472edb8e59b201766368eae67301e945e2b
           problem:req.body.problem,
           contest:req.body.contest,
           username:req.body.username,
           id:req.body.contest+req.body.problem+req.body.username+count,
           language:req.body.language.toLowerCase(),
+<<<<<<< HEAD
           description:req.body.description,
           submitted_on:new Date() 
         });
+=======
+          description:req.body.description.toString('base64'),
+          submitted_on:new Date() 
+        });
+    }
+
+>>>>>>> 5b116472edb8e59b201766368eae67301e945e2b
         solution.save().then((sol) => {
           const agentOptions = new Object();
           agentOptions.keepAliveMsecs = 6000;