diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index dd5ec30d..ee2acf7a 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -2957,7 +2957,8 @@ class APIController extends Controller implements LoggedController
                                 $jo->setStatusAutoAssign(AutoAssignStatus::HUB_AND_RIDER_ASSIGNED);
                                 $jo->setDeliveryStatus(DeliveryStatus::RIDER_ASSIGN);
 
-                                // TODO: set date_assigned for job order
+                                // set date_assigned for job order
+                                $jo->setDateAssign(new DateTime());
 
                                 $assigned_rider->setAvailable(false);
 
diff --git a/utils/update_jo_date_assign/update_jo_date_assign.sql b/utils/update_jo_date_assign/update_jo_date_assign.sql
new file mode 100644
index 00000000..5c30b3ae
--- /dev/null
+++ b/utils/update_jo_date_assign/update_jo_date_assign.sql
@@ -0,0 +1 @@
+UPDATE job_order SET date_assign = date_create WHERE date_assign is null;