Merge branch 'dev' into inventory

Author: lanhlungboiz045

backend/src/test/java/com/smalltrend/controller/inventory/dashboard/InventoryDashboardControllerTest.java

@@ -158,7 +158,6 @@ void getBatchStatuses_shouldReturnOk() {
                         .status("SAFE")
                         .daysUntilExpiry(111)
                         .value(new BigDecimal("5000000"))
-                        .locationName("Kho A1")
                         .build(),
                 BatchStatusResponse.builder()
                         .batchId(2)
@@ -169,7 +168,6 @@ void getBatchStatuses_shouldReturnOk() {
                         .status("EXPIRING_SOON")
                         .daysUntilExpiry(4)
                         .value(new BigDecimal("2500000"))
-                        .locationName("Kho B1")
                         .build()
         );
         when(dashboardService.getBatchStatuses()).thenReturn(expected);

backend/src/test/java/com/smalltrend/service/inventory/dashboard/InventoryDashboardServiceTest.java

@@ -159,7 +159,7 @@ void getBatchStatuses_shouldReturnBatchStatuses() {
         assertEquals("BATCH-1", response.getBatchCode());
         assertEquals(100, response.getQuantity());
         assertEquals("EXPIRING_SOON", response.getStatus());
-        assertEquals("Location 1", response.getLocationName());
+        assertEquals(batch.getMfgDate(), response.getReceivedDate());
         assertEquals(new BigDecimal("1000.0"), response.getValue());
     }