Merge pull request #227 from COS301-SE-2023/Testing

Testing
COS301-SE-2023 · Sep 28, 2023 · 23f14e4 · 23f14e4
2 parents fa24298 + 0151d51
commit 23f14e4
Show file tree

Hide file tree

Showing 3 changed files with 285 additions and 283 deletions.
diff --git a/api/scripts/fetchstatstest.py b/api/scripts/fetchstatstest.py
@@ -4,8 +4,9 @@
 
 testing_endpoint = "http://127.0.0.1:8000/api/fetchSuburbStats"
 testing_endpoint = "https://witpa.codelog.co.za/api/fetchSuburbStats"
-schedule_endpoint = "https://witpa.codelog.co.za/api/fetchScheduleData"
 schedule_endpoint = "http://127.0.0.1:8000/api/fetchScheduleData"
+schedule_endpoint = "https://witpa.codelog.co.za/api/fetchScheduleData"
+maponoff_endpoint = "https://witpa.codelog.co.za/api/fetchTimeForPolygon"
 maponoff_endpoint = "http://127.0.0.1:8000/api/fetchTimeForPolygon"
 def sendRequest():
     body = {
@@ -20,7 +21,7 @@ def sendRequest():
 
 def sendScheduleRequest():
     body = {
-      #"suburbId" :18231 
+      #"suburbId" :18231
       "suburbId" : 18210
     }
     request = json.dumps(body)
@@ -32,20 +33,21 @@ def sendScheduleRequest():
 
 def sendTimeForPolygonRequest():
     body = {
-      #"suburbId" :18057 
-      #"suburbId" : 18231 
-      "suburbId" : 18195
+      #"suburbId" :18057
+      #"suburbId" : 18231
+      "suburbId" : 18196
     }
+    print(body)
     request = json.dumps(body)
     headers = {
       "Content-Type":"application/json"
     }
     response = requests.post(url=maponoff_endpoint,data=request,headers=headers)
     print(response.text)
 if (__name__ == "__main__"):
-    sendRequest()
+    #sendRequest()
     print("=================================================================================")
-    sendScheduleRequest()
+    #sendScheduleRequest()
     print("=================================================================================")
     sendTimeForPolygonRequest()
 
diff --git a/api/src/loadshedding.rs b/api/src/loadshedding.rs
@@ -708,7 +708,7 @@ impl TimeScheduleEntity {
                 self.stop_minute as u32
             })
             .unwrap();
-        if time < time_to_search {
+        if time < time_to_search && !start {
             time = time.checked_add_signed(chrono::Duration::days(1)).unwrap();
         }
         time