Skip to content

Commit

Permalink
Lastlogin fix 1 (#712)
Browse files Browse the repository at this point in the history
* MOSIP-25514 Fixed null pointer exception in event enum. (#648)

* MOSIP-25514 Fixed build failure. (#649)

* MOSIP-25514 Fixed null pointer exception in event enum.

* MOSIP-25514 Fixed build failure.

* MOSIP-25514 imported correct package in main class.

* Merge develop 2 1201b2 4 (#651)

* [MOSIP-22639] Resolved security hotspots in code (#605)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* MOSIP-24939 Improved code coverage. (#604)

* MOSIP-24939 Improved code coverage of utility.

* MOSIP-24939 Changed hard coded value from properties.

* MOSIP-24939 Improved code coverage of RequestValidator

* MOSIP-24939 Fixed test case failure.

* MOSIP-24939 Changed code as per review comment.

* Mosip 24879 add event id in the response of the below stories (#606)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-24939 Improved code coverage of validator class. (#607)

* MOSIP-24939 Improved code coverage of Document validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* Fixed service history issue. (#609)

* [MOSIP-24630] Fixed Security Vulnerability in code (#608)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* updated PR

* email and phone added in profile info (#610)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

Co-authored-by: Neha Farheen <[email protected]>

* identity/info API method changed to get photo (#611)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

Co-authored-by: Neha Farheen <[email protected]>

* added masked VID  (#612)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

Co-authored-by: Neha Farheen <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#613)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#614)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-25310 MOSIP-24730 MOSIP-25312 MOSIP-24731 Added grievance api (#615)

* Fixed service history issue.

* MOSIP-25310 Added resident_grievance_ticket.sql

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added service class of GrievanceController

* MOSIP-25310 Added entity and repository class of grievance table.

* MOSIP-25310 Added status in resident entity.

* MOSIP-25310 Fixed test case failure.

* MOSIP-25310 Get default name from profile.

* MOSIP-25310 Added card format to vid card.

* MOSIP-25310 made message max length configurable.

* MOSIP-25307 Created API  to get DocumentType from masterdata (#617)

* MOSIP-25307 Created API  to get DocumentType from masterdata

* JUNIT added for document API

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24784 Fixed download card api. (#619)

* Fixed service history issue.

* MOSIP-24784 Fixed download card api.

* Mosip 24879 add event id in the response of the below stories (#618)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#620)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 25307 api create the following proxy ap is from masterdata (#621)

* MOSIP-25307 Created API  to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-22046 change input LocalDateTime to LocalDate. (#622)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api. (#623)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api.

* Mosip 24879 add event id in the response of the below stories (#625)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-21674 Added custom response for download card api. (#624)

* Fixed service history issue.

* MOSIP-21674 Added getRidStatus method in utility.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* Revert "MOSIP-21674 Added junit for GrievanceServiceImpl."

This reverts commit a23e63350c411204694f9fd0d7b3322ad953793d.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* MOSIP-21674 Fixed getRidStatus Utilities.

* MOSIP-21674 Added custom response.

* MOSIP-21674 Fixed service history.

* MOSIP-21674 Added junit for RequestValidatorTest

* MOSIP-21674 Added junit for RequestValidatorTest

* MOSIP-21674 Added junit for GrievanceServiceImpl

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Removed un-necessary enums.

* MOSIP-21674 Refactor code.

* MOSIP-21674 Refactor code.

* MOSIP-21674 Refactor code.

* Mosip 24879 add event id in the response of the below stories (#627)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

* updated the response of update my uin API

* added else statement

* added else exception

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in id and version (#626)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* updated PR

* [MOSIP-24670] Made corrections in  id and version

* resolved conflicts

* updated PR

* updated PR

* MOSIP-24939 Improved code coverage. (#628)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api. (#629)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api.

* added get status of individual id api.

* added get status of individual id api.

* Mosip 21147 Upload document changes done (#630)

* MOSIP-25307 Created API  to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

* Upload document changes done

* Changes in validaton

* JUNIT fixed

* Catch clause removed

Co-authored-by: Neha Farheen <[email protected]>

* changes done (#631)

Co-authored-by: Ritik Jain <[email protected]>

* refactored-for-auth-adapter-changes (#632)

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25274 changes done (#616)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Fixed sonar bug. (#633)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage. (#634)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* Changes in identityserviceImpl to check UIN (#635)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

* changes in identityServiceimpl to check UIN

* Junit fixed

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Improved code coverage. (#636)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue. (#637)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue.

* MOSIP-24939 Fixed aid otp issue.

* MOSIP-24939 Fixed test case failure.

* updated id version for document APIs (#638)

* updated id version for document APIs

* fixed version and response msg

* fixed version for update uin API

* removed extra variable

* added junit

Co-authored-by: Ritik Jain <[email protected]>

* Handle client exception from auth codeflow proxy apis (#640)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Fixed placeholder issue. (#641)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* Refactored for auth adapter changes (#642)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

* Added flab based jwt verification of userinfo

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Performed null check for purpose. (#643)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value. (#644)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* removed idtype (#646)

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in API body, response code (#639)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* updated PR

* [MOSIP-24670] Made corrections in  id and version

* resolved conflicts

* updated PR

* updated PR

* [MOSIP-24670] Made corrections n API body, response code

* updated PR

* updated PR

* updated dateTime

* updated PR

* MOSIP-25438 increased ref_id column value in otp_transaction.sql. (#647)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* MOSIP-25438 increased ref_id column value in otp_transaction.sql.

* Merge 1201b2 to develop (#650)

* MOSIP-25514 Fixed null pointer exception in event enum. (#648)

* MOSIP-25514 Fixed build failure. (#649)

* MOSIP-25514 Fixed null pointer exception in event enum.

* MOSIP-25514 Fixed build failure.

* MOSIP-25514 imported correct package in main class.

* Import organization

Co-authored-by: kameshsr <[email protected]>
Co-authored-by: Loganathan Sekar <[email protected]>

* import fixes. fixes to get name, image from userinfo

Co-authored-by: Aiham Hasan <[email protected]>
Co-authored-by: kameshsr <[email protected]>
Co-authored-by: RitikJain4108 <[email protected]>
Co-authored-by: Ritik Jain <[email protected]>
Co-authored-by: Neha2365 <[email protected]>
Co-authored-by: Neha Farheen <[email protected]>
Co-authored-by: Loganathan Sekar <[email protected]>

* Merge develop to 1201b2 6 (#654)

* [MOSIP-22639] Resolved security hotspots in code (#605)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* MOSIP-24939 Improved code coverage. (#604)

* MOSIP-24939 Improved code coverage of utility.

* MOSIP-24939 Changed hard coded value from properties.

* MOSIP-24939 Improved code coverage of RequestValidator

* MOSIP-24939 Fixed test case failure.

* MOSIP-24939 Changed code as per review comment.

* Mosip 24879 add event id in the response of the below stories (#606)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-24939 Improved code coverage of validator class. (#607)

* MOSIP-24939 Improved code coverage of Document validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* Fixed service history issue. (#609)

* [MOSIP-24630] Fixed Security Vulnerability in code (#608)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* updated PR

* email and phone added in profile info (#610)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

Co-authored-by: Neha Farheen <[email protected]>

* identity/info API method changed to get photo (#611)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

Co-authored-by: Neha Farheen <[email protected]>

* added masked VID  (#612)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

Co-authored-by: Neha Farheen <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#613)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#614)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-25310 MOSIP-24730 MOSIP-25312 MOSIP-24731 Added grievance api (#615)

* Fixed service history issue.

* MOSIP-25310 Added resident_grievance_ticket.sql

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added service class of GrievanceController

* MOSIP-25310 Added entity and repository class of grievance table.

* MOSIP-25310 Added status in resident entity.

* MOSIP-25310 Fixed test case failure.

* MOSIP-25310 Get default name from profile.

* MOSIP-25310 Added card format to vid card.

* MOSIP-25310 made message max length configurable.

* MOSIP-25307 Created API  to get DocumentType from masterdata (#617)

* MOSIP-25307 Created API  to get DocumentType from masterdata

* JUNIT added for document API

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24784 Fixed download card api. (#619)

* Fixed service history issue.

* MOSIP-24784 Fixed download card api.

* Mosip 24879 add event id in the response of the below stories (#618)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#620)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 25307 api create the following proxy ap is from masterdata (#621)

* MOSIP-25307 Created API  to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-22046 change input LocalDateTime to LocalDate. (#622)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api. (#623)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api.

* Mosip 24879 add event id in the response of the below stories (#625)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-21674 Added custom response for download card api. (#624)

* Fixed service history issue.

* MOSIP-21674 Added getRidStatus method in utility.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* Revert "MOSIP-21674 Added junit for GrievanceServiceImpl."

This reverts commit a23e63350c411204694f9fd0d7b3322ad953793d.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* MOSIP-21674 Fixed getRidStatus Utilities.

* MOSIP-21674 Added custom response.

* MOSIP-21674 Fixed service history.

* MOSIP-21674 Added junit for RequestValidatorTest

* MOSIP-21674 Added junit for RequestValidatorTest

* MOSIP-21674 Added junit for GrievanceServiceImpl

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Removed un-necessary enums.

* MOSIP-21674 Refactor code.

* MOSIP-21674 Refactor code.

* MOSIP-21674 Refactor code.

* Mosip 24879 add event id in the response of the below stories (#627)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

* updated the response of update my uin API

* added else statement

* added else exception

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in id and version (#626)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* updated PR

* [MOSIP-24670] Made corrections in  id and version

* resolved conflicts

* updated PR

* updated PR

* MOSIP-24939 Improved code coverage. (#628)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api. (#629)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api.

* added get status of individual id api.

* added get status of individual id api.

* Mosip 21147 Upload document changes done (#630)

* MOSIP-25307 Created API  to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

* Upload document changes done

* Changes in validaton

* JUNIT fixed

* Catch clause removed

Co-authored-by: Neha Farheen <[email protected]>

* changes done (#631)

Co-authored-by: Ritik Jain <[email protected]>

* refactored-for-auth-adapter-changes (#632)

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25274 changes done (#616)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Fixed sonar bug. (#633)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage. (#634)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* Changes in identityserviceImpl to check UIN (#635)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

* changes in identityServiceimpl to check UIN

* Junit fixed

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Improved code coverage. (#636)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue. (#637)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue.

* MOSIP-24939 Fixed aid otp issue.

* MOSIP-24939 Fixed test case failure.

* updated id version for document APIs (#638)

* updated id version for document APIs

* fixed version and response msg

* fixed version for update uin API

* removed extra variable

* added junit

Co-authored-by: Ritik Jain <[email protected]>

* Handle client exception from auth codeflow proxy apis (#640)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Fixed placeholder issue. (#641)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* Refactored for auth adapter changes (#642)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

* Added flab based jwt verification of userinfo

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Performed null check for purpose. (#643)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value. (#644)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* removed idtype (#646)

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in API body, response code (#639)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* updated PR

* [MOSIP-24670] Made corrections in  id and version

* resolved conflicts

* updated PR

* updated PR

* [MOSIP-24670] Made corrections n API body, response code

* updated PR

* updated PR

* updated dateTime

* updated PR

* MOSIP-25438 increased ref_id column value in otp_transaction.sql. (#647)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* MOSIP-25438 increased ref_id column value in otp_transaction.sql.

* Merge 1201b2 to develop (#650)

* MOSIP-25514 Fixed null pointer exception in event enum. (#648)

* MOSIP-25514 Fixed build failure. (#649)

* MOSIP-25514 Fixed null pointer exception in event enum.

* MOSIP-25514 Fixed build failure.

* MOSIP-25514 imported correct package in main class.

* Import organization

Co-authored-by: kameshsr <[email protected]>
Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-24372 Fixed update my data api jpa issue. (#653)

* Fixed service history issue.

* MOSIP-24372 Fixed update my data api jpa issue.

* Mosip 25364 resident api we are able to request card of a vid of a different user that is not logged in (#652)

* checking logged in user with given vid

* fixed juit test cases

* removed else throw exception

Co-authored-by: Ritik Jain <[email protected]>

Co-authored-by: Aiham Hasan <[email protected]>
Co-authored-by: kameshsr <[email protected]>
Co-authored-by: RitikJain4108 <[email protected]>
Co-authored-by: Ritik Jain <[email protected]>
Co-authored-by: Neha2365 <[email protected]>
Co-authored-by: Neha Farheen <[email protected]>
Co-authored-by: Loganathan Sekar <[email protected]>

* Merge develop to 1201b2 7 (#655)

* [MOSIP-22639] Resolved security hotspots in code (#605)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* MOSIP-24939 Improved code coverage. (#604)

* MOSIP-24939 Improved code coverage of utility.

* MOSIP-24939 Changed hard coded value from properties.

* MOSIP-24939 Improved code coverage of RequestValidator

* MOSIP-24939 Fixed test case failure.

* MOSIP-24939 Changed code as per review comment.

* Mosip 24879 add event id in the response of the below stories (#606)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-24939 Improved code coverage of validator class. (#607)

* MOSIP-24939 Improved code coverage of Document validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* MOSIP-24939 Improved code coverage of Request validator.

* Fixed service history issue. (#609)

* [MOSIP-24630] Fixed Security Vulnerability in code (#608)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* updated PR

* email and phone added in profile info (#610)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

Co-authored-by: Neha Farheen <[email protected]>

* identity/info API method changed to get photo (#611)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

Co-authored-by: Neha Farheen <[email protected]>

* added masked VID  (#612)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

Co-authored-by: Neha Farheen <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#613)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#614)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-25310 MOSIP-24730 MOSIP-25312 MOSIP-24731 Added grievance api (#615)

* Fixed service history issue.

* MOSIP-25310 Added resident_grievance_ticket.sql

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added service class of GrievanceController

* MOSIP-25310 Added entity and repository class of grievance table.

* MOSIP-25310 Added status in resident entity.

* MOSIP-25310 Fixed test case failure.

* MOSIP-25310 Get default name from profile.

* MOSIP-25310 Added card format to vid card.

* MOSIP-25310 made message max length configurable.

* MOSIP-25307 Created API  to get DocumentType from masterdata (#617)

* MOSIP-25307 Created API  to get DocumentType from masterdata

* JUNIT added for document API

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24784 Fixed download card api. (#619)

* Fixed service history issue.

* MOSIP-24784 Fixed download card api.

* Mosip 24879 add event id in the response of the below stories (#618)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#620)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 25307 api create the following proxy ap is from masterdata (#621)

* MOSIP-25307 Created API  to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-22046 change input LocalDateTime to LocalDate. (#622)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api. (#623)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api.

* Mosip 24879 add event id in the response of the below stories (#625)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-21674 Added custom response for download card api. (#624)

* Fixed service history issue.

* MOSIP-21674 Added getRidStatus method in utility.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* Revert "MOSIP-21674 Added junit for GrievanceServiceImpl."

This reverts commit a23e63350c411204694f9fd0d7b3322ad953793d.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* MOSIP-21674 Fixed getRidStatus Utilities.

* MOSIP-21674 Added custom response.

* MOSIP-21674 Fixed service history.

* MOSIP-21674 Added junit for RequestValidatorTest

* MOSIP-21674 Added junit for RequestValidatorTest

* MOSIP-21674 Added junit for GrievanceServiceImpl

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Removed un-necessary enums.

* MOSIP-21674 Refactor code.

* MOSIP-21674 Refactor code.

* MOSIP-21674 Refactor code.

* Mosip 24879 add event id in the response of the below stories (#627)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

* updated the response of update my uin API

* added else statement

* added else exception

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in id and version (#626)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* updated PR

* [MOSIP-24670] Made corrections in  id and version

* resolved conflicts

* updated PR

* updated PR

* MOSIP-24939 Improved code coverage. (#628)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api. (#629)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api.

* added get status of individual id api.

* added get status of individual id api.

* Mosip 21147 Upload document changes done (#630)

* MOSIP-25307 Created API  to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

* Upload document changes done

* Changes in validaton

* JUNIT fixed

* Catch clause removed

Co-authored-by: Neha Farheen <[email protected]>

* changes done (#631)

Co-authored-by: Ritik Jain <[email protected]>

* refactored-for-auth-adapter-changes (#632)

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25274 changes done (#616)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Fixed sonar bug. (#633)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage. (#634)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* Changes in identityserviceImpl to check UIN (#635)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

* changes in identityServiceimpl to check UIN

* Junit fixed

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Improved code coverage. (#636)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue. (#637)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue.

* MOSIP-24939 Fixed aid otp issue.

* MOSIP-24939 Fixed test case failure.

* updated id version for document APIs (#638)

* updated id version for document APIs

* fixed version and response msg

* fixed version for update uin API

* removed extra variable

* added junit

Co-authored-by: Ritik Jain <[email protected]>

* Handle client exception from auth codeflow proxy apis (#640)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Fixed placeholder issue. (#641)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* Refactored for auth adapter changes (#642)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

* Added flab based jwt verification of userinfo

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Performed null check for purpose. (#643)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value. (#644)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* removed idtype (#646)

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in API body, response code (#639)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* updated PR

* [MOSIP-24670] Made corrections in  id and version

* resolved conflicts

* updated PR

* updated PR

* [MOSIP-24670] Made corrections n API body, response code

* updated PR

* updated PR

* updated dateTime

* updated PR

* MOSIP-25438 increased ref_id column value in otp_transaction.sql. (#647)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* MOSIP-25438 increased ref_id column value in otp_transaction.sql.

* Merge 1201b2 to develop (#650)

* MOSIP-25514 Fixed null pointer exception in event enum. (#648)

* MOSIP-25514 Fixed build failure. (#649)

* MOSIP-25514 Fixed null pointer exception in event enum.

* MOSIP-25514 Fixed build failure.

* MOSIP-25514 imported correct package in main class.

* Import organization

Co-authored-by: kameshsr <[email protected]>
Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-24372 Fixed update my data api jpa issue. (#653)

* Fixed service history issue.

* MOSIP-24372 Fixed update my data api jpa issue.

* Mosip 25364 resident api we are able to request card of a vid of a different user that is not logged in (#652)

* checking logged in user with given vid

* fixed juit test cases

* removed else throw exception

Co-authored-by: Ritik Jain <[email protected]>

* return masked attributes (#645)

Co-authored-by: Ritik Jain <[email protected]>

Co-authored-by: Aiham Hasan <[email protected]>
Co-authored-by: kameshsr <[email protected]>
Co-authored-by: RitikJain4108 <[email protected]>
Co-authored-by: Ritik Jain <[email protected]>
Co-authored-by: Neha2365 <[email protected]>
Co-authored-by: Neha Farheen <[email protected]>
Co-authored-by: Loganathan Sekar <[email protected]>

* Move latest code from develop branch to 1.2.0.1-B2 (#680)

* [MOSIP-22639] Resolved security hotspots in code (#605)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated P…
  • Loading branch information
9 people authored Jan 26, 2023
1 parent 87ac3da commit 023c24b
Show file tree
Hide file tree
Showing 20 changed files with 393 additions and 308 deletions.
31 changes: 31 additions & 0 deletions db_release_scripts/mosip_resident/ddl/resident_session.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
-- -------------------------------------------------------------------------------------------------
-- Database Name: mosip_resident
-- Release Version : 1.2.1
-- Purpose : Database scripts for Resident Service DB.
-- Create By : Loganathan Sekar
-- Created Date : Jan-2023
--
-- Modified Date Modified By Comments / Remarks
-- --------------------------------------------------------------------------------------------------
--
-----------------------------------------------------------------------------------------------------

-- This Table is used to save the user actions for the user actions table.

CREATE TABLE resident.resident_session(
session_id character varying(128) NOT NULL,
ida_token character varying(128) NOT NULL,
login_dtimes timestamp,
ip_address character varying(128),
host character varying(128),
machine_type character varying(30),
CONSTRAINT pk_session_id PRIMARY KEY (session_id)
);

COMMENT ON TABLE resident_session IS 'This Table is used to save the user sessions.';
COMMENT ON COLUMN resident_session.session_id IS 'The unique session identifier for each login';
COMMENT ON COLUMN resident_session.ida_token IS 'The unique identifier for each user';
COMMENT ON COLUMN resident_session.login_dtimes IS 'The time when the user last logged in';
COMMENT ON COLUMN resident_session.ip_address IS 'The ip_address of device from which the user logged in';
COMMENT ON COLUMN resident_session.host IS 'The host of the site';
COMMENT ON COLUMN resident_session.machine_type IS 'The OS of device used for accessing the portal/app';
10 changes: 1 addition & 9 deletions db_release_scripts/mosip_resident/ddl/resident_user_actions.sql
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,9 @@
CREATE TABLE resident.resident_user_actions(
ida_token character varying(128) NOT NULL,
last_bell_notif_click_dtimes timestamp,
last_login_dtimes timestamp,
ip_address character varying(128),
host character varying(128),
machine_type character varying(30),
CONSTRAINT pk_ida_token PRIMARY KEY (ida_token)
);

COMMENT ON TABLE resident_user_actions IS 'This Table is used to save the user actions for the user actions table.';
COMMENT ON TABLE resident_user_actions IS 'This Table is used to save the user actions';
COMMENT ON COLUMN resident_user_actions.ida_token IS 'The unique identifier for each user';
COMMENT ON COLUMN resident_user_actions.last_bell_notif_click_dtimes IS 'The time when the user last clicked on the bell notification';
COMMENT ON COLUMN resident_user_actions.last_login_dtimes IS 'The time when the user last logged in';
COMMENT ON COLUMN resident_user_actions.ip_address IS 'The ip_address of device from which the user logged in';
COMMENT ON COLUMN resident_user_actions.host IS 'The host of the site';
COMMENT ON COLUMN resident_user_actions.machine_type IS 'The OS of device used for accessing the portal/app';
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@
\ir ddl/resident_transaction.sql
\ir ddl/resident_grievance_ticket.sql
\ir ddl/resident_user_actions.sql
\ir ddl/resident_sessions.sql
-----------------------------------------------------------------------------------------------------
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@

DROP TABLE IF EXISTS resident.otp_transaction;
DROP TABLE IF EXISTS resident.resident_transaction;
DROP TABLE IF EXISTS resident.resident_session;
DROP TABLE IF EXISTS resident.resident_user_actions;

-----------------------------------------------------------------------------------------------------
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import io.mosip.resident.exception.ApisResourceAccessException;
import io.mosip.resident.exception.ResidentServiceCheckedException;
import org.aspectj.lang.annotation.After;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -19,8 +17,10 @@
import io.mosip.kernel.core.logger.spi.Logger;
import io.mosip.kernel.core.util.DateUtils;
import io.mosip.resident.config.LoggerConfiguration;
import io.mosip.resident.entity.ResidentUserEntity;
import io.mosip.resident.repository.ResidentUserRepository;
import io.mosip.resident.entity.ResidentSessionEntity;
import io.mosip.resident.exception.ApisResourceAccessException;
import io.mosip.resident.exception.ResidentServiceCheckedException;
import io.mosip.resident.repository.ResidentSessionRepository;
import io.mosip.resident.service.impl.IdentityServiceImpl;
import io.mosip.resident.util.Utility;

Expand All @@ -45,7 +45,7 @@ public class LoginCheck {
private static final CharSequence AUTHORIZATION_TOKEN = "Authorization";

@Autowired
private ResidentUserRepository residentUserRepository;
private ResidentSessionRepository residentSessionRepository;

@Autowired
private IdentityServiceImpl identityServiceImpl;
Expand All @@ -60,25 +60,23 @@ public void getUserDetails(String redirectURI, String state, String sessionState
HttpServletRequest req, HttpServletResponse res) throws ResidentServiceCheckedException, ApisResourceAccessException {
logger.debug("LoginCheck::getUserDetails()::entry");
String idaToken = "";
String sessionId = "";
Collection<String> cookies = res.getHeaders(SET_COOKIE);
for (String cookie : cookies) {
if (cookie.contains(AUTHORIZATION_TOKEN)) {
Optional<String> authorizationCookie = getCookieValueFromHeader(cookie);
if (authorizationCookie.isPresent()) {
idaToken = identityServiceImpl.getResidentIdaTokenFromAccessToken(authorizationCookie.get());
sessionId = identityServiceImpl.createSessionId();
}
break;
}
}

if(idaToken!=null && !idaToken.isEmpty()) {
Optional<ResidentUserEntity> userData = residentUserRepository.findById(idaToken);
if (userData.isPresent()) {
residentUserRepository.updateUserData(idaToken, DateUtils.getUTCCurrentDateTime(), utility.getClientIp(req),
req.getRemoteHost(), getMachineType(req));
} else {
residentUserRepository.save(new ResidentUserEntity(idaToken, DateUtils.getUTCCurrentDateTime(),
utility.getClientIp(req), req.getRemoteHost(), getMachineType(req)));
}
if(idaToken!=null && !idaToken.isEmpty() && sessionId != null && !sessionId.isEmpty()) {
ResidentSessionEntity newSessionData = new ResidentSessionEntity(sessionId, idaToken, DateUtils.getUTCCurrentDateTime(),
utility.getClientIp(req), req.getRemoteHost(), getMachineType(req));
residentSessionRepository.save(newSessionData);
}
logger.debug("LoginCheck::getUserDetails()::exit");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ private ResidentConstants() {
public static final String SIGN_PDF_REFERENCE_ID = "mosip.resident.sign.pdf.reference.id";

public static final String AUTHENTICATION_MODE_CLAIM_NAME = "mosip.resident.access_token.auth_mode.claim-name";
public static final String SUBJECT_CLAIM_NAME = "mosip.resident.access_token.subject.claim-name";

public static final String MOSIP_RESIDENT_DOWNLOAD_PERSONALIZED_CARD_ID = "mosip.resident.download.personalized.card.id";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -550,8 +550,8 @@ public ResponseWrapper<UnreadNotificationDto> notificationCount()
public ResponseWrapper<BellNotificationDto> bellClickdttimes()
throws ResidentServiceCheckedException, ApisResourceAccessException {
logger.debug("ResidentController::getnotificationclickdttimes()::entry");
String individualId = identityServiceImpl.getResidentIdaToken();
ResponseWrapper<BellNotificationDto> response = residentService.getbellClickdttimes(individualId);
String idaToken = identityServiceImpl.getResidentIdaToken();
ResponseWrapper<BellNotificationDto> response = residentService.getbellClickdttimes(idaToken);
logger.debug("ResidentController::getnotificationclickdttimes::exit");
return response;
}
Expand All @@ -565,30 +565,30 @@ public ResponseWrapper<BellNotificationDto> bellClickdttimes()
@ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))), })
public int bellupdateClickdttimes() throws ResidentServiceCheckedException, ApisResourceAccessException {
logger.debug("ResidentController::updatedttime()::entry");
String individualId = identityServiceImpl.getResidentIdaToken();
int response = residentService.updatebellClickdttimes(individualId);
String idaToken = identityServiceImpl.getResidentIdaToken();
int response = residentService.updatebellClickdttimes(idaToken);
logger.debug("ResidentController::updatedttime()::exit");
return response;
}

@ResponseFilter
@PreAuthorize("@scopeValidator.hasAllScopes(" + "@authorizedScopes.getGetUnreadServiceList()" + ")")
@GetMapping("/unread/service-list")
@GetMapping("/notification/service-list")
@Operation(summary = "get", description = "Get unread-service-list", tags = { "resident-controller" })
@ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OK"),
@ApiResponse(responseCode = "201", description = "Created", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })

public ResponseWrapper<List<UnreadServiceNotificationDto>> unreadServiceNotification()
public ResponseWrapper<List<UnreadServiceNotificationDto>> notificationServiceNotification()
throws ResidentServiceCheckedException, ApisResourceAccessException {
logger.debug("ResidentController::getunreadServiceList()::entry");
String Id = identityServiceImpl.getResidentIdaToken();
ResponseWrapper<List<UnreadServiceNotificationDto>> unreadServiceNotificationDtoList = residentService
.getUnreadnotifylist(Id);
ResponseWrapper<List<UnreadServiceNotificationDto>> notificationDtoList = residentService
.getNotificationList(Id);
logger.debug("ResidentController::getunreadServiceList()::exit");
return unreadServiceNotificationDtoList;
return notificationDtoList;
}

@GetMapping(path = "/download/service-history")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class ServiceHistoryResponseDto {
private String eventStatus;
private String timeStamp;
private String serviceType;
private String pinnedStatus;
private boolean pinnedStatus;
private boolean readStatus;
private int serialNumber;
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ public class UserInfoDto {

private LocalDateTime lastLogin;

private String ip;

private String host;

private String machineType;

private Map<String, Object> photo;

private String email;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package io.mosip.resident.entity;

import java.time.LocalDateTime;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;

import lombok.Data;
import lombok.NoArgsConstructor;

/**
* This entity class defines the database table details for
* resident_user_actions table.
*
* @author Neha Farheen
* @since 1.2.0.1
*
*/
@Data
@Table(name = "resident_session", schema = "resident")
@Entity
@NoArgsConstructor

public class ResidentSessionEntity {
@Id
@Column(name = "session_id")
private String sessionId;

@Column(name = "ida_token")
private String idaToken;

@Column(name = "login_dtimes")
private LocalDateTime loginDtimes;

@Column(name = "ip_address")
private String ipAddress;

@Column(name = "host")
private String host;

@Column(name = "machine_type")
private String machineType;

public ResidentSessionEntity(String sessionId, String idaToken, LocalDateTime loginDtimes,
String ipAddress, String host, String machineType) {
this.sessionId = sessionId;
this.idaToken = idaToken;
this.loginDtimes = loginDtimes;
this.ipAddress = ipAddress;
this.host = host;
this.machineType = machineType;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import javax.persistence.Id;
import javax.persistence.Table;

import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

Expand All @@ -22,7 +21,6 @@
@Data
@Table(name = "resident_user_actions", schema = "resident")
@Entity
@Builder
@NoArgsConstructor

public class ResidentUserEntity {
Expand All @@ -33,48 +31,8 @@ public class ResidentUserEntity {
@Column(name = "last_bell_notif_click_dtimes")
private LocalDateTime lastbellnotifDtimes;

@Column(name = "last_login_dtimes")
private LocalDateTime lastloginDtime;

@Column(name = "ip_address")
private String ipAddress;

@Column(name = "host")
private String host;

@Column(name = "machine_type")
private String machineType;

/**
* The constructor used in retrieval of the specific fields.
*
* @param idaToken
* @param lastbellnotifDtimes
* @param lastloginDtime
*
*/
public ResidentUserEntity(String idaToken, LocalDateTime lastbellnotifDtimes, LocalDateTime lastloginDtime) {
this.idaToken = idaToken;
public ResidentUserEntity(String idaToken, LocalDateTime lastbellnotifDtimes) {
this.lastbellnotifDtimes = lastbellnotifDtimes;
this.lastloginDtime = lastloginDtime;

}

public ResidentUserEntity(String idaToken, LocalDateTime lastloginDtime, String ipAddress, String host, String machineType) {
this.idaToken = idaToken;
this.lastloginDtime = lastloginDtime;
this.ipAddress = ipAddress;
this.host = host;
this.machineType = machineType;
}

public ResidentUserEntity(String idaToken, LocalDateTime lastbellnotifDtimes, LocalDateTime lastloginDtime,
String ipAddress, String host, String machineType) {
this.idaToken = idaToken;
this.lastbellnotifDtimes = lastbellnotifDtimes;
this.lastloginDtime = lastloginDtime;
this.ipAddress = ipAddress;
this.host = host;
this.machineType = machineType;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package io.mosip.resident.repository;

import java.util.List;
import java.util.Optional;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;

import io.mosip.resident.entity.ResidentSessionEntity;

/**
* The Interface ResidentUserRepository.
*
* @author Neha Farheen
* @since 1.2.0.1
*/
@Transactional
@Repository
public interface ResidentSessionRepository extends JpaRepository<ResidentSessionEntity, String> {
Optional<ResidentSessionEntity> findById(String id);

List<ResidentSessionEntity> findFirst2ByIdaTokenOrderByLoginDtimesDesc(String idaToken);

Optional<ResidentSessionEntity> findFirstByIdaTokenOrderByLoginDtimesDesc(String idaToken);
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ List<ResidentTransactionEntity> findByTokenWithoutServiceTypeAndDate(@Param("tok
@Query(value = "SELECT COUNT(*) from ResidentTransactionEntity where tokenId=:tokenId AND read_status='false' and requestTypeCode in (:requestTypes)")
Long countByIdAndUnreadStatusForRequestTypes(@Param("tokenId") String tokenId, @Param("requestTypes") List<String> requestTypes);

@Query(value = "SELECT COUNT(*) from ResidentTransactionEntity where tokenId=:tokenId AND crDtimes>= :lastLoginTime AND read_status='false' AND requestTypeCode in (:requestTypes)")
Long countByIdAndUnreadStatusForRequestTypesAfterNotificationClick(@Param("tokenId") String tokenId,@Param("lastLoginTime") LocalDateTime lastLoginTime, @Param("requestTypes") List<String> requestTypes);
@Query(value = "SELECT COUNT(*) from ResidentTransactionEntity where tokenId=:tokenId AND crDtimes>= :notificationClickTime AND read_status='false' AND requestTypeCode in (:requestTypes)")
Long countByIdAndUnreadStatusForRequestTypesAfterNotificationClick(@Param("tokenId") String tokenId,@Param("notificationClickTime") LocalDateTime notificationClickTime, @Param("requestTypes") List<String> requestTypes);

@Query(value = "Select new ResidentTransactionEntity(eventId, requestSummary, statusCode,requestDtimes,requestTypeCode) "
+ "from ResidentTransactionEntity where tokenId=:tokenId AND read_status='false' and requestTypeCode in (:requestTypes)")
Expand Down
Loading

0 comments on commit 023c24b

Please sign in to comment.