Skip to content

Commit 47c1c1a

Browse files
dmitarsyuryyas
authored andcommitted
OD-17000 feat: check if number of days is 0
1 parent 0a32efa commit 47c1c1a

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

server/src/main/resources/scripts/ish.script.sendStudentClassCommencementNotice.groovy

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
def classesQuery = "isCancelled is false and startDateTime not is null and startDateTime is today"
2+
if(!number_of_days.equals("0"))
3+
classesQuery = classesQuery + " + ${number_of_days} days"
14
def classesStartingTomorrow = query {
25
entity "CourseClass"
3-
query "isCancelled is false and startDateTime not is null and startDateTime is today + ${number_of_days} days"
6+
query classesQuery
47
}
58
records = classesStartingTomorrow.findAll { cc -> cc.successAndQueuedEnrolments.size() >= cc.minimumPlaces }*.successAndQueuedEnrolments.flatten()
69
message {

server/src/main/resources/scripts/ish.script.sendTutorClassCommencementNotice.groovy

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
def timeQueryValue = "today"
2+
if(!number_of_days.equals("0"))
3+
timeQueryValue = timeQueryValue + " + ${number_of_days} days"
14
if (send_before_each_session) {
25

36
records = query {
47
entity "TutorAttendance"
5-
query "session.courseClass.isCancelled is false and session.courseClass.startDateTime not is null and session.startDatetime is today + ${number_of_days} days"
8+
query "session.courseClass.isCancelled is false and session.courseClass.startDateTime not is null and session.startDatetime is ${timeQueryValue}"
69
}
710

811
message {
@@ -12,7 +15,7 @@ if (send_before_each_session) {
1215
} else {
1316
records = query {
1417
entity "CourseClass"
15-
query "isCancelled is false and startDateTime not is null and startDateTime is today + ${number_of_days} days"
18+
query "isCancelled is false and startDateTime not is null and startDateTime is ${timeQueryValue}"
1619
}
1720

1821
message {

0 commit comments

Comments
 (0)