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

Jump to bottom

OAM-218: Updated programId param to repeatable #60

Merged
merged 10 commits into from
Jun 26, 2024
Merged

OAM-218: Updated programId param to repeatable #60

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dc3540e
OAM-218: WIP
pwargulak Jun 20, 2024
3afb95b
OAM-218: Updated programId param to repeatable
sradziszewski Jun 24, 2024
f75f586
OAM-218: Removed unused import, provided constants
sradziszewski Jun 25, 2024
63578c4
OAM-218: Removed unnecessary stubbings
sradziszewski Jun 25, 2024
06281ac
OAM-218: Added extra tests
sradziszewski Jun 25, 2024
989bd70
OAM-218: Provided changes after review
sradziszewski Jun 26, 2024
81c9029
OAM-218: Removed 'Ignore' annotation
sradziszewski Jun 26, 2024
00e9d9e
OAM-218: Added extra condition to test
sradziszewski Jun 26, 2024
b50aa0a
OAM-218: Fixed params/method names
sradziszewski Jun 26, 2024
e7a9184
OAM-218: Added tests for coverage.
tsznaj Jun 26, 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
4 changes: 3 additions & 1 deletion ...g/openlmis/stockmanagement/repository/ValidReasonAssignmentRepositoryIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import static org.junit.Assert.assertThat;

import com.google.common.collect.Sets;

import java.util.Collections;
import java.util.List;
import java.util.UUID;
import javax.persistence.EntityManager;
Expand Down Expand Up @@ -93,7 +95,7 @@ public void shouldReturnValidReasonWithProgramAndFacilityTypeAndReasonAndReasonT
repository.save(newAssignment);

