back end validation for recur requests

TigerAppsOrg · Aug 21, 2022 · 79ee681 · 79ee681
1 parent f5bdd1b
commit 79ee681
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/server.py b/server.py
@@ -169,6 +169,7 @@ def submit_request():
     except Exception as ex:
         return make_response(render_template('page404.html'), 404)
 
+    print('request arguments')
     print(request.args, file=stdout)
 
     # validate back end submission of requests to ensure
@@ -423,10 +424,13 @@ def recur_request_page():
             current_recur_req)
         print(current_recur_req_string)
 
+    print('final call for RR string: ' + current_recur_req_string)
+
     html = render_template('recurrequest.html',
                            dhalls=dhall_list,
                            date=datetime.now(),
-                           current_recur_req_string=current_recur_req_string)
+                           current_recur_req_string=current_recur_req_string,
+                           error=error)
     response = make_response(html)
     return response
 
@@ -446,6 +450,14 @@ def submit_recur_request():
     except Exception as ex:
         return make_response(render_template('page404.html'), 404)
 
+    print('recur req args')
+    print(request.args)
+
+    request_is_valid = validate_req(request.args)
+
+    if not request_is_valid:
+        return redirect('/recurrequest?error=invalid_request')
+
     # TODO: add validation to ensure bad requests can't be submitted through url
     # mostly just checking meal type alligns w times
 
@@ -530,7 +542,7 @@ def add_imports():
             meal_requests.clean_requests, 'interval', hours=5)
 
         initialize_usage_metrics = scheduler.add_job(database.create_new_day_usage_metrics, 'cron',
-                                                     hour=12, minute=7, timezone='America/New_York')
+                                                     hour=0, minute=0, timezone='America/New_York')
         # schedule lunch job to start at 10:00AM ET
         recur_lunch_text_job = scheduler.add_job(notifications.send_recurring_request_notifications_lunch,
                                                  'cron', hour=9, minute=45, timezone='America/New_York')

diff --git a/templates/recurrequest.html b/templates/recurrequest.html
@@ -9,7 +9,7 @@
 <body class="forceMaven">
 	{% include 'header.html' %}
 
-	{% if current_recur_req_string != None %}
+	{% if current_recur_req_string != None and current_recur_req_string != '' %}
 		<nav class="navbar navbar-expand-lg navbar-light jumbotron" id = 'currentRRHead'>
 			<div class="container-fluid">
 				<div class = 'col-md-8'>
@@ -111,6 +111,14 @@
                 </div>
                 </center>
 
+                <div class = "container" id = "hoursBox" style = "font-size: 18px;">
+                    Dining Hall Hours: <br>
+
+                    Lunch: 11:30AM - 2PM / Brunch: 10AM - 2PM
+                    <br>
+                    Dinner: 5PM - 8PM
+                </div>
+
 				<div class="container row" id="errorBox" style="color: red">
 
 					<!-- catching invalid requests on back-end -->