Upload 2 files

app.py

@@ -1,160 +1,203 @@
-from flask import Flask, request, jsonify, render_template
-from flask_cors import CORS # Import CORS
-from dotenv import load_dotenv
-import os
-import logging
-from datetime import datetime
-import csv
-import json # For logging complex items
-from uuid import uuid4
-
-load_dotenv()
-
-app = Flask(__name__, template_folder='templates', static_folder='static')
-CORS(app) # Enable CORS for all routes and all origins by default
-
-# Configure logging for the mock API
-MOCK_API_LOG_LEVEL = os.getenv("MOCK_API_LOG_LEVEL", "INFO").upper()
-mock_numeric_level = getattr(logging, MOCK_API_LOG_LEVEL, logging.INFO)
-logging.basicConfig(
-    level=mock_numeric_level,
-    format='%(asctime)s - MockOrderAPI - %(levelname)s - %(message)s'
-)
-mock_logger = logging.getLogger(__name__)
-mock_logger.info(f"Mock Order API logging level set to: {MOCK_API_LOG_LEVEL}")
-
-
-MOCK_API_SECRET_KEY = os.getenv('MOCK_API_FLASK_SECRET_KEY', 'a_different_secret_key_for_mock_api')
-if MOCK_API_SECRET_KEY == 'a_different_secret_key_for_mock_api' and not os.getenv('MOCK_API_FLASK_SECRET_KEY'):
-    mock_logger.warning("Using default Flask secret key for Mock API. Set MOCK_API_FLASK_SECRET_KEY in .env if sessions are used.")
-app.secret_key = MOCK_API_SECRET_KEY
-
-ORDERS_CSV_FILE = 'received_orders.csv'
-CSV_HEADER = ['timestamp', 'order_id', 'session_id', 'user_email', 'business_id', 'canonical_user_id', 'items_json_array']
-
-def initialize_orders_csv():
-    if not os.path.exists(ORDERS_CSV_FILE):
-        try:
-            with open(ORDERS_CSV_FILE, 'w', newline='', encoding='utf-8') as f:
-                writer = csv.writer(f)
-                writer.writerow(CSV_HEADER)
-            mock_logger.info(f"Orders CSV file '{ORDERS_CSV_FILE}' created.")
-        except IOError as e:
-            mock_logger.error(f"Failed to create orders CSV file '{ORDERS_CSV_FILE}': {e}", exc_info=True)
-
-@app.route('/')
-def index():
-    """Serves the main dashboard page (index.html)."""
-    return render_template('index.html')
-
-@app.route('/api/v1/orders/list', methods=['GET'])
-def list_orders():
-    initialize_orders_csv()
-    orders = []
-    try:
-        if not os.path.exists(ORDERS_CSV_FILE):
-            mock_logger.warning(f"Attempted to list orders, but '{ORDERS_CSV_FILE}' does not exist.")
-            return jsonify({"status": "success", "orders": [], "message": "No orders file found."}), 200
-
-        with open(ORDERS_CSV_FILE, 'r', newline='', encoding='utf-8') as f:
-            reader = csv.DictReader(f)
-            for row_number, row in enumerate(reader, 1): # Start row_number from 1 for logging
-                # Basic check for expected number of columns based on header
-                if len(row) != len(CSV_HEADER):
-                    mock_logger.warning(f"Row {row_number} in '{ORDERS_CSV_FILE}' has an incorrect number of columns. Expected {len(CSV_HEADER)}, got {len(row)}. Skipping row: {row}")
-                    continue # Skip malformed rows
-
-                try:
-                    items_str = row.get('items_json_array', '[]')
-                    # Handle potential empty strings or malformed JSON before parsing
-                    if not items_str or items_str.isspace():
-                        row['items_json_array'] = []
-                    else:
-                        row['items_json_array'] = json.loads(items_str)
-
-                except json.JSONDecodeError:
-                    mock_logger.warning(f"Could not parse items_json_array for order {row.get('order_id', 'N/A')} in row {row_number}: '{row.get('items_json_array', '')}'")
-                    row['items_json_array'] = [] # Default to empty list on error
-                except TypeError: # Handles if items_json_array is None from DictReader
-                    mock_logger.warning(f"items_json_array was None for order {row.get('order_id', 'N/A')} in row {row_number}. Defaulting to empty list.")
-                    row['items_json_array'] = []
-                
-                orders.append(row)
-        
-        orders.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
-        mock_logger.info(f"Successfully retrieved {len(orders)} orders from CSV.")
-        return jsonify({"status": "success", "orders": orders}), 200
-    except FileNotFoundError:
-        mock_logger.info(f"Orders CSV file '{ORDERS_CSV_FILE}' not found when listing orders.")
-        return jsonify({"status": "success", "orders": [], "message": "No orders recorded yet."}), 200
-    except Exception as e:
-        mock_logger.error(f"Error reading or parsing orders CSV: {e}", exc_info=True)
-        return jsonify({"status": "error", "message": "Failed to retrieve orders."}), 500
-
-
-@app.route('/api/v1/orders/place', methods=['POST'])
-def place_order():
-    initialize_orders_csv()
-    try:
-        order_data = request.json
-        if not order_data:
-            mock_logger.warning("Received empty payload for order placement.")
-            return jsonify({"status": "error", "message": "Empty payload."}), 400
-
-        user_info = order_data.get("user_info", {})
-        order_items = order_data.get("order_items", [])
-
-        if not isinstance(order_items, list) or not order_items:
-            mock_logger.warning(f"Invalid or empty order_items received: {order_items}")
-            return jsonify({"status": "error", "message": "Invalid or empty 'order_items' list is required."}), 400
-
-        mock_logger.info(f"--- ORDER RECEIVED by Mock Order API ---")
-        mock_logger.info(f"Timestamp: {datetime.now().isoformat()}")
-        mock_logger.info(f"User Info: {json.dumps(user_info)}")
-        mock_logger.info("Order Items:")
-        for item in order_items:
-            mock_logger.info(f"  - Product: {item.get('product_name', 'N/A')}, SKU: {item.get('sku', 'N/A')}, Quantity: {item.get('quantity', 'N/A')}, Unit: {item.get('unit', 'N/A')}")
-
-        simulated_order_id = f"MOCK-{uuid4().hex[:8].upper()}"
-
-        try:
-            # Ensure the file has a header if it's empty or just created
-            is_new_file = not os.path.exists(ORDERS_CSV_FILE) or os.path.getsize(ORDERS_CSV_FILE) == 0
-            
-            with open(ORDERS_CSV_FILE, 'a', newline='', encoding='utf-8') as f:
-                writer = csv.writer(f)
-                if is_new_file: # Should be handled by initialize_orders_csv, but as a safeguard
-                    writer.writerow(CSV_HEADER)
-                    mock_logger.info(f"Header written to new/empty {ORDERS_CSV_FILE} before appending order.")
-
-                items_json_str = json.dumps(order_items)
-                writer.writerow([
-                    datetime.now().isoformat(),
-                    simulated_order_id,
-                    user_info.get('session_id', 'N/A'),
-                    user_info.get('email', 'N/A'),
-                    user_info.get('business_id', 'N/A'),
-                    user_info.get('canonical_user_id', 'N/A'),
-                    items_json_str
-                ])
-            mock_logger.info(f"Order {simulated_order_id} successfully written to {ORDERS_CSV_FILE}")
-        except IOError as e_csv:
-            mock_logger.error(f"Failed to write order {simulated_order_id} to CSV: {e_csv}", exc_info=True)
-            return jsonify({"status": "success", "message": "Order received but failed to log locally.", "order_id": simulated_order_id, "warning": "Internal logging error"}), 200
-
-
-        mock_logger.info(f"--- END OF ORDER PROCESSING (Order ID: {simulated_order_id}) ---")
-        return jsonify({"status": "success", "message": "Order received and logged by Mock API.", "order_id": simulated_order_id}), 200
-
-    except Exception as e:
-        mock_logger.error(f"Unexpected error in place_order: {e}", exc_info=True)
-        return jsonify({"status": "error", "message": "An unexpected internal server error occurred."}), 500
-
-@app.route('/health', methods=['GET'])
-def health_check():
-    return jsonify({"status": "healthy", "message": "Mock Order API is running."}), 200
-
-
-if __name__ == '__main__':
-    debug_mode = os.getenv('FLASK_DEBUG', 'False').lower() == 'true' # Example of using FLASK_DEBUG env var
-    app.run(host='0.0.0.0', port=7860, debug=debug_mode)
+from flask import Flask, request, jsonify, render_template
+from flask_cors import CORS # Import CORS
+from dotenv import load_dotenv
+import os
+import logging
+from datetime import datetime
+import csv
+import json # For logging complex items
+from uuid import uuid4
+
+load_dotenv()
+
+app = Flask(__name__, template_folder='templates', static_folder='static')
+CORS(app) # Enable CORS for all routes and all origins by default
+
+# Configure logging for the mock API
+MOCK_API_LOG_LEVEL = os.getenv("MOCK_API_LOG_LEVEL", "INFO").upper()
+mock_numeric_level = getattr(logging, MOCK_API_LOG_LEVEL, logging.INFO)
+logging.basicConfig(
+    level=mock_numeric_level,
+    format='%(asctime)s - MockOrderAPI - %(levelname)s - %(message)s'
+)
+mock_logger = logging.getLogger(__name__)
+mock_logger.info(f"Mock Order API logging level set to: {MOCK_API_LOG_LEVEL}")
+
+
+MOCK_API_SECRET_KEY = os.getenv('MOCK_API_FLASK_SECRET_KEY', 'a_different_secret_key_for_mock_api')
+if MOCK_API_SECRET_KEY == 'a_different_secret_key_for_mock_api' and not os.getenv('MOCK_API_FLASK_SECRET_KEY'):
+    mock_logger.warning("Using default Flask secret key for Mock API. Set MOCK_API_FLASK_SECRET_KEY in .env if sessions are used.")
+app.secret_key = MOCK_API_SECRET_KEY
+
+ORDERS_CSV_FILE = 'received_orders.csv'
+CSV_HEADER = ['timestamp', 'order_id', 'session_id', 'user_email', 'business_id', 'canonical_user_id', 'items_json_array']
+
+def initialize_orders_csv():
+    if not os.path.exists(ORDERS_CSV_FILE):
+        try:
+            with open(ORDERS_CSV_FILE, 'w', newline='', encoding='utf-8') as f:
+                writer = csv.writer(f)
+                writer.writerow(CSV_HEADER)
+            mock_logger.info(f"Orders CSV file '{ORDERS_CSV_FILE}' created.")
+        except IOError as e:
+            mock_logger.error(f"Failed to create orders CSV file '{ORDERS_CSV_FILE}': {e}", exc_info=True)
+
+@app.route('/')
+def index():
+    """Serves the main dashboard page (index.html)."""
+    return render_template('index.html')
+
+@app.route('/api/v1/orders/list', methods=['GET'])
+def list_orders():
+    initialize_orders_csv() # Ensure CSV exists with header if it's the first operation
+    orders = []
+    try:
+        # This check is slightly redundant due to initialize_orders_csv, but safe
+        if not os.path.exists(ORDERS_CSV_FILE) or os.path.getsize(ORDERS_CSV_FILE) == 0:
+            mock_logger.info(f"'{ORDERS_CSV_FILE}' is missing or empty. Returning no orders.")
+            # initialize_orders_csv should have created it with a header if missing.
+            # If it's empty after that, it implies no data.
+            return jsonify({"status": "success", "orders": [], "message": "No orders recorded yet."}), 200
+
+        with open(ORDERS_CSV_FILE, 'r', newline='', encoding='utf-8') as f:
+            reader = csv.DictReader(f)
+            if reader.fieldnames != CSV_HEADER:
+                 mock_logger.error(f"CSV header mismatch in '{ORDERS_CSV_FILE}'. Expected {CSV_HEADER}, got {reader.fieldnames}. Returning empty list.")
+                 return jsonify({"status": "error", "orders": [], "message": "CSV file header corruption."}), 500
+
+            for row_number, row in enumerate(reader, 1): 
+                if len(row) != len(CSV_HEADER): # Check based on header in file
+                    mock_logger.warning(f"Row {row_number} in '{ORDERS_CSV_FILE}' has an incorrect number of columns. Expected {len(reader.fieldnames)}, got {len(row)}. Skipping row: {row}")
+                    continue 
+
+                try:
+                    items_str = row.get('items_json_array', '[]')
+                    if not items_str or items_str.isspace():
+                        row['items_json_array'] = []
+                    else:
+                        row['items_json_array'] = json.loads(items_str)
+                except json.JSONDecodeError:
+                    mock_logger.warning(f"Could not parse items_json_array for order {row.get('order_id', 'N/A')} in row {row_number}: '{row.get('items_json_array', '')}'")
+                    row['items_json_array'] = [] 
+                except TypeError: 
+                    mock_logger.warning(f"items_json_array was None for order {row.get('order_id', 'N/A')} in row {row_number}. Defaulting to empty list.")
+                    row['items_json_array'] = []
+                
+                orders.append(row)
+        
+        orders.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
+        mock_logger.info(f"Successfully retrieved {len(orders)} orders from CSV.")
+        return jsonify({"status": "success", "orders": orders}), 200
+    except FileNotFoundError: # Should be less likely due to initialize_orders_csv
+        mock_logger.info(f"Orders CSV file '{ORDERS_CSV_FILE}' not found when listing orders.")
+        return jsonify({"status": "success", "orders": [], "message": "No orders recorded yet."}), 200
+    except Exception as e:
+        mock_logger.error(f"Error reading or parsing orders CSV: {e}", exc_info=True)
+        return jsonify({"status": "error", "message": "Failed to retrieve orders."}), 500
+
+
+@app.route('/api/v1/orders/place', methods=['POST'])
+def place_order():
+    initialize_orders_csv() # Ensure CSV exists with header
+    try:
+        order_data = request.json
+        if not order_data:
+            mock_logger.warning("Received empty payload for order placement.")
+            return jsonify({"status": "error", "message": "Empty payload."}), 400
+
+        user_info = order_data.get("user_info", {})
+        order_items = order_data.get("order_items", [])
+
+        if not isinstance(order_items, list) or not order_items:
+            mock_logger.warning(f"Invalid or empty order_items received: {order_items}")
+            return jsonify({"status": "error", "message": "Invalid or empty 'order_items' list is required."}), 400
+
+        mock_logger.info(f"--- ORDER RECEIVED by Mock Order API ---")
+        mock_logger.info(f"Timestamp: {datetime.now().isoformat()}")
+        mock_logger.info(f"User Info: {json.dumps(user_info)}")
+        mock_logger.info("Order Items:")
+        for item in order_items: # SKU will be logged if present in received data
+            mock_logger.info(f"  - Product: {item.get('product_name', 'N/A')}, SKU: {item.get('sku', 'N/A')}, Quantity: {item.get('quantity', 'N/A')}, Unit: {item.get('unit', 'N/A')}")
+
+        simulated_order_id = f"MOCK-{uuid4().hex[:8].upper()}"
+
+        try:
+            # initialize_orders_csv ensures header. 'a' mode appends.
+            with open(ORDERS_CSV_FILE, 'a', newline='', encoding='utf-8') as f:
+                writer = csv.writer(f)
+                items_json_str = json.dumps(order_items)
+                writer.writerow([
+                    datetime.now().isoformat(),
+                    simulated_order_id,
+                    user_info.get('session_id', 'N/A'),
+                    user_info.get('email', 'N/A'),
+                    user_info.get('business_id', 'N/A'),
+                    user_info.get('canonical_user_id', 'N/A'),
+                    items_json_str
+                ])
+            mock_logger.info(f"Order {simulated_order_id} successfully written to {ORDERS_CSV_FILE}")
+        except IOError as e_csv:
+            mock_logger.error(f"Failed to write order {simulated_order_id} to CSV: {e_csv}", exc_info=True)
+            return jsonify({"status": "success", "message": "Order received but failed to log locally.", "order_id": simulated_order_id, "warning": "Internal logging error"}), 200
+
+        mock_logger.info(f"--- END OF ORDER PROCESSING (Order ID: {simulated_order_id}) ---")
+        return jsonify({"status": "success", "message": "Order received and logged by Mock API.", "order_id": simulated_order_id}), 200
+
+    except Exception as e:
+        mock_logger.error(f"Unexpected error in place_order: {e}", exc_info=True)
+        return jsonify({"status": "error", "message": "An unexpected internal server error occurred."}), 500
+
+@app.route('/api/v1/orders/delete/<order_id>', methods=['DELETE'])
+def delete_order_route(order_id):
+    if not os.path.exists(ORDERS_CSV_FILE):
+        mock_logger.warning(f"Attempted to delete order {order_id}, but '{ORDERS_CSV_FILE}' does not exist.")
+        return jsonify({"status": "error", "message": f"Order {order_id} not found (orders data file missing)."}), 404
+
+    rows_to_keep = []
+    order_found = False
+    
+    try:
+        with open(ORDERS_CSV_FILE, 'r', newline='', encoding='utf-8') as f_read:
+            reader = csv.DictReader(f_read)
+            # Validate header before proceeding
+            if reader.fieldnames != CSV_HEADER:
+                mock_logger.error(f"CSV header mismatch in '{ORDERS_CSV_FILE}' during delete. Expected {CSV_HEADER}, got {reader.fieldnames}.")
+                return jsonify({"status": "error", "message": "CSV file header corruption. Cannot process deletion."}), 500
+            
+            for row in reader:
+                if row.get('order_id') == order_id:
+                    order_found = True
+                    mock_logger.info(f"Order {order_id} identified for deletion.")
+                else:
+                    rows_to_keep.append(row)
+        
+        if not order_found:
+            mock_logger.warning(f"Order {order_id} not found in '{ORDERS_CSV_FILE}' for deletion.")
+            return jsonify({"status": "error", "message": f"Order ID {order_id} not found."}), 404
+
+        # Rewrite the CSV file with the remaining orders
+        with open(ORDERS_CSV_FILE, 'w', newline='', encoding='utf-8') as f_write:
+            writer = csv.DictWriter(f_write, fieldnames=CSV_HEADER)
+            writer.writeheader()
+            writer.writerows(rows_to_keep)
+        
+        mock_logger.info(f"Order {order_id} successfully deleted. '{ORDERS_CSV_FILE}' has been updated.")
+        return jsonify({"status": "success", "message": f"Order {order_id} deleted successfully."}), 200
+
+    except FileNotFoundError: 
+        mock_logger.error(f"'{ORDERS_CSV_FILE}' vanished during delete operation for {order_id}.")
+        return jsonify({"status": "error", "message": "Orders file disappeared during operation."}), 500
+    except Exception as e:
+        mock_logger.error(f"Error during deletion of order {order_id}: {e}", exc_info=True)
+        return jsonify({"status": "error", "message": "An internal error occurred while attempting to delete the order."}), 500
+
+@app.route('/health', methods=['GET'])
+def health_check():
+    return jsonify({"status": "healthy", "message": "Mock Order API is running."}), 200
+
+
+if __name__ == '__main__':
+    port = 7860 # Define port for clarity and consistency
+    debug_mode = os.getenv('FLASK_DEBUG', 'False').lower() == 'true'
+    mock_logger.info(f"Starting Mock Order API server on 0.0.0.0:{port} (Debug: {debug_mode})")
+    app.run(host='0.0.0.0', port=port, debug=debug_mode)

