[Fix] Minor Laundry Bug

backend/laundry/api_wrapper.py

@@ -39,7 +39,7 @@ def update_machine_object(machine, machine_type_data):
         time_remaining = machine["currentStatus"]["remainingSeconds"]
         machine_type_data["running"] += 1
         try:
-            machine_type_data["time_remaining"].append(int(time_remaining))
+            machine_type_data["time_remaining"].append(int(time_remaining) // 60)
         except ValueError:
             pass
     elif status in ["AVAILABLE", "COMPLETE"]:
@@ -81,7 +81,11 @@ def parse_a_room(room_request_link):
             "id": machine["id"],
             "type": "washer" if machine["isWasher"] else "dryer",
             "status": machine["currentStatus"]["statusId"],
-            "time_remaining": machine["currentStatus"]["remainingSeconds"],
+            "time_remaining": (
+                int(machine["currentStatus"]["remainingSeconds"]) // 60
+                if machine["currentStatus"]["statusId"] == "IN_USE"
+                else 0
+            ),
         }
         for machine in request_json
         if machine["isWasher"] or machine["isDryer"]

backend/laundry/views.py

@@ -51,7 +51,7 @@
             room_data = room_status(get_object_or_404(LaundryRoom, room_id=room_id))
             room_data["id"] = room_id
             room_data["usage_data"] = HallUsage.compute_usage(room_id)
-            output["rooms"].append(room_id)
+            output["rooms"].append(room_data)
 
         record_analytics(Metric.LAUNDRY_VIEWED, request.user.username)