Merge pull request #155 from marc101101/feature/bugfix_my_courses

use where and orwhere for or clauses in bookshelf
marc101101 · Sep 23, 2018 · 49e46a1 · 49e46a1
2 parents 4315afe + 859a2eb
commit 49e46a1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/server/service/CoursesService.js b/server/service/CoursesService.js
@@ -30,9 +30,15 @@ exports.coursesCourse_idApplyPOST = function (course_id, req) {
         if (course != null) {
           // get all active applications for course
           Applications
-            .where({
-              ANM_KURS_ID: course_id,
-              ANM_STAT_ID: 1 || 2
+            .query({
+              where: {
+                ANM_KURS_ID: course_id,
+                ANM_STAT_ID: 1
+              },
+              orWhere: {
+                ANM_KURS_ID: course_id,
+                ANM_STAT_ID: 2
+              }
             })
             .fetchAll()
             .then((applicationModells) => {
@@ -153,11 +159,18 @@ exports.coursesCourse_idGET = function (course_id) {
 exports.coursesCourse_idSignoffPOST = function (course_id, req) {
   return new Promise(function (resolve, reject) {
     let user_id = getUserFromToken(req);
-
-    Applications.where({
-        ANM_TEIL_ID: user_id,
-        ANM_KURS_ID: course_id,
-        ANM_STAT_ID: 1 || 2
+    Applications
+      .query({
+        where: {
+          ANM_TEIL_ID: user_id,
+          ANM_KURS_ID: course_id,
+          ANM_STAT_ID: 1 
+        },
+        orWhere: {
+          ANM_TEIL_ID: user_id,
+          ANM_KURS_ID: course_id,
+          ANM_STAT_ID: 2
+        }
       })
       .save({ANM_STAT_ID: 3}, {
         patch: true

diff --git a/server/service/UserService.js b/server/service/UserService.js
@@ -37,9 +37,15 @@ exports.userMeGET = function (id) {
 exports.userMeCoursesGET = function (user_id) {
   return new Promise(function (resolve, reject) {
     Applications
-      .where({
-        ANM_TEIL_ID: user_id,
-        ANM_STAT_ID: 1 || 2
+      .query({
+        where: {
+          ANM_TEIL_ID: user_id,
+          ANM_STAT_ID: 2
+        },
+        orWhere: 
+        { ANM_TEIL_ID: user_id,
+          ANM_STAT_ID: 1
+        }
       })
       .fetchAll({
         withRelated: ["course.location"]