started implementing #12

nerdakademie · Feb 21, 2017 · 44d6dd1 · 44d6dd1
1 parent ae60305
commit 44d6dd1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/src/client/component/pages/ContestantForm.jsx b/src/client/component/pages/ContestantForm.jsx
@@ -107,14 +107,14 @@ class ContestantForm extends Component {
       this.setState({lastName_error: 'Bitte gebe Nachnamen an'});
       errors++;
     }
-    if ($course.val().length < 1) {
+  /*  if ($course.val().length < 1) {
       this.setState({course_error: 'Bitte gebe einen Studiengang an'});
       errors++;
     }
     if ($year.val().length < 1) {
       this.setState({year_error: 'Bitte gebe einen Jahrgang an'});
       errors++;
-    }
+    }*/
     if ($description.val().length < 1) {
       this.setState({description_error: 'Bitte gebe eine Beschreibung an'});
       errors++;

diff --git a/src/server/controller/api/contestant/contestantApiController.js b/src/server/controller/api/contestant/contestantApiController.js
@@ -21,36 +21,34 @@ module.exports = class ContestantApiController {
   static save(request, response, next) {
     // TODO: check if strings are empty
 
-
-    if (request.body.firstName === undefined || request.body.lastName === undefined) {
+    if (request.body.firstName === undefined || request.body.lastName === undefined || request.body.description === undefined ||
+      request.file === undefined) {
       return response.status(400).json({success: false,
         error: {text: 'Es wurden nicht alle notwendingen Felder ausgefüllt'}});
     }
+    if (request.body.description.length > 1500) {
+      return response.status(400).json({success: false,
+        error: {text: 'Bewerbungstext ist zu lang'}});
+    }
 
     StudentApiController.unique(request.body.firstName, request.body.lastName, (result) => {
       if (result === false) {
-        return response.status(200).json({
-          success: false,
-          error: {text: 'not_unique'}
-        });
+        if (request.body.course === undefined || request.body.year === undefined) {
+          return response.status(200).json({
+            success: false,
+            error: {text: 'not_unique'}
+          });
+        }
+        const contestantJSON = request.body;
+        ContestantApiController.save_2(contestantJSON, response, next);
       } else {
-
+        const contestantJSON = request.body;
+        ContestantApiController.save_2(contestantJSON, response, next);
       }
     });
+  }
 
-
-
-    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,
-        error: {text: 'Es wurden nicht alle notwendingen Felder ausgefüllt'}});
-    }
-    if (request.body.description.length > 1500) {
-      return response.status(400).json({success: false,
-        error: {text: 'Bewerbungstext ist zu lang'}});
-    }
-    const contestantJSON = request.body;
-
+  static save_2(contestantJSON, response, next) {
     Contestant.count({firstName: {$regex: ContestantHelper.buildNameRegex(contestantJSON.firstName),
       $options: 'g'},
       lastName: contestantJSON.lastName}).exec((countError, count) => {
@@ -67,7 +65,7 @@ module.exports = class ContestantApiController {
           if (validated === true) {
             contestantJSON.activated = false;
             contestantJSON.image = request.file.filename;
-              // sanitize user inputs
+          // sanitize user inputs
             contestantJSON.firstName = xss(contestantJSON.firstName);
             contestantJSON.lastName = xss(contestantJSON.lastName);
             contestantJSON.course = student.course;
@@ -95,7 +93,7 @@ module.exports = class ContestantApiController {
               error: {text: 'Deine Angaben konnten nicht validiert werden. \nVersuche es erneut'}
             });
           }
-            // return next('error');
+        // return next('error');
         });
       });
   }