List<ValidReasonAssignment> validReasonAssignments = repository.search(
PROGRAM_ID, FACILITY_TYPE_ID, Sets.newHashSet(
Collections.singleton(PROGRAM_ID), FACILITY_TYPE_ID, Sets.newHashSet(
validReasonAssignment.getReason().getReasonType(),
stockCardLineItemReason.getReasonType()),
stockCardLineItemReason.getId());
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/openlmis/stockmanagement/web/ValidReasonAssignmentControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void getValidReasonAssignments() {

@Test
public void getValidReasonAssignmentsByAllParameters() {
when(reasonAssignmentRepository.search(programId, facilityTypeId,
when(reasonAssignmentRepository.search(Collections.singleton(programId), facilityTypeId,
Sets.newHashSet(ReasonType.CREDIT, ReasonType.DEBIT), reasonId)).thenReturn(
Collections.singletonList(reasonAssignment));

Expand Down
10 changes: 6 additions & 4 deletions ...ava/org/openlmis/stockmanagement/web/ValidSourceDestinationControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

package org.openlmis.stockmanagement.web;

import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
import static java.util.UUID.randomUUID;
import static org.hamcrest.Matchers.hasSize;
Expand Down Expand Up @@ -77,11 +78,11 @@ public void shouldGetValidSourcesOrDestinationsByProgramAndFacility()
UUID program = randomUUID();
UUID facility = randomUUID();

when(validSourceService.findSources(program, facility, false, pageRequest))
when(validSourceService.findSources(singleton(program), facility, false, pageRequest))
.thenReturn(Pagination.getPage(singletonList(sourceDestination)));

when(validDestinationService.findDestinations(program, facility, false, pageRequest))
.thenReturn(Pagination.getPage(singletonList(sourceDestination)));
when(validDestinationService.findDestinations(singleton(program), facility,
false, pageRequest)).thenReturn(Pagination.getPage(singletonList(sourceDestination)));

verifyZeroInteractions(permissionService);

Expand All @@ -93,6 +94,7 @@ public void shouldGetValidSourcesOrDestinationsByProgramAndFacility()
performSourcesOrDestinations(program, facility, false, sourceDestination, API_VALID_SOURCES);
}

// Good
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
@Test
public void shouldGeAllValidSourcesOrDestinationsWhenProgramAndFacilityAreNotProvided()
throws Exception {
Expand Down Expand Up @@ -274,4 +276,4 @@ private void performSourcesOrDestinations(
.andExpect(jsonPath("$.content[0].name", is(sourceDestinationDto.getName())))
.andExpect(jsonPath("$.content[0].isFreeTextAllowed", is(true)));
}
}
}
12 changes: 6 additions & 6 deletions ...ockmanagement/web/stockcardsummariesv2/StockCardSummariesV2ControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void shouldGetStockCardSummariesByAllParameters() throws Exception {
.param(ACCESS_TOKEN, ACCESS_TOKEN_VALUE)
.param(PAGE, String.valueOf(pageable.getPageNumber()))
.param(SIZE, String.valueOf(pageable.getPageSize()))
.param(PROGRAM_ID, params.getProgramId().toString())
.param(PROGRAM_ID, params.getProgramId().get(0).toString())
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
.param(FACILITY_ID, params.getFacilityId().toString())
.param(AS_OF_DATE, params.getAsOfDate().toString())
.param(ORDERABLE_ID, params.getOrderableIds().get(0).toString())
Expand Down Expand Up @@ -132,7 +132,7 @@ public void shouldSetIntegerMaxValueAsDefaultPageSize() throws Exception {
ResultActions resultActions = mvc.perform(
get(API_STOCK_CARD_SUMMARIES)
.param(ACCESS_TOKEN, ACCESS_TOKEN_VALUE)
.param(PROGRAM_ID, params.getProgramId().toString())
.param(PROGRAM_ID, params.getProgramId().get(0).toString())
.param(FACILITY_ID, params.getFacilityId().toString())
.param(AS_OF_DATE, params.getAsOfDate().toString())
.param(ORDERABLE_ID, params.getOrderableIds().get(0).toString())
Expand Down Expand Up @@ -193,7 +193,7 @@ public void shouldReturnForbiddenIfNoPermission() throws Exception {
.param(ACCESS_TOKEN, ACCESS_TOKEN_VALUE)
.param(PAGE, String.valueOf(pageable.getPageNumber()))
.param(SIZE, String.valueOf(pageable.getPageSize()))
.param(PROGRAM_ID, params.getProgramId().toString())
.param(PROGRAM_ID, params.getProgramId().get(0).toString())
.param(FACILITY_ID, params.getFacilityId().toString()));

resultActions.andExpect(status().isForbidden());
Expand All @@ -219,7 +219,7 @@ public void shouldReturnNonEmptySummariesIfFlagIsSet() throws Exception {
.param(ACCESS_TOKEN, ACCESS_TOKEN_VALUE)
.param(PAGE, String.valueOf(pageable.getPageNumber()))
.param(SIZE, String.valueOf(pageable.getPageSize()))
.param(PROGRAM_ID, params.getProgramId().toString())
.param(PROGRAM_ID, params.getProgramId().get(0).toString())
.param(FACILITY_ID, params.getFacilityId().toString())
.param(AS_OF_DATE, params.getAsOfDate().toString())
.param(ORDERABLE_ID, params.getOrderableIds().get(0).toString())
Expand Down Expand Up @@ -256,7 +256,7 @@ public void shouldRespectSendNonEmptyCardsFlagInSubsequentRequests() throws Exce
.param(ACCESS_TOKEN, ACCESS_TOKEN_VALUE)
.param(PAGE, String.valueOf(pageable.getPageNumber()))
.param(SIZE, String.valueOf(pageable.getPageSize()))
.param(PROGRAM_ID, params.getProgramId().toString())
.param(PROGRAM_ID, params.getProgramId().get(0).toString())
.param(FACILITY_ID, params.getFacilityId().toString())
.param(AS_OF_DATE, params.getAsOfDate().toString())
.param(ORDERABLE_ID, params.getOrderableIds().get(0).toString())
Expand Down Expand Up @@ -286,7 +286,7 @@ public void shouldRespectSendNonEmptyCardsFlagInSubsequentRequests() throws Exce
.param(ACCESS_TOKEN, ACCESS_TOKEN_VALUE)
.param(PAGE, String.valueOf(pageable.getPageNumber()))
.param(SIZE, String.valueOf(pageable.getPageSize()))
.param(PROGRAM_ID, params.getProgramId().toString())
.param(PROGRAM_ID, params.getProgramId().get(0).toString())
.param(FACILITY_ID, params.getFacilityId().toString())
.param(AS_OF_DATE, params.getAsOfDate().toString())
.param(ORDERABLE_ID, params.getOrderableIds().get(0).toString())
Expand Down
22 changes: 18 additions & 4 deletions ...n/java/org/openlmis/stockmanagement/repository/SourceDestinationAssignmentRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@

package org.openlmis.stockmanagement.repository;

import static org.openlmis.stockmanagement.web.ValidSourceDestinationSearchParams.PROGRAM_ID;

import java.util.List;
import java.util.Set;
import java.util.UUID;
import org.openlmis.stockmanagement.domain.sourcedestination.SourceDestinationAssignment;
import org.springframework.data.domain.Pageable;
Expand All @@ -27,11 +30,22 @@
public interface SourceDestinationAssignmentRepository<T extends SourceDestinationAssignment>
extends JpaRepository<T, UUID> {

String FACILITY_TYPE_ID = "facilityTypeId";
String NODE_ID = "nodeId";

List<T> findByProgramIdInAndFacilityTypeId(
@Param(PROGRAM_ID) Set<UUID> programId, @Param(FACILITY_TYPE_ID) UUID facilityTypeId,
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
Pageable pageable);

List<T> findByProgramIdAndFacilityTypeId(
@Param("programId") UUID programId, @Param("facilityTypeId") UUID facilityTypeId,
Pageable pageable);
@Param(PROGRAM_ID) UUID programId, @Param(FACILITY_TYPE_ID) UUID facilityTypeId,
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
Pageable pageable);

T findByProgramIdInAndFacilityTypeIdAndNodeId(
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
@Param(PROGRAM_ID) Set<UUID> programId, @Param(FACILITY_TYPE_ID) UUID facilityTypeId,
@Param(NODE_ID) UUID nodeId);

T findByProgramIdAndFacilityTypeIdAndNodeId(
@Param("programId") UUID programId, @Param("facilityTypeId") UUID facilityTypeId,
@Param("nodeId") UUID nodeId);
@Param(PROGRAM_ID) UUID programId, @Param(FACILITY_TYPE_ID) UUID facilityTypeId,
@Param(NODE_ID) UUID nodeId);
}
23 changes: 15 additions & 8 deletions src/main/java/org/openlmis/stockmanagement/repository/StockCardRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,30 @@

public interface StockCardRepository extends JpaRepository<StockCard, UUID> {

String PROGRAM_ID = "programId";
String FACILITY_ID = "facilityId";

StockCard findByProgramIdAndFacilityIdAndOrderableIdAndLotId(
@Param("programId") UUID programId,
@Param("facilityId") UUID facilityId,
@Param(PROGRAM_ID) UUID programId,
@Param(FACILITY_ID) UUID facilityId,
@Param("orderableId") UUID orderableId,
@Param("lotId") UUID lotId);

Page<StockCard> findByProgramIdAndFacilityId(
@Param("programId") UUID programId,
@Param("facilityId") UUID facilityId,
@Param(PROGRAM_ID) UUID programId,
@Param(FACILITY_ID) UUID facilityId,
Pageable pageable);

List<StockCard> findByProgramIdAndFacilityId(
@Param("programId") UUID programId,
@Param("facilityId") UUID facilityId);
@Param(PROGRAM_ID) UUID programId,
@Param(FACILITY_ID) UUID facilityId);

List<StockCard> findByProgramIdInAndFacilityId(
@Param(PROGRAM_ID) Collection<UUID> programId,
@Param(FACILITY_ID) UUID facilityId);

List<StockCard> findByOrderableIdInAndProgramIdAndFacilityId(
Collection<UUID> orderableIds, UUID programId, UUID facilityId);
List<StockCard> findByOrderableIdInAndProgramIdInAndFacilityId(
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
Collection<UUID> orderableIds, Collection<UUID> programId, UUID facilityId);

StockCard findByOriginEvent(@Param("originEventId") StockEvent stockEvent);

Expand Down
2 changes: 1 addition & 1 deletion ...org/openlmis/stockmanagement/repository/custom/ValidReasonAssignmentRepositoryCustom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

public interface ValidReasonAssignmentRepositoryCustom {

List<ValidReasonAssignment> search(UUID programId, UUID facilityTypeId,
List<ValidReasonAssignment> search(Collection<UUID> programId, UUID facilityTypeId,
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
Collection<ReasonType> reasonTypes, UUID reasonId);

}
4 changes: 2 additions & 2 deletions .../openlmis/stockmanagement/repository/custom/impl/ValidReasonAssignmentRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class ValidReasonAssignmentRepositoryImpl implements ValidReasonAssignmen
* @param reasonId Valid Reason Assignment stock card line item reason id
* @return List of Valid Reason Assignments matching the parameters.
*/
public List<ValidReasonAssignment> search(UUID programId, UUID facilityTypeId,
public List<ValidReasonAssignment> search(Collection<UUID> programId, UUID facilityTypeId,
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
Collection<ReasonType> reasonTypes, UUID reasonId) {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();

Expand All @@ -62,7 +62,7 @@ public List<ValidReasonAssignment> search(UUID programId, UUID facilityTypeId,
Predicate predicate = builder.conjunction();

if (null != programId) {
predicate = builder.and(predicate, builder.equal(root.get(PROGRAM_ID), programId));
predicate = builder.and(predicate, root.get(PROGRAM_ID).in(programId));
}

if (null != facilityTypeId) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/openlmis/stockmanagement/service/CalculatedStockOnHandService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ public class CalculatedStockOnHandService {
* @return List of stock cards with SOH values, empty list if no stock cards were found.
*/
public List<StockCard> getStockCardsWithStockOnHand(
UUID programId, UUID facilityId, LocalDate asOfDate, List<UUID> orderableIds,
List<UUID> programId, UUID facilityId, LocalDate asOfDate, List<UUID> orderableIds,
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
Set<UUID> lotCodeIds) {

List<StockCard> stockCards = orderableIds.isEmpty()
? stockCardRepository.findByProgramIdAndFacilityId(programId, facilityId)
: stockCardRepository.findByOrderableIdInAndProgramIdAndFacilityId(
? stockCardRepository.findByProgramIdInAndFacilityId(programId, facilityId)
: stockCardRepository.findByOrderableIdInAndProgramIdInAndFacilityId(
orderableIds, programId, facilityId);

stockCards.forEach(stockCard ->
Expand Down Expand Up @@ -122,7 +122,7 @@ public List<StockCard> getStockCardsWithStockOnHand(
public List<StockCard> getStockCardsWithStockOnHand(
UUID programId, UUID facilityId, LocalDate asOfDate, List<UUID> orderableIds) {

return getStockCardsWithStockOnHand(programId, facilityId,
return getStockCardsWithStockOnHand(Collections.singletonList(programId), facilityId,
asOfDate, orderableIds, Collections.emptySet());
}

Expand Down
18 changes: 11 additions & 7 deletions src/main/java/org/openlmis/stockmanagement/service/SourceDestinationBaseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import org.openlmis.stockmanagement.domain.sourcedestination.Node;
Expand Down Expand Up @@ -129,20 +130,20 @@ protected <T extends SourceDestinationAssignment> ValidSourceDestinationDto find
* This method will return only those assignments that match the geo level affinity
* or all possible assignments (when filtering params are not provided).
*
* @param programId program id
* @param programIds program id
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
* @param facilityId facility id
* @param repository assignment repository
* @param <T> assignment type
* @return a list of assignment dto or empty list if not found.
*/
protected <T extends SourceDestinationAssignment> Page<ValidSourceDestinationDto> findAssignments(
UUID programId, UUID facilityId, boolean includeDisabled,
Set<UUID> programIds, UUID facilityId, boolean includeDisabled,
SourceDestinationAssignmentRepository<T> repository,
Profiler profiler, Pageable pageable) {

profiler.start("FIND_ASSIGNMENTS");
if (programId != null && facilityId != null) {
return findFilteredAssignments(programId, facilityId, includeDisabled,
if (programIds != null && facilityId != null) {
return findFilteredAssignments(programIds, facilityId, includeDisabled,
repository, profiler, pageable);
} else if (includeDisabled) {
return findAllAssignments(repository, profiler, pageable);
Expand Down Expand Up @@ -296,7 +297,7 @@ private List<ValidSourceDestinationDto> createAssignmentDto(
}

private <T extends SourceDestinationAssignment> Page<ValidSourceDestinationDto>
findFilteredAssignments(UUID programId, UUID facilityId, boolean includeDisabled,
findFilteredAssignments(Set<UUID> programIds, UUID facilityId, boolean includeDisabled,
SourceDestinationAssignmentRepository<T> repository, Profiler profiler, Pageable pageable) {
profiler.start("FIND_FACILITY_BY_ID");
FacilityDto facility = facilityRefDataService.findOne(facilityId);
Expand All @@ -308,11 +309,14 @@ private List<ValidSourceDestinationDto> createAssignmentDto(

profiler.start("CHECK_PROGRAM_AND_FACILITY_TYPE_EXIST");
UUID facilityTypeId = facility.getType().getId();
programFacilityTypeExistenceService.checkProgramAndFacilityTypeExist(programId, facilityTypeId);
for (UUID programId : programIds) {
programFacilityTypeExistenceService
.checkProgramAndFacilityTypeExist(programId, facilityTypeId);
}

profiler.start("FIND_ASSIGNMENTS_BY_PROGRAM_AND_FACILITY_TYPE");
List<T> assignments = repository
.findByProgramIdAndFacilityTypeId(programId, facilityTypeId, Pageable.unpaged());
.findByProgramIdInAndFacilityTypeId(programIds, facilityTypeId, Pageable.unpaged());

profiler.start("FIND_FACILITY_IDS");
List<UUID> facilitiesIds = assignments.stream()
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/openlmis/stockmanagement/service/StockCardSummariesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ public StockCardSummaries findStockCards(StockCardSummariesV2SearchParams params
if (!homeFacilityPermissionService
.checkFacilityAndHomeFacilityLinkage(params.getFacilityId())) {
profiler.start("VALIDATE_VIEW_RIGHTS");
permissionService.canViewStockCard(params.getProgramId(), params.getFacilityId());
for (UUID id : params.getProgramId()) {
permissionService.canViewStockCard(id, params.getFacilityId());
}
}

profiler.start("GET_APPROVED_PRODUCTS");
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/openlmis/stockmanagement/service/StockCardSummariesV2SearchParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public final class StockCardSummariesV2SearchParams {
static final String ORDERABLE_NAME = "orderableName";
static final String LOT_CODE = "lotCode";

private UUID programId;
private List<UUID> programId;
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
private UUID facilityId;
private List<UUID> orderableIds;
private LocalDate asOfDate;
Expand All @@ -71,14 +71,14 @@ public final class StockCardSummariesV2SearchParams {
*/
public StockCardSummariesV2SearchParams(MultiValueMap<String, String> parameters) {
if (!MapUtils.isEmpty(parameters)) {
this.programId = getId(PROGRAM_ID, parameters);
this.programId = getIds(PROGRAM_ID, parameters);
this.facilityId = getId(FACILITY_ID, parameters);

if (null == facilityId) {
throw new ValidationMessageException(ERROR_FACILITY_ID_MISSING);
}

if (null == programId) {
if (programId.isEmpty()) {
throw new ValidationMessageException(ERROR_PROGRAM_ID_MISSING);
}

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/openlmis/stockmanagement/service/StockEventProcessContextBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,16 +214,16 @@ public StockEventProcessContext buildContext(StockEventDto eventDto) {

profiler.start("CREATE_LAZY_SOURCES");
Supplier<List<ValidSourceAssignment>> sourcesSupplier = () -> validSourceAssignmentRepository
.findByProgramIdAndFacilityTypeId(
eventDto.getProgramId(), context.getFacilityTypeId(), Pageable.unpaged());
.findByProgramIdAndFacilityTypeId(eventDto.getProgramId(),
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
context.getFacilityTypeId(), Pageable.unpaged());
LazyList<ValidSourceAssignment> sources = new LazyList<>(sourcesSupplier);
context.setSources(sources);

profiler.start("CREATE_LAZY_DESTINATIONS");
Supplier<List<ValidDestinationAssignment>> destinationsSupplier = () ->
validDestinationAssignmentRepository
.findByProgramIdAndFacilityTypeId(
eventDto.getProgramId(), context.getFacilityTypeId(), Pageable.unpaged());
Supplier<List<ValidDestinationAssignment>> destinationsSupplier =
() -> validDestinationAssignmentRepository
.findByProgramIdAndFacilityTypeId(eventDto.getProgramId(),
context.getFacilityTypeId(), Pageable.unpaged());
LazyList<ValidDestinationAssignment> destinations = new LazyList<>(destinationsSupplier);
context.setDestinations(destinations);

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/openlmis/stockmanagement/service/ValidDestinationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static org.openlmis.stockmanagement.i18n.MessageKeys.ERROR_DESTINATION_NOT_FOUND;
import static org.slf4j.ext.XLoggerFactory.getXLogger;

import java.util.Set;
import java.util.UUID;
import org.openlmis.stockmanagement.domain.sourcedestination.ValidDestinationAssignment;
import org.openlmis.stockmanagement.dto.ValidSourceDestinationDto;
Expand Down Expand Up @@ -47,7 +48,7 @@ public class ValidDestinationService extends SourceDestinationBaseService {
* @param pageable pagination and sorting parameters
* @return valid source assignment DTOs
*/
public Page<ValidSourceDestinationDto> findDestinations(UUID programId,
public Page<ValidSourceDestinationDto> findDestinations(Set<UUID> programId,
sradziszewski marked this conversation as resolved.
Show resolved Hide resolved
UUID facilityId,
boolean includeDisabled,
Pageable pageable) {
Expand Down
Loading
Loading