Mobile Variable added in getUserDetails api - #242
Merged
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
…rvisor in facilityData Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
SauravBizbRolly
approved these changes
May 19, 2026
vishwab1
added a commit
that referenced
this pull request
Jul 14, 2026
* fix DiseaseControl userId issue * fix DiseaseControl userId issue * fix DiseaseControl userId issue * fix eye checkup get list issue * fix ncd followup incentive issue * fix ncd followup incentive issue * fix ncd followup incentive issue * fix follow up date issue * fix follow up date issue * fix merge issue * fix merge issue * remove is_default_activity * remove is_default_activity * fix index of bound exception * fix approval status issue * fix approval status issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix count issue * fix eye checkup request issue * fix eye checkup request issue * fix eye checkup request issue * fix eye side issue * fix monthly incentive check issue * fix monthly incentive check issue * fix monthly incentive check issue * fix monthly incentive check issue * fix incentive issue * fix incentive issue * fix asha claimed incentive query * fix asha claimed incentive query * fix calculation of incentive * fix calculation of incentive * fix calculation of incentive * fix calculation of incentive * fix calculation of incentive * fix calculation of incentive * fix calculation of incentive * fix calculation of incentive * fix calculation of incentive * fix calculation of incentive * fix calculation of incentive * fix calculation of incentive * fix duplicate incentive for mdsr * fix duplicate incentive for mdsr * fix duplicate incentive for mdsr * fix duplicate incentive for mdsr * fix supervisor name * Client ID and Client Secret Disclosure (#239) * fix: client id and client secert key handle in backend * fix: client id and client secert key handle in backend * fix: remove hardcoded ABHA credentials and prevent local properties from being committed - Remove common_local.properties from git tracking (had hardcoded SBX_001542 client id/secret) - Add common_local.properties to .gitignore to prevent future commits - Add ABHA token config sample entries to common_example.properties Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add facilityData to getUserDetail response based on user role (#240) Add FacilityDataService to build facilityData block (location, facilities, ashaList, totalAshaCount) based on userId and roleName — same logic as login response. ASHA Supervisor gets mapped ashaList, ASHA gets facility + supervisor + peers, CHO/ANM get facilities + ashaList at same facility. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(security): replace extractUsername(token) with DB lookup across FLW-API (#241) All usages of jwtUtil.extractUsername (which reads PII from JWT sub claim) replaced with userRepo.getUserNamedByUserId(jwtUtil.extractUserId(token)). Username is now fetched from DB using userId — token PII not used anywhere in FLW-API. Affects BeneficiaryService, MaternalHealth, DiseaseControl, Campaign, IRSRound, SupervisorDashboard. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add mobile and employeeId to peersAtFacility, ashaList and supervisor in facilityData (#242) Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * incentive chnages for release 3.8.2 * incentive chnages for release 3.8.2 * incentive chnages for release 3.8.2 * incentive chnages for release 3.8.2 * fix incentive issue for production (#243) * fix incentive issue for production * fix incentive issue for production * fix incentive issue for production * fix incentive issue for production * fix incentive issue on cg * fix incentive issue on cg * fix incentive issue on cg * fix incentive issue on cg * fix incentive issue on cg * fix incentive issue on cg * fix incentive * fix incentive * fix incentive * fix incentive * fix incentive * fix incentive issue and api response issue * fix incentive issue and api response issue * add unclaimed incentive count on dashboard * fix incentive issue in 3.8.2 * fix incentive issue in 3.8.2 * fix incentive issue in 3.8.2 * fix TB suspected incentive * Fix incentive for ANC * Fix incentive for ANC * Fix incentive for ANC * Fix incentive for ANC * fix ifa incentive * fix For motivating Female sterilization * fix For motivating Female sterilization * fix incentive for NCD follow up * fix pnc related incentive * fix pnc related incentive * fix IFA incentive logic issue * fix IFA incentive logic issue * fix IFA incentive logic issue * fix IFA incentive logic issue * fix IFA incentive logic issue * fixed malaria followup incentive * fixed malaria followup incentive * fixed malaria followup incentive * get ben details using abha ID * get ben details using abha ID * fix isDeactivate issue * Fix: Handled isDeactivate null values for old data records by defaulting to false. * Fix: Handled isDeactivate null values for old data records by defaulting to false. (#246) * fix motivating couples to maintain at least a two-year gap after marriage before first child * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * fix hbnc related incentive issue * fix hbnc related incentive issue * fix hbnc related incentive issue * fix hbnc related incentive issue * fix hbnc related incentive issue * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * fix incentive for Is Paiucd * add abha govt username and password * add abha govt username and password * add abha govt username and password * fix query issue in userService role * fix query issue in userService role * fix query issue in userService role * fix query issue in userService role * fix query issue in userService role * Fix/query issue in userservicerole (#249) * Fix: Handled isDeactivate null values for old data records by defaulting to false. * fix query issue in userService role * handel duplicate ben record * Fix/status code in ors ifa (#251) * Fix: Handled isDeactivate null values for old data records by defaulting to false. * change status code * change status code * handel duplicate record * handel duplicate record * handel duplicate record * handel duplicate record * handel duplicate record * handel duplicate record * handel duplicate record * handel duplicate record * fix sync issue * fix sync issue * fix sync issue * feature of abha check in our system * feature of abha check in our system * hbyc issue fixed * hbyc issue fixed * hbyc issue fixed * hbyc issue fixed * hbyc issue fixed * hbyc issue fixed * fix internal server error on abha id * fix internal server error on abha id * fix internal server error on abha id * fix internal server error on abha id * fix internal server error on abha id * fix internal server error on abha id * fix sam get api issue * fix date of referral issue * fix date of referral issue * fix date of referral issue * fix date of referral issue * fix hwc referral incentive issue * fix hwc referral incentive issue * fix hwc referral incentive issue * fix hwc referral incentive issue * fix hwc referral incentive issue * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * fix child year gap * fix child year gap * fix child year gap * fix child year gap * fix child year gap * fix child year gap * fix child year gap * fix child year gap * fix duplicate record in child gap incentive * fix duplicate record in child gap incentive * fix duplicate record in child gap incentive * fix duplicate record in child gap incentive * fix duplicate record in child gap incentive * fix duplicate record in child gap incentive * fix hbnc incentive * fix hbnc incentive * fix hbnc incentive * Fix/asha profile image issue (#265) * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix pnc incentive * fix pnc incentive * fix pnc incentive * fix vhnd incentive incentive * fix vhnd incentive incentive * fix vhnd incentive error * fix vhnd incentive error * fix vhnd incentive error * fix vhnd incentive error * fix cluster meeting incentive error * fix cluster meeting incentive error * fix tb incentive * fix slide test incentive * Fix/pb mb incentive issue 3.8.2 (#271) * fix duplicate incentive issue * fix duplicate incentive issue * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix hbyc incentive logic * fix hbyc incentive logic * fix hbyc incentive logic * optmiz query for incentive logic for hbnc * optmiz query for incentive logic for hbnc --------- Co-authored-by: Vishwanath Balkur <118195001+vishwab1@users.noreply.github.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
vishwab1
added a commit
that referenced
this pull request
Jul 28, 2026
* fix duplicate incentive for mdsr * fix duplicate incentive for mdsr * fix duplicate incentive for mdsr * fix duplicate incentive for mdsr * fix supervisor name * Client ID and Client Secret Disclosure (#239) * fix: client id and client secert key handle in backend * fix: client id and client secert key handle in backend * fix: remove hardcoded ABHA credentials and prevent local properties from being committed - Remove common_local.properties from git tracking (had hardcoded SBX_001542 client id/secret) - Add common_local.properties to .gitignore to prevent future commits - Add ABHA token config sample entries to common_example.properties Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add facilityData to getUserDetail response based on user role (#240) Add FacilityDataService to build facilityData block (location, facilities, ashaList, totalAshaCount) based on userId and roleName — same logic as login response. ASHA Supervisor gets mapped ashaList, ASHA gets facility + supervisor + peers, CHO/ANM get facilities + ashaList at same facility. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(security): replace extractUsername(token) with DB lookup across FLW-API (#241) All usages of jwtUtil.extractUsername (which reads PII from JWT sub claim) replaced with userRepo.getUserNamedByUserId(jwtUtil.extractUserId(token)). Username is now fetched from DB using userId — token PII not used anywhere in FLW-API. Affects BeneficiaryService, MaternalHealth, DiseaseControl, Campaign, IRSRound, SupervisorDashboard. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add mobile and employeeId to peersAtFacility, ashaList and supervisor in facilityData (#242) Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> * incentive chnages for release 3.8.2 * incentive chnages for release 3.8.2 * incentive chnages for release 3.8.2 * incentive chnages for release 3.8.2 * fix incentive issue for production (#243) * fix incentive issue for production * fix incentive issue for production * fix incentive issue for production * fix incentive issue for production * fix incentive issue on cg * fix incentive issue on cg * fix incentive issue on cg * fix incentive issue on cg * fix incentive issue on cg * fix incentive issue on cg * fix incentive * fix incentive * fix incentive * fix incentive * fix incentive * fix incentive issue and api response issue * fix incentive issue and api response issue * add unclaimed incentive count on dashboard * fix incentive issue in 3.8.2 * fix incentive issue in 3.8.2 * fix incentive issue in 3.8.2 * fix TB suspected incentive * Fix incentive for ANC * Fix incentive for ANC * Fix incentive for ANC * Fix incentive for ANC * fix ifa incentive * fix For motivating Female sterilization * fix For motivating Female sterilization * fix incentive for NCD follow up * fix pnc related incentive * fix pnc related incentive * fix IFA incentive logic issue * fix IFA incentive logic issue * fix IFA incentive logic issue * fix IFA incentive logic issue * fix IFA incentive logic issue * fixed malaria followup incentive * fixed malaria followup incentive * fixed malaria followup incentive * get ben details using abha ID * get ben details using abha ID * fix isDeactivate issue * Fix: Handled isDeactivate null values for old data records by defaulting to false. * Fix: Handled isDeactivate null values for old data records by defaulting to false. (#246) * fix motivating couples to maintain at least a two-year gap after marriage before first child * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * Motivating 70% women to take iron tablets * fix hbnc related incentive issue * fix hbnc related incentive issue * fix hbnc related incentive issue * fix hbnc related incentive issue * fix hbnc related incentive issue * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * add get bene deatils using nic api * fix incentive for Is Paiucd * add abha govt username and password * add abha govt username and password * add abha govt username and password * fix query issue in userService role * fix query issue in userService role * fix query issue in userService role * fix query issue in userService role * fix query issue in userService role * Fix/query issue in userservicerole (#249) * Fix: Handled isDeactivate null values for old data records by defaulting to false. * fix query issue in userService role * handel duplicate ben record * Fix/status code in ors ifa (#251) * Fix: Handled isDeactivate null values for old data records by defaulting to false. * change status code * change status code * handel duplicate record * handel duplicate record * handel duplicate record * handel duplicate record * handel duplicate record * handel duplicate record * handel duplicate record * handel duplicate record * fix sync issue * fix sync issue * fix sync issue * feature of abha check in our system * feature of abha check in our system * hbyc issue fixed * hbyc issue fixed * hbyc issue fixed * hbyc issue fixed * hbyc issue fixed * hbyc issue fixed * fix internal server error on abha id * fix internal server error on abha id * fix internal server error on abha id * fix internal server error on abha id * fix internal server error on abha id * fix internal server error on abha id * fix sam get api issue * fix date of referral issue * fix date of referral issue * fix date of referral issue * fix date of referral issue * fix hwc referral incentive issue * fix hwc referral incentive issue * fix hwc referral incentive issue * fix hwc referral incentive issue * fix hwc referral incentive issue * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * Incentive logic for first-year child Immunization * fix child year gap * fix child year gap * fix child year gap * fix child year gap * fix child year gap * fix child year gap * fix child year gap * fix child year gap * fix duplicate record in child gap incentive * fix duplicate record in child gap incentive * fix duplicate record in child gap incentive * fix duplicate record in child gap incentive * fix duplicate record in child gap incentive * fix duplicate record in child gap incentive * fix hbnc incentive * fix hbnc incentive * fix hbnc incentive * Fix/asha profile image issue (#265) * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix asha profile image issue * fix pnc incentive * fix pnc incentive * fix pnc incentive * fix vhnd incentive incentive * fix vhnd incentive incentive * fix vhnd incentive error * fix vhnd incentive error * fix vhnd incentive error * fix vhnd incentive error * fix cluster meeting incentive error * fix cluster meeting incentive error * fix tb incentive * fix slide test incentive * Fix/pb mb incentive issue 3.8.2 (#271) * fix duplicate incentive issue * fix duplicate incentive issue * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix child after 2 year gap after marriage * fix hbyc incentive logic * fix hbyc incentive logic * fix hbyc incentive logic * optmiz query for incentive logic for hbnc * optmiz query for incentive logic for hbnc * Implemetation of in app notification * fixed hbnc and leprosy incentive (#290) * fixed hbnc and leprosy incentive (#291) * feature of incentive approval and notification * feature of incentive approval and notification * feature of incentive approval and notification * feature of incentive approval and notification * feature of incentive approval and notification * feature of incentive approval and notification * feature of incentive approval and notification * feature of incentive approval and notification * feature of incentive approval and notification * feature of incentive approval and notification * feature of incentive approval and notification * change base url of notification * change base url of notification * change base url of notification * change base url of notification * change base url of notification * change base url of notification * implement get supervisor id by asha * implement get supervisor id by asha * implement get supervisor id by asha * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix supervisor incentive approval status * fix role issue for supervisor * fix role issue for supervisor * fix role issue for supervisor * fix role issue for supervisor * fix role issue for supervisor * fix role issue for supervisor * fix role issue for supervisor * handel approval of incentive for ANM * handel approval of incentive for ANM * handel approval of incentive for ANM * handel approval of incentive for ANM * handel approval of incentive for ANM * handel approval of incentive for ANM * handel approval of incentive for ANM * handel approval of incentive for ANM * fix incentive new logic changes * fix incentive new logic changes * fix anc incentive logic * fix anc incentive logic * fix anc incentive logic --------- Co-authored-by: Vishwanath Balkur <118195001+vishwab1@users.noreply.github.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📋 Description
JIRA ID: AMM-2301
Please provide a summary of the change and the motivation behind it. Include relevant context and details.
✅ Type of Change
ℹ️ Additional Information
Please describe how the changes were tested, and include any relevant screenshots, logs, or other information that provides additional context.