From d1d9a190a9361bb31feebfb6c00ef2c3900e1157 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Dec 2023 10:00:52 -0500
Subject: [PATCH] refactor(MonitorAllTripsJob): Fix active trip filter and
 checking.

---
 .../middleware/tripmonitor/jobs/CheckMonitoredTrip.java     | 6 ++++++
 .../middleware/tripmonitor/jobs/MonitorAllTripsJob.java     | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/CheckMonitoredTrip.java b/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/CheckMonitoredTrip.java
index 893274103..1287be92f 100644
--- a/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/CheckMonitoredTrip.java
+++ b/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/CheckMonitoredTrip.java
@@ -520,6 +520,12 @@ private long getMinutesUntilTrip() {
      * calculated and updated in the monitored trip's journey state.
      */
     public boolean shouldSkipMonitoredTripCheck() throws Exception {
+        // before anything else, return true if the trip is inactive
+        if (trip.isInactive()) {
+            LOG.info("Skipping: Trip is inactive.");
+            return true;
+        }
+
         // get the configured timezone that OTP is using to parse dates and times
         ZoneId targetZoneId = DateTimeUtils.getOtpZoneId();
 
diff --git a/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/MonitorAllTripsJob.java b/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/MonitorAllTripsJob.java
index ef6a6584c..636c904b7 100644
--- a/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/MonitorAllTripsJob.java
+++ b/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/MonitorAllTripsJob.java
@@ -109,8 +109,9 @@ public void run() {
      */
     private static BasicDBObject makeTripFilter() {
         BasicDBObject tripFilter = new BasicDBObject();
+
         //.Trips must be active.
-        tripFilter.put("isInactive", false);
+        tripFilter.put("isActive", true);
 
         // Other conditions (e.g. in CheckMonitoredTrip) that would result in a trip to be not checked
         // should eventually be moved here.