templates/index.html

@@ -121,6 +121,22 @@
         .inner-items-table td {
             word-break: break-word; /* Prevent long product names from breaking layout */
         }
+        
+        /* Styles for delete button in actions column */
+        .delete-button {
+            padding: 5px 10px;
+            background-color: #e74c3c; /* Red */
+            color: white;
+            border: none;
+            border-radius: 4px;
+            cursor: pointer;
+            font-size: 0.9em; 
+            transition: background-color 0.2s ease;
+        }
+
+        .delete-button:hover {
+            background-color: #c0392b; /* Darker red */
+        }
 
 
         /* Responsive improvements */
@@ -145,6 +161,10 @@
                 padding: 3px 5px;
                 font-size: 0.9em; /* Relative to parent cell font size */
             }
+             .delete-button {
+                padding: 4px 8px;
+                font-size: 0.85em;
+            }
         }
     </style>
 </head>
@@ -166,6 +186,7 @@
                     <th>Business ID</th>
                     <th>Canonical User ID</th>
                     <th>Items</th>
+                    <th>Actions</th>
                 </tr>
             </thead>
             <tbody>
@@ -183,7 +204,6 @@
             statusMessage.textContent = 'Refreshing orders...';
             refreshButton.disabled = true;
             try {
-                // Assuming the API is served from the same origin or CORS is configured
                 const response = await fetch('/api/v1/orders/list'); 
                 if (!response.ok) {
                     throw new Error(`HTTP error! status: ${response.status}`);
@@ -211,7 +231,7 @@
             if (!orders || orders.length === 0) {
                 const row = ordersTableBody.insertRow();
                 const cell = row.insertCell();
-                cell.colSpan = 7; // Number of columns
+                cell.colSpan = 8; // Adjusted colspan
                 cell.textContent = 'No orders found.';
                 cell.style.textAlign = 'center';
                 return;
@@ -230,16 +250,14 @@
                 const itemsCell = row.insertCell();
                 if (order.items_json_array && Array.isArray(order.items_json_array) && order.items_json_array.length > 0) {
                     const itemsTable = document.createElement('table');
-                    itemsTable.classList.add('inner-items-table'); // For styling
+                    itemsTable.classList.add('inner-items-table');
 
                     const tHead = itemsTable.createTHead();
                     const headerRow = tHead.insertRow();
                     const thProduct = document.createElement('th');
                     thProduct.textContent = 'Product';
                     headerRow.appendChild(thProduct);
-                    const thSku = document.createElement('th');
-                    thSku.textContent = 'SKU';
-                    headerRow.appendChild(thSku);
+                    // SKU header removed
                     const thQty = document.createElement('th');
                     thQty.textContent = 'Qty';
                     headerRow.appendChild(thQty);
@@ -248,16 +266,60 @@
                     order.items_json_array.forEach(item => {
                         const itemRow = tBody.insertRow();
                         itemRow.insertCell().textContent = item.product_name || 'N/A';
-                        itemRow.insertCell().textContent = item.sku || 'N/A';
+                        // SKU cell removed
                         itemRow.insertCell().textContent = item.quantity || 'N/A';
                     });
                     itemsCell.appendChild(itemsTable);
                 } else {
                     itemsCell.textContent = 'No items';
                 }
+
+                // Add Actions cell with Delete button
+                const actionsCell = row.insertCell();
+                const deleteButton = document.createElement('button');
+                deleteButton.textContent = 'Delete';
+                deleteButton.classList.add('delete-button');
+                deleteButton.onclick = () => deleteOrder(order.order_id);
+                actionsCell.appendChild(deleteButton);
             });
         }
 
