Skip to content

AMM-118: Expose account lock state in SearchEmployee4#129

Merged
vanitha1822 merged 1 commit into
PSMRI:release-3.6.2from
varundeepsaini:AMM-118-time-based-account-lockout
Apr 15, 2026
Merged

AMM-118: Expose account lock state in SearchEmployee4#129
vanitha1822 merged 1 commit into
PSMRI:release-3.6.2from
varundeepsaini:AMM-118-time-based-account-lockout

Conversation

@varundeepsaini
Copy link
Copy Markdown
Contributor

@varundeepsaini varundeepsaini commented Apr 15, 2026

Part of PSMRI/AMRIT#118

Description

Extends m/SearchEmployee4 so Employee Master receives account lock state for every row when the list loads.

Changes

  • add failed-attempt lock metadata to the employee list response
  • include failedAttempt, lockTimestamp, and lockedDueToFailedAttempts
  • batch-load user lock metadata to avoid one query per listed user
  • keep admin deactivation separate from failed-attempt lock state

Why this shape was required

  • review comments on the UI PR required lock/unlock status to come from SearchEmployee4
  • the UI needs this data on initial load to render the correct Lock/Unlock control for each user

@varundeepsaini varundeepsaini mentioned this pull request Apr 15, 2026
Merged
@varundeepsaini varundeepsaini force-pushed the AMM-118-time-based-account-lockout branch from 25494e0 to e023b71 Compare April 15, 2026 12:40
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented Apr 15, 2026

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@vanitha1822 vanitha1822 merged commit 09b4650 into PSMRI:release-3.6.2 Apr 15, 2026
3 checks passed
vanitha1822 added a commit that referenced this pull request May 21, 2026
@vishwab1 @DurgaPrasad-54
@varundeepsaini @vanitha1822
merge 3.6.2 to release 3.8.1 (#132)
1c6a062 
* Cherry-pick health and version API enhancements to release-3.6.1 (#124)

* feat(health,version): add health and version endponts

* fix(health): add constant and remove duplicates

* fix(health): avoid permanent DEGRADED from historical deadlocks

* fix(health): Removed the unnecessary boolean literal

* fix(health):  Fixed the broken lock-wait detection

* fix(health): avoid blocking DB I/O under write lock and restore interrupt flag

* fix(health): add cancelFutures in healthservice

* fix(health): close basic DB connection before advanced checks and remove shared-map race

* feat: expose account lock state in SearchEmployee4 (#129)

Co-authored-by: Varun Deep Saini <varun.23bcs10048@ms.sst.scaler.com>

* Fix the reset password issue (#131)

* fix: reset password

* fix: build issue

* fix: update the url

* fix: update config properties

* fix: initialize constructor

---------

Co-authored-by: KOPPIREDDY DURGA PRASAD <144464542+DurgaPrasad-54@users.noreply.github.com>
Co-authored-by: Varun Deep Saini <deep.sa@rippling.com>
Co-authored-by: Varun Deep Saini <varun.23bcs10048@ms.sst.scaler.com>
Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com>
vishwab1 added a commit that referenced this pull request May 22, 2026
@vanitha1822 @SauravBizbRolly
@sushant-bizbrolly @drtechie @ravishanigarapu @5Amogh @snehar-nd @vishwab1 @claude @DurgaPrasad-54 @varundeepsaini
Merge Release-3.8.1 to Main (#134)
9c724bf 
* Bulk registration

* Bulk registration

* Bulk registration

* add userName and password in Bulk registration

* add userName and password in Bulk registration

* remove unwanted line

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* Httpheader content disposition changed

* Coderabbitai comments adrressed

* Httpheader content disposition changed (#100)

* Httpheader content disposition changed

* Coderabbitai comments adrressed

* Compile error resolved

* fix code

* Main branch changes missed (#102)

* Feature/signaturerelease (#103)

* Main branch changes missed

* Signature file changed

* Feature/signaturerelease (#104)

* Main branch changes missed

* Signature file changed

* Created new endpoint for Active and DeActive Employee Signature

* coderabbit comments addressed

* Update pom.xml

* Cherry-pick the commits related to 3.5.0 form 3.6.0 (#106)

* Compile error resolved

* fix: cherry pic the #101 pr

* fix: cherry pic the #101 pr

* Main branch changes missed

* fix: cherry pic the #103 pr

* fix: cherry pic the #104 pr

* fix: cherry pic the #104 pr

* fix: cherry pick the #104 pr

* fix code rabbit comments

---------

Co-authored-by: Ravi Shanigarapu <ravi.shanigarapu@wipro.com>

* fix:casesheet signature

* fix:pom file change

* API changes in Signature enhancement for Casesheet (#107)

* fix:casesheet signature

* fix:pom file change

* fix: pom version

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix code

* fix: amm-1927 send headers only if the request is from the allowed origin

* fix: amm-1927 coderabbit fixes

* Update regex handling for localhost URLs

* Enhance regex pattern for URL matching

* fix code

* fix code

* fix vulnerabilitie code

* fix security hotspots

* fixed conflicts

* Add facility hierarchy creation with village and parent-child mapping (#121)

* fix:changed the pom xml

* fix: added facilty type master change

* feat: created facility creation

* fix: rabiit review fix

* fix: rabiit review fix

* fix: rabiit review fix

* fix: pom version

* fix: facility hierarchy and facility type management (#125)

* fix:changed the pom xml

* fix: added facilty type master change

* feat: created facility creation

* feat:added work location

* feat:added work location

* fix: rabiit review fix

* fix: rabiit review fix

* fix: rabiit review fix

* fix: ui chnges

* fix: pom version

* fix: corrections

* fix: facilty hierachy

* fix: facility heirachy

* fix: remove logs folder from repository

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: add logs/ to .gitignore

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Facility hierarchy inventory mapping and store field management (#128)

* fix:changed the pom xml

* fix: added facilty type master change

* feat: created facility creation

* feat:added work location

* feat:added work location

* fix: rabiit review fix

* fix: rabiit review fix

* fix: rabiit review fix

* fix: ui chnges

* fix: pom version

* fix: corrections

* fix: facilty hierachy

* fix: facility heirachy

* fix: item facility mapping and store updates

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: fixed inventory flow

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* merge 3.6.2 to release 3.8.1 (#132)

* Cherry-pick health and version API enhancements to release-3.6.1 (#124)

* feat(health,version): add health and version endponts

* fix(health): add constant and remove duplicates

* fix(health): avoid permanent DEGRADED from historical deadlocks

* fix(health): Removed the unnecessary boolean literal

* fix(health):  Fixed the broken lock-wait detection

* fix(health): avoid blocking DB I/O under write lock and restore interrupt flag

* fix(health): add cancelFutures in healthservice

* fix(health): close basic DB connection before advanced checks and remove shared-map race

* feat: expose account lock state in SearchEmployee4 (#129)

Co-authored-by: Varun Deep Saini <varun.23bcs10048@ms.sst.scaler.com>

* Fix the reset password issue (#131)

* fix: reset password

* fix: build issue

* fix: update the url

* fix: update config properties

* fix: initialize constructor

---------

Co-authored-by: KOPPIREDDY DURGA PRASAD <144464542+DurgaPrasad-54@users.noreply.github.com>
Co-authored-by: Varun Deep Saini <deep.sa@rippling.com>
Co-authored-by: Varun Deep Saini <varun.23bcs10048@ms.sst.scaler.com>
Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com>

---------

Co-authored-by: Saurav Mishra <saurav.mishra@bizbrolly.com>
Co-authored-by: Sushant <77480199+sushant-bizbrolly@users.noreply.github.com>
Co-authored-by: Saurav Mishra <80103738+SauravBizbRolly@users.noreply.github.com>
Co-authored-by: Mithun James <drtechie@users.noreply.github.com>
Co-authored-by: Ravi Shanigarapu <ravi.shanigarapu@wipro.com>
Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com>
Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com>
Co-authored-by: vishwab1 <vishwanath@navadhiti.com>
Co-authored-by: Vishwanath Balkur <118195001+vishwab1@users.noreply.github.com>
Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: KOPPIREDDY DURGA PRASAD <144464542+DurgaPrasad-54@users.noreply.github.com>
Co-authored-by: Varun Deep Saini <deep.sa@rippling.com>
Co-authored-by: Varun Deep Saini <varun.23bcs10048@ms.sst.scaler.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vanitha1822 vanitha1822 vanitha1822 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@varundeepsaini @vanitha1822