Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MALAWISUP-5622: Added required service references as parameters #103

Merged
merged 2 commits into from
Sep 3, 2024
Merged

MALAWISUP-5622: Added required service references as parameters #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce47f30
MALAWISUP-5622: Added required service references as parameters
sradziszewski Aug 28, 2024
43ba113
MALAWISUP-5622: Removed comments
sradziszewski Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/org/openlmis/requisition/web/BaseRequisitionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,11 @@ ETagResource<RequisitionDto> doUpdate(Requisition requisitionToUpdate, Requisiti
Map<VersionIdentityDto, ApprovedProductDto> approvedProducts = findApprovedProducts(
requisitionToUpdate::getAllApprovedProductIdentities, profiler);

if (Boolean.FALSE.equals(requisitionToUpdate.getEmergency())) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why it's not somewhere in org.openlmis.requisition.web.BaseRequisitionController.UpdateParams#updateAndSave ?

Or even deeper in: org.openlmis.requisition.domain.requisition.Requisition#updateFrom

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem appears earlier, in BatchRequisitionController, line 274, where the requisition is built, based on which requisitionToUpdate is later updated. Already in the process of this build, the processingPeriodId and facilityId are 'lost'. Therefore, we could also put these setters in the buildRequisition method of BatchRequisitionController or RequisitionBuilder.newRequisition (I didn't want to put it here due to the use of this method in other places and possible complications). Do you think we should change this and put the setters e.g. in the buildRequisition method?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, then I would move it to org.openlmis.requisition.domain.requisition.RequisitionBuilder#newRequisition, mind the processingPeriodDto argument of newRequisition.
OR I you think it too risky in OLMIS, then don't change it and just merge the PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

considering other uses of this method and the need to modify it I will leave it as is

requisition.setProcessingPeriodId(requisitionToUpdate.getProcessingPeriodId());
requisition.setFacilityId(requisitionToUpdate.getFacilityId());
}

UpdateParams params = new UpdateParams(requisitionToUpdate, requisition, orderables,
facility, program, null, approvedProducts);

Expand Down Expand Up @@ -703,7 +708,8 @@ class UpdateParams {
void updateAndSave(Profiler profiler) {
profiler.start("UPDATE");
toUpdate.updateFrom(requisition, orderables, approvedProducts,
datePhysicalStockCountCompletedEnabledPredicate.exec(program), null, null);
datePhysicalStockCountCompletedEnabledPredicate.exec(program),
requisitionService, periodService);

profiler.start("SAVE");
toUpdate = requisitionRepository.save(toUpdate);
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/org/openlmis/requisition/web/RequisitionControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.isNotNull;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
Expand Down Expand Up @@ -605,7 +606,7 @@ public void shouldUpdateRequisition() {

assertEquals(template, initiatedRequsition.getTemplate());
verify(initiatedRequsition).updateFrom(
any(Requisition.class), anyMap(), anyMap(), eq(true), isNull(), isNull());
any(Requisition.class), anyMap(), anyMap(), eq(true), isNotNull(), isNotNull());
verify(requisitionRepository).save(initiatedRequsition);
verify(requisitionVersionValidator).validateEtagVersionIfPresent(
any(HttpServletRequest.class), eq(initiatedRequsition));
Expand Down Expand Up @@ -651,7 +652,7 @@ public void shouldUpdateStockBasedRequisition() {

assertEquals(template, initiatedRequsition.getTemplate());
verify(initiatedRequsition).updateFrom(
any(Requisition.class), anyMap(), anyMap(), eq(true), isNull(), isNull());
any(Requisition.class), anyMap(), anyMap(), eq(true), isNotNull(), isNotNull());
verify(requisitionRepository).save(initiatedRequsition);
verify(requisitionVersionValidator).validateEtagVersionIfPresent(
any(HttpServletRequest.class), eq(initiatedRequsition));
Expand Down
Loading