merging updates

.gitignore

@@ -4,8 +4,6 @@ node_modules
 bower_components
 /selenium
 /coverage
-/app/assets
-/app/fonts
 
 # ignore IDE Specific files
 /.idea

Gruntfile.js

@@ -62,13 +62,13 @@ module.exports = function(grunt) {
         },
         proxies: [
           {
-            context: '/api/v1',
+            context: '/api/v1/content-delivery',
             host: '<%= localhostUrl %>',
             port: 9090,
             changeOrigin: true,
             xforward: true,
             rewrite: {
-              '^/api/v1': ''
+              '^/api/v1/content-delivery': ''
             }
           }
         ]

api/models.js

@@ -134,6 +134,28 @@ module.exports = {
       }
     }
   },
+  QuestionDefinition: {
+    id: "QuestionDefinition",
+    required: ["validAnswer", "options", "title"],
+    properties: {
+      options: {
+        type: "array",
+        items: {
+          type: "string"
+        },
+        uniqueItems: true,
+        description: "Options available for the question"
+      },
+      title: {
+        type: "string",
+        description: "Friendly name of the question"
+      },
+      validAnswer: {
+        type: "string",
+        description: "valid answer"
+      }
+    }
+  },
   Answer: {
     id: 'Answer',
     required: ['isCorrect'],
@@ -148,6 +170,16 @@ module.exports = {
     id: 'Answer',
     required: ['answer'],
     properties: {
+      problemId: {
+        type: 'integer',
+        format: 'int64',
+        description: 'ID of the problem to answer'
+      },
+      questionId: {
+        type: 'integer',
+        format: 'int64',
+        description: 'ID of the question to answer'
+      },
       answer: {
         type: 'integer',
         description: 'ID of the option that needs to be matched'

api/problemsData.js

@@ -51,7 +51,8 @@ var problems = [
   {
     id: 2,
     title: 'Introduction to AngularJS',
-    description: 'Instruction or some useful hints'
+    description: 'Instruction or some useful hints',
+    questionsRef: []
   }
 ];
 
@@ -76,6 +77,62 @@ exports.getById = function(id) {
   }
 };
 
+exports.add = function(newProblem) {
+  if (!newProblem || !newProblem.title || !newProblem.description) {
+    return;
+  }
+  newProblem.id = problems.length + 1;
+  newProblem.questionsRef = [];
+  problems.push(newProblem);
+
+  return _.pick(newProblem, ['id', 'title', 'description', 'questions']);
+};
+
+exports.addQuestion = function(problem, question) {
+  var i, opt, newQuestion;
+
+  problem = _.find(problems, {id: problem.id});
+
+  if (
+    !question ||
+    !question.title ||
+    !question.options ||
+    !question.validAnswer ||
+    question.options.length < 2
+  ) {
+    return;
+  }
+
+  newQuestion = {
+    id: questions.length + 1,
+    title: question.title,
+    options: []
+  };
+
+  for (i = 0; i < question.options.length; i++) {
+    opt = {
+      id: i + 1,
+      value: question.options[i]
+    };
+
+    if (question.validAnswer === opt.value) {
+      newQuestion.validAnswer = opt.id;
+    }
+
+    newQuestion.options.push(opt);
+  }
+
+  if (!newQuestion.validAnswer) {
+    return;
+  }
+
+  questions.push(newQuestion);
+
+  problem.questionsRef.push(newQuestion.id);
+
+  return newQuestion;
+};
+
 exports.postAnswer = function(id, answer) {
   var question = _.find(questions, {id: id});
   if (question) {

api/problemsResources.js

@@ -37,6 +37,30 @@ exports.findAll = {
   }
 };
 
+exports.createNewProblem = {
+  spec: {
+    description: 'Operations about problems',
+    path: '/problems',
+    method: 'POST',
+    summary: 'Add a new problem',
+    notes: 'Returns a new problems',
+    type: 'Problem',
+    nickname: 'createNewProblem',
+    produces: ['application/json'],
+    parameters: [params.body('data', 'Expected JSON Payload', 'Problem')],
+    responseMessages: [swe.invalid('problem')]
+  },
+  action: function(req, res) {
+    var problem = problemsData.add(req.body);
+
+    if (problem) {
+      writeResponse(res, problem);
+    } else {
+      throw swe.invalid('problem');
+    }
+  }
+};
+
 exports.findById = {
   spec: {
     description: 'Operations about problems',
@@ -54,7 +78,7 @@ exports.findById = {
     if (!req.params.problemId) {
       throw swe.invalid('id');
     }
-    var id = parseInt(req.params.problemId);
+    var id = parseInt(req.params.problemId, 10);
     var problem = problemsData.getById(id);
 
     if (problem) {
@@ -66,16 +90,57 @@ exports.findById = {
   }
 };
 
+exports.addQuestion = {
+  spec: {
+    description: 'Operations about a problem questions',
+    path: '/problems/{problemId}/questions',
+    method: 'POST',
+    summary: 'Add a question to a problem',
+    notes: 'Returns a question and its ID',
+    type: 'Question',
+    nickname: 'addQuestion',
+    produces: ['application/json'],
+    parameters: [
+      params.path('problemId', 'ID of problem that needs to be fetched', 'integer'),
+      params.body('data', 'Expected JSON Payload', 'QuestionDefinition')
+    ],
+    responseMessages: [swe.invalid('id'), swe.notFound('problem')]
+  },
+  action: function(req, res) {
+    var id, problem, question;
+
+    if (!req.params.problemId) {
+      throw swe.invalid('id');
+    }
+
+    id = parseInt(req.params.problemId, 10);
+    problem = problemsData.getById(id);
+
+    if (!problem) {
+      throw swe.notFound('problem');
+    }
+
+    question = problemsData.addQuestion(problem, req.body);
+    if (question) {
+      writeResponse(res, question);
+    } else {
+      throw swe.invalid('question');
+    }
+
+  }
+};
+
 exports.postAnswer = {
   spec: {
     description: 'Operations about problems',
-    path: '/problems/questions/{questionId}/answer',
+    path: '/problems/{problemId}/questions/{questionId}/answer',
     method: 'POST',
     summary: 'Answer to the question',
     notes: 'Returns if the answer is true or false',
     type: 'Answer',
     nickname: 'postAnswer',
     parameters: [
+      params.path('problemId', 'ID of problem that needs to be fetched', 'integer'),
       params.path('questionId', 'ID of question that needs to be fetched', 'integer'),
       params.body('data', 'Expected JSON Payload', 'AnswerPayload')
     ],
@@ -95,7 +160,7 @@ exports.postAnswer = {
       throw swe.invalid('payload');
     }
     else {
-      var id = parseInt(req.params.questionId);
+      var id = parseInt(req.params.questionId, 10);
       var answer = parseInt(body.answer, 10);
       var answerObj = problemsData.postAnswer(id, answer);
 

api/server.js

@@ -38,8 +38,11 @@ swagger.addModels(models)
   .addGet(videosResources.findAll)
   .addGet(videosResources.findById)
   .addPost(videosResources.create)
+  .addPut(videosResources.attach)
   .addGet(problemsResources.findAll)
   .addGet(problemsResources.findById)
+  .addPost(problemsResources.createNewProblem)
+  .addPost(problemsResources.addQuestion)
   .addPost(problemsResources.postAnswer)
 ;
 

api/videosData.js

@@ -92,3 +92,7 @@ exports.getAll = function() {
 exports.getById = function(id) {
   return _.find(videos, {id: id});
 };
+
+exports.getByProblemId = function(problemId) {
+  return _.find(videos, {problemId: problemId});
+};

api/videosResources.js

@@ -23,10 +23,18 @@ exports.findAll = {
     },
     nickname: 'getAllVideos',
     produces: ['application/json'],
+    parameters: [params.query('problemId', 'Option search criteria', 'integer')],
     responseMessages: [swe.notFound('videos')]
   },
   action: function(req, res) {
-    var videos = videosData.getAll();
+    var videos, video;
+
+    if (req.query && req.query.problemId) {
+      video = videosData.getByProblemId(parseInt(req.query.problemId, 10));
+      videos = video ? [video] : [];
+    } else {
+      videos = videosData.getAll();
+    }
 
     if (videos) {
       writeResponse(res, videos);
@@ -54,7 +62,7 @@ exports.findById = {
     if (!req.params.videoId) {
       throw swe.invalid('id');
     }
-    var id = parseInt(req.params.videoId);
+    var id = parseInt(req.params.videoId, 10);
     var video = videosData.getById(id);
 
     if (video) {
@@ -76,7 +84,7 @@ exports.create = {
     nickname: 'createVideo',
     produces: ['application/json'],
     parameters: [
-        params.body('data', 'Expected JSON Payload', 'Video')
+      params.body('data', 'Expected JSON Payload', 'Video')
     ],
     responseMessages: [
       swe.invalid('payload')
@@ -85,4 +93,40 @@ exports.create = {
   action: function(req, res) {
     writeResponse(res,{status:"ok"});
   }
+};
+
+exports.attach = {
+  spec: {
+    description: 'Attach video',
+    path: '/videos/{videoId}/problem',
+    method: 'PUT',
+    summary: 'Attach a problem to a video',
+    nickname: 'attachProblem',
+    parameters: [
+      params.path('videoId', 'ID of video that will be edited', 'integer'),
+      params.body('data', 'Expected JSON Payload', 'Video')
+    ],
+    responseMessages: [
+      swe.invalid('payload')
+    ]
+  },
+  action: function(req, res) {
+    if (!req.params.videoId) {
+      throw swe.invalid('id');
+    }
+
+    var id = parseInt(req.params.videoId, 10);
+    var video = videosData.getById(id);
+
+    if (!video) {
+      throw swe.notFound('video');
+    }
+
+    if (!req.body.problemId) {
+      throw swe.invalid('payload');
+    }
+
+    video.problemId = req.body.problemId;
+    writeResponse(res,{status:"ok"});
+  }
 };