fixed filter causing missing assignments

NewcastleRSE · Sep 7, 2024 · 9d86f11 · 9d86f11
1 parent 28327ed
commit 9d86f11
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/api/timesheet/services/timesheet.js b/src/api/timesheet/services/timesheet.js
@@ -388,16 +388,25 @@ module.exports = ({ strapi }) =>  ({
           }
         },
         {
-          end: {
-            $null: true
-          }
+          $and: [
+            {
+              start: { 
+                $lt: startDate.toISODate()
+              },
+            },
+            {
+              end: {
+                $gt: endDate.toISODate()
+              }
+            }
+          ]
         }
       ]
     }
 
     const timesheets = await strapi.services['api::timesheet.timesheet'].find(...args),
           assignments = await strapi.services['api::assignment.assignment'].find({filters: dateRangeFilter}),
-          capacities = await strapi.services['api::capacity.capacity'].find({filters: dateRangeFilter}),
+          capacities = await strapi.services['api::capacity.capacity'].find({filters: { $or: [...dateRangeFilter.$or, { end: { $null: true }} ]} }),
           holidays = await fetchBankHolidays(args[0].filters.year.$eq),
           annualLeave = await strapi.services['api::timesheet.timesheet'].leave({...args[0]})
 

diff --git a/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/src/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -14,7 +14,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "x-generation-date": "2024-09-05T07:36:38.358Z"
+    "x-generation-date": "2024-09-07T22:21:39.958Z"
   },
   "x-strapi-config": {
     "path": "/documentation",