rolled back #12 and opened feature branch

nerdakademie · Feb 21, 2017 · 7c8db6b · 7c8db6b
1 parent ae60305
commit 7c8db6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/src/server/controller/api/contestant/contestantApiController.js b/src/server/controller/api/contestant/contestantApiController.js
@@ -20,26 +20,6 @@ module.exports = class ContestantApiController {
 
   static save(request, response, next) {
     // TODO: check if strings are empty
-
-
-    if (request.body.firstName === undefined || request.body.lastName === undefined) {
-      return response.status(400).json({success: false,
-        error: {text: 'Es wurden nicht alle notwendingen Felder ausgefüllt'}});
-    }
-
-    StudentApiController.unique(request.body.firstName, request.body.lastName, (result) => {
-      if (result === false) {
-        return response.status(200).json({
-          success: false,
-          error: {text: 'not_unique'}
-        });
-      } else {
-
-      }
-    });
-
-
-
     if (request.body.firstName === undefined || request.body.lastName === undefined || request.body.course === undefined || request.body.year === undefined ||
       request.body.description === undefined || request.file === undefined) {
       return response.status(400).json({success: false,
@@ -65,6 +45,7 @@ module.exports = class ContestantApiController {
         }
         StudentApiController.validate(request.body, (validated, student) => {
           if (validated === true) {
+            console.log(student);
             contestantJSON.activated = false;
             contestantJSON.image = request.file.filename;
               // sanitize user inputs

diff --git a/src/server/controller/api/student/studentApiController.js b/src/server/controller/api/student/studentApiController.js
@@ -24,7 +24,7 @@ module.exports = class StudentApiController {
         if (students.length > 1) {
           return next(false, null);
         } else if (students.length === 1) {
-          return next(true, students);
+          return next(true, student);
         }
         return next(false, null);
       });