Skip to content

Fix/ben id issue incentive #376

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

Merged
SauravBizbRolly merged 3 commits into from
Oct 13, 2026
Merged

Fix/ben id issue incentive #376

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d432b1c
ben id incentive fix issue
SauravBizbRolly Oct 13, 2026
51f30f5
ben id incentive fix issue
SauravBizbRolly Oct 13, 2026
0d7c1e2
ben id incentive fix issue
SauravBizbRolly Oct 13, 2026
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
74 changes: 67 additions & 7 deletions src/main/java/com/iemr/flw/service/impl/IncentiveServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,16 +267,66 @@ public String getAllIncentivesByUserId(GetBenRequestHandler request) {
.collect(Collectors.toList());

Map<Long, String> benIdToNameMap = new HashMap<>();
if (!benIdsToFetch.isEmpty()) {
List<Object[]> benDetails = beneficiaryRepo.findBenNamesByBenIds(benIdsToFetch);
Map<Long, Long> regIdToBenIdMap = new HashMap<>();

if (benIdsToFetch != null && !benIdsToFetch.isEmpty()) {

// First, fetch names using BeneficiaryId
List<Object[]> benDetails =
beneficiaryRepo.findBenNamesByBenIds(benIdsToFetch);

Set<Long> foundBenIds = new HashSet<>();

for (Object[] row : benDetails) {
Long benId = ((Number) row[0]).longValue();
String first = row[1] != null ? (String) row[1] : "";
String last = row[2] != null ? (String) row[2] : "";

String first = row[1] != null ? row[1].toString() : "";
String last = row[2] != null ? row[2].toString() : "";

benIdToNameMap.put(benId, (first + " " + last).trim());
foundBenIds.add(benId);
}
}

// IDs not found as BeneficiaryId
List<Long> unresolvedIds = benIdsToFetch.stream()
.filter(Objects::nonNull)
.filter(id -> !foundBenIds.contains(id))
.distinct()
.toList();

if (!unresolvedIds.isEmpty()) {

// Resolve BenRegId -> BeneficiaryId
List<Object[]> mappings =
beneficiaryRepo.getBenIdsFromRegIds(unresolvedIds);

Set<Long> resolvedBenIds = new HashSet<>();

for (Object[] row : mappings) {
Long regId = ((Number) row[0]).longValue();
Long benId = ((Number) row[1]).longValue();

regIdToBenIdMap.put(regId, benId);
resolvedBenIds.add(benId);
}

// Fetch names for resolved BeneficiaryIds
if (!resolvedBenIds.isEmpty()) {
List<Object[]> resolvedDetails =
beneficiaryRepo.findBenNamesByBenIds(
new ArrayList<>(resolvedBenIds));

for (Object[] row : resolvedDetails) {
Long benId = ((Number) row[0]).longValue();

String first = row[1] != null ? row[1].toString() : "";
String last = row[2] != null ? row[2].toString() : "";

benIdToNameMap.put(benId, (first + " " + last).trim());
}
}
}
}
// NEW: Bulk fetch verifier (supervisor) roles — replaces N+1 userRepo.getUserRole() calls
// Bulk fetch verifier (supervisor) roles — replaces N+1 userRepo.getUserRole() calls
List<Integer> verifierIds = entities.stream()
Expand All @@ -296,12 +346,22 @@ public String getAllIncentivesByUserId(GetBenRequestHandler request) {
// Map entities to DTOs
List<IncentiveRecordDTO> dtos = entities.stream().map(entry -> {
if (entry.getName() == null) {
if (entry.getBenId() != null && entry.getBenId() > 0) {
String name = benIdToNameMap.getOrDefault(entry.getBenId(), "");
Long originalId = entry.getBenId();

if (originalId != null && originalId > 0) {

Long actualBenId = regIdToBenIdMap.getOrDefault(
originalId, originalId);

String name = benIdToNameMap.getOrDefault(actualBenId, "");

entry.setBenId(actualBenId);
entry.setName(name);

if (isCG) {
entry.setIsEligible(true);
}

} else {
entry.setName("");
}
Expand Down
Loading