Update calendar_app.py

calendar_app.py

@@ -113,6 +113,15 @@ class Calendar:
                     print(f"{print_counter}. {dt} {event_description}")
                     print_counter+=1
 
+
+
+    def check_valid_menu_choice(choice):
+        """Input sanitation for valid menu choice from 1 and 7."""
+        if not choice.isdigit() or int(choice) < 1 or int(choice) > 7:
+            print(f"Invalid choice: {choice}. Please choose an option number from 1 to 7.")
+            return "invalid_choice"
+        else:
+            return "valid_choice"
     
     def check_valid_date(date):
         """Input sanitation for valid date format"""
@@ -147,9 +156,29 @@ class Calendar:
         else:
             return "valid_date"
             
-            
+    def check_valid_date_range(date_start, date_end):
+        """Input sanitation for start date before OR equal to the end date."""
+        if datetime.strptime(date_start, '%Y-%m-%d') > datetime.strptime(date_end, '%Y-%m-%d'):
+            print(f"Error: Start date {date_start} is after end date {date_end}.\nPlease enter end date after the start date {date_start}.")
+            return "invalid_range"
+        else:
+            return "valid_range"
 
+    def check_valid_month(month):
+        """Input sanitation for month string between 1 and 12."""
+        if not month.isdigit() or int(month) < 1 or int(month) > 12:
+            print(f"Invalid month: {month}. Please enter a month from 01 to 12.")
+            return "invalid_month"
+        else:
+            return "valid_month"
 
+    def check_valid_reminder(reminder):
+        """Input sanitation for reminder description."""
+        if len(reminder)<1 or reminder is None:
+            print("Error: Reminder description cannot be empty.")
+            return "invalid_reminder"
+        else:
+            return "valid_reminder"
 
 
 if __name__ == "__main__":
@@ -166,38 +195,103 @@ if __name__ == "__main__":
         print("7. Exit")
         choice = input("Choose an option number: ")
 
-        # user create event reminder
-        if choice == "1":
-            date = input("Enter date (YYYY-MM-DD): ")
-            if check_valid_date(date) == "valid_date":
-                reminder = input("Enter description for event reminder: ")
+        if check_valid_menu_choice(choice) == "valid_choice":
+
+
+            ########################################
+            # user create event reminder
+            if choice == "1":
+                while True:
+                    date = input("Enter date (YYYY-MM-DD): ")
+                    if check_valid_date(date) == "invalid_date":
+                        continue
+                    else:
+                        break
+                    
+                while True:
+                    reminder = input("Enter description for event reminder: ")
+                    if check_valid_reminder(reminder) == "invalid_reminder":
+                        continue
+                    else:
+                        break
+                        
                 calendar.add_reminder(date, reminder)
-        elif choice == "2":
-            date_start = input("Enter start date (YYYY-MM-DD): ")
-            date_end = input("Enter end date (YYYY-MM-DD): ")
-            if check_valid_date(date_start) == "valid_date":
-                if check_valid_date(date_end) == "valid_date":
+                        
+
+
+
+            
+
+            elif choice == "2":
+                while True:
+                    date_start = input("Enter start date (YYYY-MM-DD): ")
+                        if check_valid_date(date_start) == "invalid_date":
+                            continue
+                        else:
+                            break
+                
+                while True:
+                    date_end = input("Enter end date (YYYY-MM-DD): ")
+                    if check_valid_date(date_end) == "invalid_date":
+                        continue
+                    else:
+                        if check_valid_date_range(date_start, date_end) == "invalid_range":
+                            continue
+                        else:
+                            break
+                
+                while True:
                     reminder = input("Enter description for event reminder: ")
-                    calendar.add_daterange(date_start, date_end, reminder)
-
-        # list ALL or future reminders
-        elif choice == "3":
-            calendar.show_all_reminders()
-        elif choice == "4":
-            calendar.show_future_reminders()
-
-        # list reminders for specific date or month
-        elif choice == "5":
-            date = input("Enter date (YYYY-MM-DD): ")
-            if check_valid_date(date) == "valid_date":
-                calendar.show_reminders(date)
-        elif choice == "6":
-            user_mth = input("Enter month number (MM): ")
-            calendar.show_month(user_mth)
+                    if check_valid_reminder(reminder) == "invalid_reminder":
+                        continue
+                    else:
+                        break
+                
+                calendar.add_daterange(date_start, date_end, reminder)
+            ########################################
+
+            
+            ########################################
+            # list ALL or future reminders
+            elif choice == "3":
+                calendar.show_all_reminders()
+            elif choice == "4":
+                calendar.show_future_reminders()
+            ########################################
+
 
             
-        elif choice == "7":
-            calendar.save_calendar()
-            break
+            ########################################
+            # list reminders for specific date or month
+            elif choice == "5":
+                while True:
+                    date = input("Enter date (YYYY-MM-DD): ")
+                    if check_valid_date(date) == "invalid_date":
+                        continue
+                    else:
+                        break
+                
+                calendar.show_reminders(date)
+
+
+
+                
+            elif choice == "6":
+                while True:
+                    user_mth = input("Enter month number (MM): ")
+                    if check_valid_month(month) == "invalid_month":
+                        continue
+                    else:
+                        break
+                        
+                calendar.show_month(user_mth)
+            ########################################
+    
+
+                
+            elif choice == "7":
+                calendar.save_calendar()
+                break
+                
         else:
             print("Invalid option. Please try again.")