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

Hcmpre 639 shashwat changes #919

Merged
merged 6 commits into from
Sep 30, 2024
Merged

Hcmpre 639 shashwat changes #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46ad540
Removed the project facility mapping validation check as it is not re…
Shashwat12-egov Sep 24, 2024
eada27e
Merge pull request #901 from Shashwat12-egov/hcmpre-639-facility-vali…
kanishq-egov Sep 24, 2024
f9da245
Removed the project facilty valaidation check in ValidatorUtil.java
Shashwat12-egov Sep 26, 2024
4fa8feb
Merge pull request #915 from Shashwat12-egov/hcmpre-639-facility-vali…
kanishq-egov Sep 26, 2024
2b847ac
Removed the local receiverId in ValidatorUtil.java
Shashwat12-egov Sep 30, 2024
a046454
Merge pull request #925 from Shashwat12-egov/hcmpre-639-facility-vali…
kanishq-egov Sep 30, 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
3 changes: 0 additions & 3 deletions health-services/stock/src/main/java/org/egov/stock/service/FacilityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ public <T> Map<String, List<String>> validateProjectFacilityMappings(List<T> ent
if (SenderReceiverType.WAREHOUSE.equals(stock.getSenderType())) {
facilityIds.add(stock.getSenderId());
}
if (SenderReceiverType.WAREHOUSE.equals(stock.getReceiverType())) {
facilityIds.add(stock.getReceiverId());
}
}
}

Expand Down
6 changes: 1 addition & 5 deletions health-services/stock/src/main/java/org/egov/stock/util/ValidatorUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,19 +266,15 @@ private static <T> void enrichErrorForStock(List<Stock> validEntities,
for (Stock stock : validEntities) {

String senderId = stock.getSenderId();
String receiverId = stock.getReceiverId();

List<String> facilityIds = ProjectFacilityMappingOfIds.get(stock.getReferenceId());
if (!CollectionUtils.isEmpty(facilityIds)) {

if (SenderReceiverType.WAREHOUSE.equals(stock.getSenderType()) && !facilityIds.contains(senderId)) {
populateErrorForStock(stock, senderId, errorDetailsMap);
}

if (SenderReceiverType.WAREHOUSE.equals(stock.getReceiverType()) && !facilityIds.contains(receiverId))
populateErrorForStock(stock, receiverId, errorDetailsMap);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

remove receiverId local property as it is not being used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

cc: @Shashwat12-egov

} else {
populateErrorForStock(stock, senderId + " and " + receiverId, errorDetailsMap);
populateErrorForStock(stock, senderId, errorDetailsMap);
}
}
}
Expand Down
Loading