Skip to content

Commit 0552516

Browse files
authored
feat: filter approved OOO periods in user status retrieval (#2589)
1 parent 750beab commit 0552516

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

utils/userStatus.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const { NotFound } = require("http-errors");
22
const { userState } = require("../constants/userStatus");
3+
const { REQUEST_STATE } = require("../constants/requests");
34
const { convertTimestampToUTCStartOrEndOfDay } = require("./time");
45
const firestore = require("./firestore");
56
const requestsModel = firestore.collection("requests");
@@ -87,14 +88,13 @@ const getApprovedOooPeriods = async (userId, windowStart, windowEnd) => {
8788
const snapshot = await requestsModel
8889
.where("requestedBy", "==", userId)
8990
.where("type", "==", "OOO")
91+
.where("state", "==", REQUEST_STATE.APPROVED)
9092
.where("until", ">=", windowStart)
9193
.get();
9294

9395
const periods = [];
9496
snapshot.forEach((doc) => {
9597
const data = doc.data();
96-
const isApproved = data.state === "APPROVED";
97-
if (!isApproved) return;
9898

9999
const from = normalizeTimestamp(data.from);
100100
const until = normalizeTimestamp(data.until);

0 commit comments

Comments
 (0)