Skip to content

Commit

Permalink
Merge pull request #111 from OpenLMIS/OPSD-13
Browse files Browse the repository at this point in the history 
OPSD-13: Made transferring stock data from requisition to stock manag…
  • Loading branch information
@pwargulak
pwargulak authored Feb 27, 2025
2 parents cd1fbca + 2becb81 commit 2acbe94
Show file tree
Hide file tree
Showing 5 changed files with 171 additions and 17 deletions.
8 changes: 7 additions & 1 deletion src/main/java/org/openlmis/requisition/web/BatchRequisitionController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import org.slf4j.ext.XLoggerFactory;
import org.slf4j.profiler.Profiler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
Expand Down Expand Up @@ -107,6 +108,9 @@ public class BatchRequisitionController extends BaseRequisitionController {
@Autowired
private PeriodReferenceDataService periodReferenceDataService;

@Value("${transferDataToStockManagement.enabled}")
private boolean isTransferStockDataFromRequisitionToStockManagementEnabled;

/**
* Attempts to retrieve requisitions with the provided UUIDs.
*/
Expand Down Expand Up @@ -210,7 +214,9 @@ public ResponseEntity<RequisitionsProcessingStatusDto> approve(
facilities, periods, approveParams, approvedProducts);
}

submitStockEvent(profiler, user, requisitions, orderables);
if (isTransferStockDataFromRequisitionToStockManagementEnabled) {
submitStockEvent(profiler, user, requisitions, orderables);
}

