Merge pull request #115 from OpenLMIS/OPSD-40

OPSD-40: Allow skipping date validation when updating requisition

Author: pwargulak

CHANGELOG.md

@@ -1,6 +1,11 @@
 Upcoming Version (WIP)
 ==================
 
+Improvements:
+* Optional `override` query parameter to `PUT /requisitions/{id}` endpoint.
+  * When `override=true`, the endpoint skips date validation during the update process.
+  * Existing ETag behavior remains unchanged.
+
 8.4.1 / 16.05.2025
 ==================
 

src/main/java/org/openlmis/requisition/web/BaseRequisitionController.java

@@ -251,7 +251,8 @@ InitiateResult doInitiate(UUID programId, UUID facilityId, UUID suggestedPeriod,
   }
 
   UpdatePreparationResult doUpdatePreparation(UUID requisitionId,
-      Requisition.Importer requisitionImporter, HttpServletRequest request, Profiler profiler) {
+      Requisition.Importer requisitionImporter, HttpServletRequest request, boolean override,
+      Profiler profiler) {
     if (null != requisitionImporter.getId()
         && !Objects.equals(requisitionImporter.getId(), requisitionId)) {
       throw new ValidationMessageException(ERROR_ID_MISMATCH);
@@ -260,9 +261,12 @@ UpdatePreparationResult doUpdatePreparation(UUID requisitionId,
     Requisition requisitionToUpdate = findRequisition(requisitionId, profiler);
 
     profiler.start("VALIDATE_TIMESTAMPS");
-    requisitionVersionValidator
-        .validateRequisitionTimestamps(requisitionImporter.getModifiedDate(), requisitionToUpdate)
-        .throwExceptionIfHasErrors();
+    if (!override) {
+      requisitionVersionValidator
+          .validateRequisitionTimestamps(requisitionImporter.getModifiedDate(),
+              requisitionToUpdate)
+          .throwExceptionIfHasErrors();
+    }
 
     checkPermission(
         profiler,

src/main/java/org/openlmis/requisition/web/RequisitionController.java

@@ -265,12 +265,13 @@ public void deleteRequisition(@PathVariable("id") UUID requisitionId) {
   @ResponseStatus(HttpStatus.OK)
   public RequisitionDto updateRequisition(@RequestBody RequisitionDto requisitionDto,
       @PathVariable("id") UUID requisitionId,
+      @RequestParam(name = "override", required = false, defaultValue = "false") boolean override,
       HttpServletRequest request,
       HttpServletResponse response) {
     Profiler profiler = getProfiler("UPDATE_REQUISITION", requisitionId, requisitionDto);
 
     UpdatePreparationResult result = doUpdatePreparation(requisitionId, requisitionDto,
-        request, profiler);
+        request, override, profiler);
 
     Requisition requisitionToUpdate = result.getRequisitionToUpdate();
 

src/main/java/org/openlmis/requisition/web/RequisitionV2Controller.java

@@ -124,11 +124,12 @@ public RequisitionV2Dto initiate(@RequestParam(value = "program") UUID programId
   @PutMapping("/{id}")
   public RequisitionV2Dto updateRequisition(@PathVariable("id") UUID requisitionId,
       @RequestBody RequisitionV2Dto requisitionDto,
+      @RequestParam(name = "override", required = false, defaultValue = "false") boolean override,
       HttpServletRequest request, HttpServletResponse response) {
     Profiler profiler = getProfiler("UPDATE_REQUISITION_V2", requisitionId, requisitionDto);
 
     UpdatePreparationResult result = doUpdatePreparation(requisitionId, requisitionDto,
-        request, profiler);
+        request, override,  profiler);
 
     Requisition requisitionToUpdate = result.getRequisitionToUpdate();
 

src/test/java/org/openlmis/requisition/web/RequisitionControllerTest.java

@@ -550,7 +550,7 @@ public void shouldReturnBadRequestWhenRequisitionIdDiffersFromTheOneInUrl() thro
     RequisitionDto requisitionDto = mock(RequisitionDto.class);
     when(requisitionDto.getId()).thenReturn(uuid1);
 
-    requisitionController.updateRequisition(requisitionDto, uuid2, request, response);
+    requisitionController.updateRequisition(requisitionDto, uuid2, false, request, response);
   }
 
   @Test(expected = VersionMismatchException.class)
@@ -571,7 +571,7 @@ public void shouldReturnBadRequestWhenThereIsNewerVersion() throws Exception {
         any(ZonedDateTime.class), any(Requisition.class)))
         .thenCallRealMethod();
 
-    requisitionController.updateRequisition(requisitionDto, uuid1, request, response);
+    requisitionController.updateRequisition(requisitionDto, uuid1, false, request, response);
   }
 
   @Test
@@ -603,7 +603,7 @@ public void shouldUpdateRequisition() {
     when(facilityReferenceDataService.findOne(any(UUID.class))).thenReturn(
         DtoGenerator.of(FacilityDto.class));
 
-    requisitionController.updateRequisition(requisitionDto, uuid1, request, response);
+    requisitionController.updateRequisition(requisitionDto, uuid1, true, request, response);
 
     assertEquals(template, initiatedRequsition.getTemplate());
     verify(initiatedRequsition).updateFrom(
@@ -649,7 +649,7 @@ public void shouldUpdateStockBasedRequisition() {
         any(LocalDate.class), any(LocalDate.class)))
         .thenReturn(Collections.singletonList(stockCardRangeSummaryDto));
 
-    requisitionController.updateRequisition(requisitionDto, uuid1, request, response);
+    requisitionController.updateRequisition(requisitionDto, uuid1, false, request, response);
 
     assertEquals(template, initiatedRequsition.getTemplate());
     verify(initiatedRequsition).updateFrom(
@@ -675,7 +675,7 @@ public void shouldNotUpdateWithInvalidRequisition() {
         .validateEtagVersionIfPresent(any(HttpServletRequest.class), any(Requisition.class));
 
     assertThatThrownBy(() -> requisitionController
-        .updateRequisition(requisitionDto, uuid1, request, response))
+        .updateRequisition(requisitionDto, uuid1, false, request, response))
         .isInstanceOf(VersionMismatchException.class);
 
     verify(requisitionService).validateCanSaveRequisition(initiatedRequsition);