Merge branch 'dev' into cypress-tests

COS301-SE-2023 · Sep 28, 2023 · be7502e · be7502e
2 parents 5bde639 + 4148da2
commit be7502e
Show file tree

Hide file tree

Showing 6 changed files with 293 additions and 287 deletions.
diff --git a/api/scripts/fetchstatstest.py b/api/scripts/fetchstatstest.py
@@ -6,6 +6,7 @@
 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"
+maponoff_endpoint = "https://witpa.codelog.co.za/api/fetchTimeForPolygon"
 maponoff_endpoint = "http://127.0.0.1:8000/api/fetchTimeForPolygon"
 def sendRequest():
     body = {
@@ -20,8 +21,8 @@ def sendRequest():
 
 def sendScheduleRequest():
     body = {
-      #"suburbId" :18231 
-      "suburbId" : 18210
+      #"suburbId" :18231
+      "suburbId" : 18186
     }
     request = json.dumps(body)
     headers = {
@@ -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()
     print("=================================================================================")
-    sendTimeForPolygonRequest()
+    #sendTimeForPolygonRequest()
 
diff --git a/api/src/loadshedding.rs b/api/src/loadshedding.rs
@@ -699,7 +699,11 @@ impl TimeScheduleEntity {
             .with_hour(if start {
                 self.start_hour as u32
             } else {
-                self.stop_hour as u32
+                if self.stop_hour != 24 {
+                    self.stop_hour as u32
+                } else {
+                    0
+                }
             })
             .unwrap()
             .with_minute(if start {
@@ -708,7 +712,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

diff --git a/api/src/scraper.rs b/api/src/scraper.rs
@@ -62,9 +62,9 @@ pub fn convert_to_ints(time_range:&str) -> Result<Times,Json<ApiError<'static>>>
             return Err(Json(ApiError::ScraperUploadError(
                 "You have a malformed starting hour, please fix this, HH <= 23",
             )));
-        } else if potential_times.end_hour >= 24 {
+        } else if potential_times.end_hour > 24 || potential_times.end_hour == 0 {
             return Err(Json(ApiError::ScraperUploadError(
-                "You have a malformed end hour, please fix this, HH <= 23",
+                "You have a malformed end hour, please fix this, 0 < HH <= 24",
             )));
         } else if potential_times.start_minute >= 60 {
             return Err(Json(ApiError::ScraperUploadError(