java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(lastleg): restore dispatch returns from immutable pick source and expose customer receipts

Browse Source
This commit is contained in:
ouyangxq
2026-09-30 12:09:19 +08:00
parent c7f880300c
commit 4a14001a09
11 changed files with 293 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lastleg-service/src/test/java/com/baiyue/lastleg/delivery/controller/MerchantDeliveryControllerTest.java
+50
View File
@@ -3,6 +3,8 @@ package com.baiyue.lastleg.delivery.controller;
import com.baiyue.common.security.AuthenticatedUser;
import com.baiyue.lastleg.delivery.dto.DeliveryRequests;
import com.baiyue.lastleg.delivery.service.DeliveryTransferService;
import com.baiyue.lastleg.delivery.service.DeliveryDocumentService;
import com.baiyue.lastleg.delivery.dto.DeliveryDocumentDtos;
import com.baiyue.lastleg.security.OverseasPermissions;
import jakarta.validation.Validation;
import org.junit.jupiter.api.Test;
@@ -29,9 +31,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
class MerchantDeliveryControllerTest {
private final DeliveryTransferService service = mock(DeliveryTransferService.class);
private final DeliveryDocumentService documents = mock(DeliveryDocumentService.class);
private final MerchantDeliveryController controller = controller();
private final DeliveryRequests.Query query = new DeliveryRequests.Query(
1, 20, null, null, null, null, null, null, null, null, null, null, null, null);
@@ -46,14 +50,20 @@ class MerchantDeliveryControllerTest {
Method create = MerchantDeliveryController.class.getMethod("create", AuthenticatedUser.class,
String.class, DeliveryRequests.Transfer.class);
Method detail = MerchantDeliveryController.class.getMethod("detail", AuthenticatedUser.class, String.class);
Method receipts = MerchantDeliveryController.class.getMethod("receipts", AuthenticatedUser.class, String.class);
Method download = MerchantDeliveryController.class.getMethod("receiptDownload", AuthenticatedUser.class, String.class, long.class);
assertPermission(page, OverseasPermissions.MERCHANT_DELIVERY_LIST);
assertPermission(detail, OverseasPermissions.MERCHANT_DELIVERY_LIST);
assertPermission(receipts, OverseasPermissions.MERCHANT_DELIVERY_LIST);
assertPermission(download, OverseasPermissions.MERCHANT_DELIVERY_LIST);
assertPermission(create, OverseasPermissions.MERCHANT_DELIVERY_CREATE);
assertNotEquals(OverseasPermissions.MERCHANT_DELIVERY_LIST,
OverseasPermissions.MERCHANT_DELIVERY_CREATE);
assertTrue(Arrays.stream(page.getParameters()).noneMatch(this::isCustomerParameter));
assertTrue(Arrays.stream(detail.getParameters()).noneMatch(this::isCustomerParameter));
assertTrue(Arrays.stream(receipts.getParameters()).noneMatch(this::isCustomerParameter));
assertTrue(Arrays.stream(download.getParameters()).noneMatch(this::isCustomerParameter));
assertTrue(Arrays.stream(create.getParameters()).noneMatch(this::isCustomerParameter));
assertTrue(Arrays.stream(DeliveryRequests.Transfer.class.getRecordComponents())
.noneMatch(component -> "customerId".equals(component.getName())));
@@ -80,6 +90,36 @@ class MerchantDeliveryControllerTest {
assertThrows(ResponseStatusException.class, () -> controller.page(platform, query));
assertThrows(ResponseStatusException.class, () -> controller.detail(platform, "DEL-100"));
assertThrows(ResponseStatusException.class, () -> controller.create(platform, "DSP-100", transferRequest()));
assertThrows(ResponseStatusException.class, () -> controller.receipts(platform, "DEL-100"));
assertThrows(ResponseStatusException.class, () -> controller.receiptDownload(platform, "DEL-100", 13));
}
@Test
void merchantReceiptDownloadKeepsTokenScopeAndReturnsSafeAttachmentBytes() {
var file = new DeliveryDocumentDtos.File(13L, "签收.pdf", "application/pdf", 2, LocalDateTime.now());
when(documents.merchantReceiptDownload("100","DEL-100",13))
.thenReturn(new DeliveryDocumentService.Download(file, new byte[]{3,4}));
controller.receipts(user(100L,"MERCHANT"),"DEL-100");
var response = controller.receiptDownload(user(100L,"MERCHANT"),"DEL-100",13);
verify(documents).merchantReceipts("100","DEL-100");
verify(documents).merchantReceiptDownload("100","DEL-100",13);
assertTrue(Arrays.equals(new byte[]{3,4},response.getBody()));
assertEquals("nosniff",response.getHeaders().getFirst("X-Content-Type-Options"));
assertEquals("no-store",response.getHeaders().getCacheControl());
assertTrue(response.getHeaders().getContentDisposition().isAttachment());
}
@Test
void receiptReadsRejectMissingIdentityInvalidCustomerAndNonMerchantBeforeServiceAccess() {
assertEquals(401, assertThrows(ResponseStatusException.class,
() -> controller.receipts(null,"DEL-100")).getStatusCode().value());
for (AuthenticatedUser invalid : List.of(user(-1L,"MERCHANT"), user(100L,"PLATFORM"), user(100L,"PDA"))) {
assertEquals(403, assertThrows(ResponseStatusException.class,
() -> controller.receipts(invalid,"DEL-100")).getStatusCode().value());
assertEquals(403, assertThrows(ResponseStatusException.class,
() -> controller.receiptDownload(invalid,"DEL-100",13)).getStatusCode().value());
}
org.mockito.Mockito.verifyNoInteractions(documents);
}
@Test
@@ -101,6 +141,15 @@ class MerchantDeliveryControllerTest {
assertTrue(contract.contains("merchant:warehouse:delivery:list"));
assertTrue(contract.contains("merchant:warehouse:delivery:create"));
assertFalse(contract.contains("name: customerId"));
String receiptContract = Files.readString(Path.of("src/main/resources/openapi/delivery-documents-v1.yaml"));
String merchantPaths = slice(receiptContract,
" /api/merchant/v1/last-leg/delivery-orders/{deliveryNo}/documents/receipt:",
" /api/platform/v1/last-leg/delivery-orders/{deliveryNo}/documents:");
assertTrue(merchantPaths.contains("merchant:warehouse:delivery:list"));
assertTrue(merchantPaths.contains("/documents/receipt/files/{fileId}/download:"));
assertFalse(merchantPaths.contains("#/components/parameters/CustomerId"));
assertFalse(merchantPaths.contains("\n post:"));
assertFalse(merchantPaths.contains("\n put:"));
}
private boolean isCustomerParameter(java.lang.reflect.Parameter parameter) {
@@ -128,6 +177,7 @@ class MerchantDeliveryControllerTest {
private MerchantDeliveryController controller() {
MerchantDeliveryController value = new MerchantDeliveryController();
ReflectionTestUtils.setField(value, "service", service);
ReflectionTestUtils.setField(value, "documents", documents);
return value;
}