ResponseEntity<RequisitionsProcessingStatusDto> response =
buildResponse(processingStatus, profiler, HttpStatus.OK);
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/org/openlmis/requisition/web/RequisitionController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import org.openlmis.requisition.utils.Pagination;
import org.slf4j.profiler.Profiler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
Expand Down Expand Up @@ -88,6 +89,9 @@ public class RequisitionController extends BaseRequisitionController {
@Autowired
private SupervisoryNodeReferenceDataService supervisoryNodeService;

@Value("${transferDataToStockManagement.enabled}")
private boolean isTransferStockDataFromRequisitionToStockManagementEnabled;

/**
* Allows creating new requisitions.
*
Expand Down Expand Up @@ -457,7 +461,8 @@ public BasicRequisitionDto approveRequisition(
BasicRequisitionDto requisitionDto = buildBasicDto(profiler, requisition);
RequisitionTemplate requisitionTemplate = requisition.getTemplate();
if (!requisitionTemplate.isPopulateStockOnHandFromStockCards()
&& !requisitionTemplate.isPatientsTabEnabled()) {
&& !requisitionTemplate.isPatientsTabEnabled()
&& isTransferStockDataFromRequisitionToStockManagementEnabled) {
submitStockEvent(requisition, user.getId(), orderables);
}

Expand Down
4 changes: 3 additions & 1 deletion src/main/resources/application.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,6 @@ spring.data.rest.maxPageSize=2147483647
#why 2000 ? Check https://stackoverflow.com/a/417184
request.maxUrlLength=2000

unskip.requisition.item.when.approving=${UNSKIP_REQUISITION_ITEM_WHEN_APPROVING:false}
unskip.requisition.item.when.approving=${UNSKIP_REQUISITION_ITEM_WHEN_APPROVING:false}

transferDataToStockManagement.enabled=${TRANSFER_DATA_TO_STOCK_MANAGEMENT:true}
120 changes: 118 additions & 2 deletions src/test/java/org/openlmis/requisition/web/BatchRequisitionControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,52 @@

package org.openlmis.requisition.web;

import static org.mockito.ArgumentMatchers.anyCollection;
import static org.mockito.ArgumentMatchers.anyMap;
import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyList;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
import static org.mockito.internal.verification.VerificationModeFactory.atLeastOnce;

import com.google.common.collect.Maps;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.UUID;

import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.openlmis.requisition.domain.requisition.Requisition;
import org.openlmis.requisition.domain.requisition.RequisitionStatus;
import org.openlmis.requisition.dto.ReleasableRequisitionBatchDto;
import org.openlmis.requisition.dto.UserDto;
import org.openlmis.requisition.dto.stockmanagement.StockEventDto;
import org.openlmis.requisition.errorhandling.ValidationResult;
import org.openlmis.requisition.i18n.MessageService;
import org.openlmis.requisition.repository.RequisitionRepository;
import org.openlmis.requisition.service.PermissionService;
import org.openlmis.requisition.service.RequisitionService;
import org.openlmis.requisition.service.referencedata.FacilityReferenceDataService;
import org.openlmis.requisition.service.referencedata.FacilityTypeApprovedProductReferenceDataService;
import org.openlmis.requisition.service.referencedata.OrderableReferenceDataService;
import org.openlmis.requisition.service.referencedata.PeriodReferenceDataService;
import org.openlmis.requisition.service.referencedata.SupervisoryNodeReferenceDataService;
import org.openlmis.requisition.service.referencedata.SupplyLineReferenceDataService;
import org.openlmis.requisition.service.referencedata.UserReferenceDataService;
import org.openlmis.requisition.service.stockmanagement.StockEventStockManagementService;
import org.openlmis.requisition.testutils.DtoGenerator;
import org.openlmis.requisition.testutils.ReleasableRequisitionBatchDtoDataBuilder;
import org.openlmis.requisition.utils.AuthenticationHelper;
import org.openlmis.requisition.utils.StockEventBuilder;
import org.springframework.test.util.ReflectionTestUtils;

public class BatchRequisitionControllerTest {

Expand All @@ -49,14 +73,56 @@ public class BatchRequisitionControllerTest {
@Mock
PermissionService permissionService;

@Mock
RequisitionRepository requisitionRepository;

@Mock
UserReferenceDataService userReferenceDataService;

@Mock
SupervisoryNodeReferenceDataService supervisoryNodeReferenceDataService;

@Mock
OrderableReferenceDataService orderableReferenceDataService;

@Mock
FacilityReferenceDataService facilityReferenceDataService;

@Mock
PeriodReferenceDataService periodReferenceDataService;

@Mock
FacilityTypeApprovedProductReferenceDataService facilityTypeApprovedService;

@Mock
SupplyLineReferenceDataService supplyLineReferenceDataService;

@Mock
MessageService messageService;

@Mock
StockEventBuilder stockEventBuilder;

@Mock
StockEventStockManagementService stockEventStockManagementService;

@Mock
Requisition requisition;

@InjectMocks
BatchRequisitionController batchRequisitionController;
private BatchRequisitionController batchRequisitionController;

private final UUID uuid1 = UUID.fromString("00000000-0000-0000-0000-000000000001");

private final UUID uuid2 = UUID.fromString("00000000-0000-0000-0000-000000000002");

private UserDto currentUser;

@Before
public void setUp() {
MockitoAnnotations.initMocks(this);

UserDto currentUser = DtoGenerator.of(UserDto.class);
currentUser = DtoGenerator.of(UserDto.class);
when(authenticationHelper.getCurrentUser()).thenReturn(currentUser);
}

Expand Down Expand Up @@ -98,4 +164,54 @@ public void batchReleaseRequisitionsWithoutOrderWhenUserHasPermission() {
verify(requisitionService, atLeastOnce()).releaseWithoutOrder(any());
}

@Test
public void approveMultipleRequisitionsWhenTransferStockDataIsEnabled() {
ReflectionTestUtils.setField(batchRequisitionController,
"isTransferStockDataFromRequisitionToStockManagementEnabled", true);
when(requisitionRepository.readDistinctByIdIn(anyList()))
.thenReturn(Collections.singletonList(requisition));
when(requisition.getStatus()).thenReturn(RequisitionStatus.APPROVED);

StockEventDto stockEventDto = DtoGenerator.of(StockEventDto.class);
when(stockEventBuilder.fromRequisition(any(Requisition.class), any(), anyMap()))
.thenReturn(stockEventDto);

batchRequisitionController.approve(Arrays.asList(uuid1, uuid2));

verify(authenticationHelper).getCurrentUser();
verify(requisitionRepository).readDistinctByIdIn(anyCollection());
verify(userReferenceDataService).getPermissionStrings(currentUser.getId());
verify(supervisoryNodeReferenceDataService).findByIds(anyList());
verify(orderableReferenceDataService).findByIdentities(anySet());
verify(facilityReferenceDataService).search(anySet());
verify(periodReferenceDataService).search(anySet());
verify(facilityTypeApprovedService).findByIdentities(anySet());
verify(stockEventBuilder).fromRequisition(requisition, currentUser.getId(), Maps.newHashMap());
verify(stockEventStockManagementService).submit(stockEventDto);
}

@Test
public void approveMultipleRequisitionsWhenTransferStockDataIsDisabled() {
ReflectionTestUtils.setField(batchRequisitionController,
"isTransferStockDataFromRequisitionToStockManagementEnabled", false);
when(requisitionRepository.readDistinctByIdIn(anyList()))
.thenReturn(Collections.singletonList(requisition));
when(requisition.getStatus()).thenReturn(RequisitionStatus.APPROVED);

StockEventDto stockEventDto = DtoGenerator.of(StockEventDto.class);
when(stockEventBuilder.fromRequisition(any(Requisition.class), any(), anyMap()))
.thenReturn(stockEventDto);

batchRequisitionController.approve(Arrays.asList(uuid1, uuid2));

verify(authenticationHelper).getCurrentUser();
verify(requisitionRepository).readDistinctByIdIn(anyCollection());
verify(userReferenceDataService).getPermissionStrings(currentUser.getId());
verify(supervisoryNodeReferenceDataService).findByIds(anyList());
verify(orderableReferenceDataService).findByIdentities(anySet());
verify(facilityReferenceDataService).search(anySet());
verify(periodReferenceDataService).search(anySet());
verify(facilityTypeApprovedService).findByIdentities(anySet());
verifyNoInteractions(stockEventBuilder, stockEventStockManagementService);
}
}
49 changes: 37 additions & 12 deletions src/test/java/org/openlmis/requisition/web/RequisitionControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
Expand Down Expand Up @@ -965,28 +966,52 @@ public void shouldApproveAuthorizedRequisitionWithParentNodeAndSupplyLineForProg
}

@Test
public void shouldApproveAuthorizedRequisitionWithoutParentNode() {
public void shouldApproveAuthorizedRequisitionWithoutParentNodeWhenTransferStockDataIsEnabled() {
ReflectionTestUtils.setField(requisitionController,
"isTransferStockDataFromRequisitionToStockManagementEnabled", true);
final SupplyLineDto supplyLineDto = prepareForApproveWithSupplyLine();
when(authorizedRequsition.getEmergency()).thenReturn(false);
StockEventDto stockEventDto = DtoGenerator.of(StockEventDto.class);
when(stockEventBuilderBuilder.fromRequisition(any(Requisition.class), any(), anyMap()))
.thenReturn(stockEventDto);
.thenReturn(stockEventDto);

requisitionController.approveRequisition(authorizedRequsition.getId(), request, response);

verify(requisitionService, times(1)).validateCanApproveRequisition(
any(Requisition.class),
any(UUID.class));

verify(requisitionService).validateCanApproveRequisition(
any(Requisition.class),
any(UUID.class));
verify(authorizedRequsition)
.validateCanChangeStatus(dateHelper.getCurrentDateWithSystemZone(),
true, Maps.newHashMap(), Maps.newHashMap());
verify(requisitionService).doApprove(eq(null), any(), any(), eq(authorizedRequsition),
eq(singletonList(supplyLineDto)), any(ProcessingPeriodDto.class), any(Profiler.class));
verify(stockEventBuilderBuilder).fromRequisition(authorizedRequsition,
currentUser.getId(), Maps.newHashMap());
currentUser.getId(), Maps.newHashMap());
verify(stockEventService).submit(stockEventDto);
verify(requisitionService, times(1)).doApprove(eq(null), any(), any(),
eq(authorizedRequsition), eq(singletonList(supplyLineDto)), any(ProcessingPeriodDto.class),
any(Profiler.class));
}

@Test
public void shouldApproveAuthorizedRequisitionWithoutParentNodeWhenTransferStockDataIsDisabled() {
ReflectionTestUtils.setField(requisitionController,
"isTransferStockDataFromRequisitionToStockManagementEnabled", false);
final SupplyLineDto supplyLineDto = prepareForApproveWithSupplyLine();
when(authorizedRequsition.getEmergency()).thenReturn(false);
StockEventDto stockEventDto = DtoGenerator.of(StockEventDto.class);
when(stockEventBuilderBuilder.fromRequisition(any(Requisition.class), any(), anyMap()))
.thenReturn(stockEventDto);

requisitionController.approveRequisition(authorizedRequsition.getId(), request, response);

verify(requisitionService).validateCanApproveRequisition(
any(Requisition.class),
any(UUID.class));
verify(authorizedRequsition)
.validateCanChangeStatus(dateHelper.getCurrentDateWithSystemZone(),
true, Maps.newHashMap(), Maps.newHashMap());
.validateCanChangeStatus(dateHelper.getCurrentDateWithSystemZone(),
true, Maps.newHashMap(), Maps.newHashMap());
verify(requisitionService).doApprove(eq(null), any(),
any(), eq(authorizedRequsition), eq(singletonList(supplyLineDto)),
any(ProcessingPeriodDto.class), any(Profiler.class));
verifyNoInteractions(stockEventBuilderBuilder, stockEventService);
}

@Test
Expand Down

0 comments on commit 2acbe94

Please sign in to comment.