Fix dates

controllers/log_controller.py

@@ -2,7 +2,7 @@ from flask import jsonify, request
 import logging
 import os
 import json
-from datetime import datetime
+from datetime import datetime, date, time
 import uuid
 import pytesseract
 from PIL import Image
@@ -41,8 +41,9 @@ def upload_log(current_user):
         return jsonify({'message': 'Log date is required'}), 400
     
     try:
-        # Parse the date string
-        log_date = datetime.strptime(log_date_str, '%Y-%m-%d').date()
+        # Parse the date string and convert to datetime at midnight
+        parsed_date = datetime.strptime(log_date_str, '%Y-%m-%d').date()
+        log_datetime = datetime.combine(parsed_date, time.min) # Use time.min for midnight
         
         # Read the file content
         file_content = file.read()
@@ -51,12 +52,12 @@ def upload_log(current_user):
         logger.info(f"Extracting text from PDF using OCR")
         extracted_text = pdf_to_text(file_content, is_bytes=True)
         
-        # Create new log entry with the extracted text instead of file reference
+        # Create new log entry with datetime object
         log = Log(
             user_id=current_user._id,
             department_id=current_user.department_id,
-            log_date=log_date,
-            log_text=extracted_text  # Store the extracted text, not a file reference
+            log_date=log_datetime, # Pass datetime object
+            log_text=extracted_text
         )
         
         if log.save():
@@ -384,21 +385,23 @@ def classify_log_activities(current_user):
         extracted_text = pdf_to_text(file_content, is_bytes=True)
         logger.info(f"OCR finished. Extracted {len(extracted_text)} characters.")
 
-        # Get log date from form data (assuming it's still sent with classify request)
-        log_date_str = request.form.get('log_date', datetime.now().strftime('%Y-%m-%d')) # Default to today if not provided
+        # Get log date from form data and convert to datetime at midnight
+        log_date_str = request.form.get('log_date', datetime.now().strftime('%Y-%m-%d'))
         try:
-             log_date = datetime.strptime(log_date_str, '%Y-%m-%d').date()
+             parsed_date = datetime.strptime(log_date_str, '%Y-%m-%d').date()
+             log_datetime = datetime.combine(parsed_date, time.min) # Use time.min
         except ValueError:
              logger.warning(f"Invalid log_date format '{log_date_str}', using today's date.")
-             log_date = datetime.now().date()
+             parsed_date = datetime.now().date()
+             log_datetime = datetime.combine(parsed_date, time.min)
 
-        logger.info(f"Creating Log object for user {current_user._id} on {log_date}")
+        logger.info(f"Creating Log object for user {current_user._id} on {log_datetime.date()}")
         new_log = Log(
             user_id=current_user._id,
             department_id=current_user.department_id,
-            log_date=log_date,
+            log_date=log_datetime, # Pass datetime object
             log_text=extracted_text,
-            incidents=[] # Initialize incidents list
+            incidents=[]
         )
         if not new_log.save():
              logger.error("Failed to save initial Log object.")
@@ -466,7 +469,7 @@ def classify_log_activities(current_user):
                             user_id=current_user._id,
                             workflow_id=ObjectId(workflow_id),
                             description=activity_description,
-                            date=log_date,
+                            date=log_datetime.date(), # Incident might store just date, or convert as needed
                             activity_text=activity_text_for_incident,
                             log_id=log_id,
                             status="classified" # New initial status