+        async function deleteOrder(orderId) {
+            if (!confirm(`Are you sure you want to delete order ${orderId}?`)) {
+                return;
+            }
+            statusMessage.textContent = `Deleting order ${orderId}...`;
+            refreshButton.disabled = true; // Disable refresh button during delete operation
+
+            try {
+                const response = await fetch(`/api/v1/orders/delete/${orderId}`, {
+                    method: 'DELETE',
+                });
+
+                // Try to parse JSON regardless of response.ok, as error messages might be in JSON
+                const responseData = await response.json().catch(() => {
+                    return { status: "error", message: `Failed to parse server response. Status: ${response.status}` };
+                });
+
+                if (!response.ok) {
+                    throw new Error(responseData.message || `HTTP error! status: ${response.status}`);
+                }
+                
+                if (responseData.status === 'success') {
+                    statusMessage.textContent = `Order ${orderId} deleted successfully. Refreshing list...`;
+                    await fetchOrders(); // Refresh the list (fetchOrders will re-enable refreshButton)
+                } else {
+                    statusMessage.textContent = `Error deleting order: ${responseData.message}`;
+                    console.error('API Error (delete):', responseData.message);
+                    refreshButton.disabled = false; // Re-enable if fetchOrders is not called
+                }
+            } catch (error) {
+                statusMessage.textContent = `Failed to delete order ${orderId}. ${error.message}. See console for details.`;
+                console.error('Delete error:', error);
+                refreshButton.disabled = false; // Re-enable on any error
+            }
+        }
+
         refreshButton.addEventListener('click', fetchOrders);
         document.addEventListener('DOMContentLoaded', fetchOrders); // Initial load
     </script>