Merge pull request #64 from UTSC-CSCC01-Software-Engineering-I/feat/set-shipment-status

shipment status

Author: shubhmgrg

epiready-backend/app.py

@@ -1,5 +1,6 @@
-import eventlet
-eventlet.monkey_patch()
+if __name__ == '__main__':
+    import eventlet
+    eventlet.monkey_patch()
 from flask import Flask, jsonify
 from flask_mail import Mail
 from flask_cors import CORS

epiready-backend/controllers/alerts.py

@@ -10,6 +10,8 @@
 from flask_mail import Message, Mail
 import eventlet
 
+eventlet.monkey_patch()
+
 def parse_temp_range(temp_range):
     """Parses a string like '2 to 8' into (2.0, 8.0)."""
     try:

epiready-backend/controllers/shipment.py

@@ -237,4 +237,37 @@ def get_latest_weather_data(user_id, shipment_id):
 #             return jsonify({'error': 'Shipment not found'}), 404
 #         return jsonify(shipment.to_dict()), 200
 #     except Exception as e:
-#         return jsonify({'error': str(e)}), 500
+#         return jsonify({'error': str(e)}), 500
+
+@token_required
+def update_shipment_status(user_id):
+    user = User.query.get(user_id)
+    if not user:
+        return jsonify({'error': 'User not found'}), 401
+    
+    data = request.get_json()
+    shipment_id = data.get("shipment_id")
+    
+    if not data or 'status' not in data:
+        return jsonify({'error': 'Missing required field: status'}), 400
+
+    status = data['status'].lower()
+    if status not in ['active', 'completed', 'cancelled']:
+        return jsonify({'error': 'Invalid status'}), 400
+    
+    print(status, shipment_id)
+
+    if user.role == 'transporter_manager':
+        shipment = Shipment.query.filter_by(id=shipment_id, organization_id=user.organization_id).first()
+    else:
+        shipment = Shipment.query.filter_by(id=shipment_id, user_id=user_id).first()
+
+    if not shipment:
+        return jsonify({'error': 'Shipment not found'}), 404
+
+    shipment.status = status
+    shipment.updated_at = datetime.now(timezone.utc)
+
+    db.session.commit()
+
+    return jsonify(shipment.to_dict()), 200

epiready-backend/models/shipment.py

@@ -54,7 +54,7 @@ def to_dict(self):
         }
 
 @event.listens_for(Shipment, 'before_update')
-def validate_completed_shipment(target):
+def validate_completed_shipment(mapper, connection, target):
     if isinstance(target, Shipment):
         if target.status == 'completed' and not target.actual_arrival:
             target.actual_arrival = datetime.now(timezone.utc)

epiready-backend/routes/shipment.py

@@ -1,9 +1,10 @@
 from flask import Blueprint
-from controllers.shipment import create_shipment, get_shipments_by_user, get_shipment_by_name, get_all_shipments, get_weather_data
+from controllers.shipment import create_shipment, get_shipments_by_user, get_shipment_by_name, get_all_shipments, get_weather_data, update_shipment_status
 
 shipment_blueprint = Blueprint("shipment", __name__)
 shipment_blueprint.route("", methods=["POST"])(create_shipment)
 shipment_blueprint.route("", methods=["GET"])(get_shipments_by_user)
 shipment_blueprint.route("/all", methods=["GET"])(get_all_shipments)
 shipment_blueprint.route("/<name>", methods=["GET"])(get_shipment_by_name)
-shipment_blueprint.route("/<string:shipment_id>/weather", methods=["GET"])(get_weather_data)
+shipment_blueprint.route("/<string:shipment_id>/weather", methods=["GET"])(get_weather_data)
+shipment_blueprint.route("/status", methods=["PUT"])(update_shipment_status)

epiready-frontend/src/components/Shipment/ShipmentStatusModal.jsx

@@ -0,0 +1,96 @@
+import React, { useState } from "react";
+import Popup from "reactjs-popup";
+import "reactjs-popup/dist/index.css";
+
+export default function ShipmentStatus({
+  open,
+  onClose,
+  onSubmit,
+  currentStatus,
+  loading = false,
+  error = "",
+}) {
+  const [status, setStatus] = useState(currentStatus);
+  const [localError, setLocalError] = useState("");
+
+  const handleSubmit = () => {
+    onSubmit(status);
+  };
+
+  return (
+    <Popup
+      open={open}
+      onClose={onClose}
+      modal
+      closeOnDocumentClick
+      contentStyle={{
+        background: "transparent",
+        boxShadow: "none",
+        padding: 0,
+        border: "none",
+        width: "95vw",
+        maxWidth: "400px",
+        minWidth: "0",
+      }}
+      overlayStyle={{ background: "rgba(0,0,0,0.5)" }}
+    >
+      <div className="relative bg-neutral-800 rounded-xl shadow-2xl p-8 w-full max-w-md flex flex-col">
+        <button
+          className="absolute top-0 right-1 text-gray-600 text-4xl font-bold hover:text-blue-900 transition"
+          onClick={() => {
+            setLocalError("");
+            onClose();
+          }}
+          aria-label="Close"
+          disabled={loading}
+        >
+          &times;
+        </button>
+        <h2 className="text-2xl font-bold text-[#bfc9d1] mb-4 text-center">
+          Shipment Status
+        </h2>
+        <select
+          value={status}
+          onChange={(e) => {
+            setStatus(e.target.value);
+          }}
+          className="p-4 mb-2"
+        >
+          <option value="active" className="text-gray-900">
+            Active
+          </option>
+          <option value="completed" className="text-gray-900">
+            Completed
+          </option>
+          <option value="cancelled" className="text-gray-900">
+            Cancelled
+          </option>
+        </select>
+        {(localError || error) && (
+          <div className="text-red-400 text-center mb-2">
+            {localError || error}
+          </div>
+        )}
+        <div className="flex gap-4 justify-center">
+          <button
+            className="px-4 py-2 rounded bg-[#6B805E] text-white font-semibold hover:bg-[#4e6147] focus:bg-[#4e6147] transition"
+            onClick={handleSubmit}
+            disabled={loading}
+          >
+            {loading ? "Submitting..." : "Submit"}
+          </button>
+          <button
+            className="px-4 py-2 rounded bg-neutral-700 text-white font-semibold hover:bg-neutral-600 focus:bg-neutral-600 transition"
+            onClick={() => {
+              setLocalError("");
+              onClose();
+            }}
+            disabled={loading}
+          >
+            Cancel
+          </button>
+        </div>
+      </div>
+    </Popup>
+  );
+}