SB-21783 Error log changes

* SB-26939:Backward compatibility issue (#965)

* SB-26939:Backward compatibility issue

* Issue #SB-000 feat:merge rel-4.3 to rel-4.4 (#971)

* Issue #SB-000 feat:code refactoring (#972)

* Issue #SB-000 feat:code refactoring

* Log issue fix (#973)


* Issue #SB-000 feat:code refactoring

* SB-26474 Support for multiple Consent Statuses (#974)

* SB-26474 Support for multiple Consent Statuses

* SB-26138  Revoke consent when user migrates from Custodian to State tenant (#975)

* SB-26138 Revoke consent when migrates from Custodian to State tenant

* Issue #SB-000 feat: added request context to Auth Verifier class (#976)

* Issue #SB-000 feat: added request context to Auth Verifier clas

* Issue #SB-000 feat: added request context to Auth Verifier clas

* Issue #SB-000 feat: added request context to Auth Verifier clas

* Issue #SB-000 feat: added request context to Auth Verifier clas

* Issue #SB-000 feat: added request context to Auth Verifier clas

* Issue #SB-000 feat: added request context to Auth Verifier clas

* Issue #SB-000 feat: added request context to Auth Verifier clas

* Issue #SB-000 feat: added request context to Auth Verifier clas

* Issue #SB-000 feat: added request context to Auth Verifier clas

* Issue #SB-000 feat: added request context to Auth Verifier clas

* SB-26640 Ability for users to be able to select multiple sub-roles - api changes (#977)

* SB-26640 Ability for users to be able to select multiple sub-roles - backend changes

* Issue #SB-26822 feat:removed printing email to log (#978)

* Issue #SB-000 feat:removed printing email to log

* SB-27373 All versions of create API is allowing to create users with multiple user-types  (#979)

* SB-27372 All versions of create API is allowing to create users with multiple user-types

* SB-27372 Add test cases

* SB-27372 Fixed test cases

* SB-27415 feat:fixing email subject issue (#980)

* Issue #SB-27415 feat:fixing email subject issue

* SB-27483 : Removed duplicates from userProfileTypes (#982)

* Issue #SB-27483 feat: Removed duplicates from userProfileTypes

* Issue #SB-27483 feat: Removed duplicates from userProfileTypes (#985)

* Issue #SB-27483 feat: Removed duplicates from userProfileTypes

* Issue #SB-27483 feat: Removed duplicates from userProfileTypes

* SB-27483 : Remove userProfiles update from user v2/v1 update API (#986)

* Issue #SB-27483 feat: Removed duplicates from userProfileTypes

* Issue #SB-27483 feat: Removed duplicates from userProfileTypes

* Issue #SB-27483 feat: Removed duplicates from userProfileTypes

* SB-27485 New v3 upadte API is allowing to give subtype for teacher, s… (#987)

* SB-27485 New v3 upadte API is allowing to give subtype for teacher, student and parent

* SB-27485 Fixing testcase issues

* SB-27485 New v3 upadte API is allowing to give subtype for teacher, student and parent (#988)

* SB-27485 New v3 upadte API is allowing to give subtype for teacher, student and parent

* SB-27485 Fixing testcase issues

* SB-27485 New v3 upadte API is allowing to give subtype for teacher, student and parent

* SB-27485 [Update API] New v3 upadte API is allowing to give subtype for teacher, student and parent

* SB-27485 [Update API] New v3 upadte API is allowing to give subtype for teacher, student and parent (#989)

* SB-27485 [Update API] New v3 upadte API is allowing to give subtype for teacher, student and parent

* SB-27641: Revert learner feed service (#990)

* SB-27641: Revert learner feed service #990

Co-authored-by: sknirmalkar89 <59080585+sknirmalkar89@users.noreply.github.com>
Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>

* Issue #SC-2186 feat:Api to fetch user roles by id (#930)

* Issue #SC-2318 feat:refactored User declarations api (#931)

* Issue #SC-2306 feat:refactored search apis (#932)

* Issue #SC-2306 feat:refactored search apis

* Issue #SC-2306 feat:refactored user exist api (#933)

* Issue #SC-2306 feat:refactored user exist api

* Issue #SC-2186 feat:learner chnages for rbac support (#934)

* Issue #SC-2186 feat:learner chnages for rbac support

* Issue #SC-2306 feat: refactored userProfileReadService class (#935)

* Issue #SC-2306 feat: refactored userProfileReadService class

* Sc 2306 getbykey (#936)

* Issue #SC-2306 feat: refactored get User by key and loginid api

* Issue #SC-2302 feat:Refactored Notes API (#937)

* Issue #SC-2302 feat:Refactored Notes API

* Issue #SC-2128 feat: fixed akka configuration (#939)

* Issue #SC-2128 feat: fixed akka configuration

* SB-26259: backward compatibility change for new notification service (#9...

* SC-2299 Renaming service module to controller (#891)

* SC-2299 Renaming service module to controller

* SC-2299 Fixing Testcases

* Sb 25932 Unblock user while resetting password (#892)

* Issue #SB-25932 feat:unblock user while resetting password

* SC-2299 Jenkins file fix (#893)

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Fixing Testcases

* SC-2299 Fixing Testcases

* SC-2299 Fixing Testcases

* Updating jenkins file

* Issue #SB-25932 feat:removed update password call while unblocking user (#894)

* Sb 25932 new2 (#895)

* Issue #SB-25932 feat:removed update password call while unblocking user

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Sb 25932 new2 (#896)

* Issue #SB-25932 feat:removed update password call while unblocking user

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-000 feat:fixing folder structure for play build (#898)

* SC-2299 Restructuring actor-service layer (#897)

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Fixing Testcases

* SC-2299 Fixing Testcases

* SC-2299 Fixing Testcases

* Updating jenkins file

* SC-2299 Actor Service changes

* SC-2299 Actor Service changes

* SC-2299 Actor Service changes

* SC-2299 Actor Service changes

* Fixing imports

* Fixing imports

* Fixing imports

* SC-2299 Resolving import issues

* Fixing imports

* Updating the circle-ci coverage

* Updating the circle-ci coverage

* Updating the circle-ci coverage

* Updating the circle-ci coverage

* Module rename (#899)

* Issue #SB-000 feat:folder/module renamed

* Issue SC-2313 feat:Refactored System Setting API (#902)

* Issue SC-2313 feat:Refactored System Setting API

* Issue #SC-2309 feat:Refactored OTP APIs (#900)

* Issue #SC-2315 feat:Refactored OTP APIs

* Issue #SC-2315 feat:Refactored OTP APIs

* Issue #SC-2315 feat:Refactored OTP APIs

* Issue #SC-2315 feat:Refactored OTP APIs

* Issue #SC-2315 feat:Refactored OTP APIs

* Issue #SB-2315  feat:otp api refactoring

* Issue #SC-2315  feat:otp api refactoring

* Issue #SC-2315  feat:otp api refactoring

* Issue #SC-2315  feat:otp api refactoring

* Issue #SC-2315  feat:otp api refactoring

* Issue #SC-2315  feat:otp api refactoring

* Issue #SC-2315  feat:otp api refactoring

* Issue #SC-2315  feat:otp api refactoring

* Issue #SC-2315  feat:otp api refactoring

* Issue #SC-2315  feat:otp api refactoring

* Issue #SC-2315 feat:Refactored OTP APIS

* Issue #SC-2315 feat:Refactored OTP APIS

* Issue #SC-2315 feat:Added getEmailPhoneByUserId in userservice class

* SC-2301 Feed api refactoring (#904)

* SC-2301 feed api refactoring

* Issue #SC-2309 feat:Refactored notification service (#903)

* Issue #SC-2309 feat:Refactored notification service

* Issue #SC-2309 feat:fixed test cases

* Issue #SC-2309 feat:fixed test cases

* Sc 2303: Refactoring Tenant Preference APIs (#905)

* Issue #SC-2303 feat:Refactored tenant preference apis

* DD-1609 Masked PII data in logs (#909)

* Issue #DD-1609 feat:Masked PII data in logs

* Issue #SC-2311 feat:Refactored UserRole API (#906)

* Issue #SC-2311 feat:Refactored UserRole API

* Issue #SC-2311 feat:Added test case

* Issue #SC-2161 feat:removed quartz scheduler and shadow user related code (#908)

* Issue #SC-2311 feat: Refactored user status api (#911)

* Issue #SC-2311 feat: Refactored user status api

* SC-2299 Refactoring Location Module (#907)

* SC-2299 Refactoring Location Module

* Issue #SC-2318 feat:Refactored Identifier free up api (#914)

* Issue #SC-2318 feat:Refactored Identifier free up api

* Issue #SC-2318 feat:Refactored Password reset api (#913)

* Issue #SC-2318 feat:Refactored Password reset api

* Issue #SC-2318 feat:fixed logging issue while running test cases

* SC-2307 consent related code factoring (#910)

* SC-2307 consent related code factoring

* SC-2300 Organisation module refactoring (#912)

* SC-2300 Organisation module refactoring

* Fixing testcases

Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>

* Issue #SC-2309 feat:Added requestcontext to sms provider methods (#916)

* Issue #SC-2309 feat:Added requestcontext to sms provider methods

* Issue #SC-2309 feat:Added requestcontext to sms provider methods

* Issue #SC-2309 feat:Added requestcontext to sms provider methods

* SB-26289 Org create and update API is failing while updating org location (#917)

* Issue #SB-0000 feat:fixing nic provider issue (#918)

* Issue #SB-0000 feat:fixing nic provider issue

* Issue #SB-0000 feat: notification change

* SB-26327 Onboarding breakdown (#923)

* Issue #SB-000 feat: fixing log issue while unauthorized error (#922)

* Issue #SB-000 feat: fixing log issue while unauthorized error

* Issue #SB-000 feat: added request context to HttpClientUtil class met… (#924)

* Issue #SB-000 feat: added request context to HttpClientUtil class methods

* Issue #SB-26253 feat:Fix bulk sms issue (#925)

* Sb 26253 (#926)

* Issue #SB-26253 feat:Fix bulk sms issue

* Issue #SB-26253 feat:Fix bulk sms issue

Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>
Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* Issue#SC-2206 feat:refactored user apis (#856)

Issue#SC-2206 feat:refactored user apis

* SB-24953 added user-read api v5 (#853)

* SB-24953 Added user-read api v5

* SB-24954 user-search v3 added which contains roles in user entity (#854)

* SB-24954 user-search v3 added which contains roles in user entity

* Issue #SC-2206 feat: refactored user apis (#858)

* SC-2206 UserManagement Refactoring - User create and update APIs (#862)

* Issue SC-2206-new2 feat:Refactored user sso and ssu user apis

* Issue #SC-2206 feat:cache issue fixed (#863)

* SB-23721 Added assign user role API V2 (#865)

* SB-23721 Added assign role Api v2

* Issue #SC-2126 feat:refactored user apis (#864)

* Issue #SC-2126 feat:refactored user apis

* SB-25389 Adding scope to existing role is not working as expected (#866)

* SB-25389 Adding scope to existing role is not working as expected.

* Merging release-4.0.0 fix to release-4.1.0 (#868)

Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>

* SB-25433 (#870)

* Issue #SB-23849 feat:fixed user update api issue

* SB-25389 Removed duplicate scope from request (#873)

* SB-25389 Remove duplicate scope from request

* Issue #SB-25433 feat:fix error msg for empty email & phone (#874)

* SB-25389 Fix for updating ES with user roles (#875)

* SB-23169 draft changes of assign role api
* SB-23169 modified existing assign roles api inorder to support old request changes
* Fixing testcases

* SB-25389 Fixing testcase issues (#877)

* Fixing testcases

* SB-25389 Fixing testcases (#878)

* Fixing testcases

* Issue #SC-2206 feat:fixed create user v4 issue (#879)

* Issue #SC-2206 feat:fixed create user v4 issue

* SB-25314 user-read api changes for roles (#876)

* SB-25314 user-read api changes for roles

* SC-2206 Refactoring user flows (#880)

* Issue #SC-2206 feat:removed duplicate code

* Issue #SB-25439 feat:fixed framework issue (#881)

* Lms restructure (#882)

* adding core module

* SB-25485 fix for search for version v1/v2 roles not popuped when unassociated org added (#883)

* Issue #SC-2185 feat:Project restructuring (#884)

* Issue #SC-2185 feat:Project restructuring

* Issue SC-2167 feat:removed package-info file (#886)

* Assign v1 failing to add existing role when sent for update (#887)

Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>
Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* If user location has already school, update location without school is not working (#857)

* SB-23169 draft changes of assign role api

* SB-23169 modified existing assign roles api inorder to support old request changes

* SB-23169 removed test case

* Merging from 3.9.0 to master (#820) (#829)

merge 3.9 to master

* Issue #SB-23899 feat:added new sms provider (#783)

* Issue #SB-23899 feat:added new sms provider

* Issue #SB-23899 feat:nic sms provider impl

* Issue #SB-22988 feat:fixed jsonKey for associationType (#830)

* Issue #SB-22988 feat:fixed jsonKey for associationType

* SC-2209 Removing phoneverified and email verified flags and updating 'flags value' logic (#811)

* Merge release-3.9.0

* SB-24240 (#807)

* SB-24240 added for better logging

* Sb 24446 (#809)

* Issue #SB-24446 feat:reverted logs for sms issue

* SC-2209 Remove phoneverified and email verified flags and update 'flags value' logic

* SB-24240 added logs (#810)

Fix for SB-24240 form api caching issue

* Update Util.java

* Update UserUtil.java

* SC-2209 Adding testcase for coverage

* SC-2209 Adding testcase for coverage

* SC-2209 Adding testcase for coverage

* Update UserTypeActor.java

* Update UserRequestValidator.java

* Update UserRequestValidator.java

* Update UserManagementActor.java

* Fixing Testcases

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>

* SB-23169 roles save part in ES

* SB-23169 modified existing assign roles api in-order to support request changes (#824)

* SB-23169 modified existing assign roles api inorder to support old request changes

* SB-23169 roles save part in ES

* SB-23171 user-read api changes for roles attribute (#831)

* SB-23169 modified existing assign roles api inorder to support old request changes

* SC-2214 (#832)

Purge unnecessary attributes from user and organisation tables

* SC-2266 Remove 4 unused APIs from learners (#833)

* SC-2266 Remove 4 unused APIs from learner

* Testcase fixes

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* SB-24689 changed user-mapping for roles sub-entity (#836)


* SB-24689 updating mapping

* SB-24689 user-mapping final change for roles sub-entity

* Issue #SB-000 feat:changed sync api for user roles (#835)

* Issue #SB-000 feat:changed sync api for user roles

* Issue #SB-000 feat:changed sync api for user roles

* Issue #SB-000 feat:changed sync api for user roles

* Sb 24762 (#834)

* Issue #SB-24762 feat:fix for association type

* Issue #SB-24762 feat:removed association type from remove org code (#837)

* SB-23169 added changes wrto bulkupload update part

* Issue #SB-000 feat:user search api change to incorporate role changes (#839)

* Issue #SB-24861 feat:added try catch block for null roles (#841)

* Sb 24762 v2 (#842)

* Issue #SB-24861 feat:added try catch block for null roles

* Issue #SB-24762 feat:validate location code after generating it

* SB-23169 added test-case for code-coverage

* SB-23169 added test-case for code-coverage

* SB-24905 [Role assign API] Role updated via API and UI are not getting updated as expected (#840)

* SB-24905 [Role assign API] Role updated via API and UI are not getting updated as expected

* SB-24905 [Role assign API] Role updated via API and UI are not getting updated as expected

* SB-24905 Fixing testcases

* Adding requestedby

* Fixing update user roles

* SB-24905 Fixing testcases

* SB-24909 code changes for create-api for roles (#843)

* SB-24909 code changes for create-api for roles

* SB-24909 roles saved to user-table is removed (#848)

* SB-24909 roles saved to user-table is removed from create user api

* SB-22982 Tnc accept api change to support new role structure (#849)

* SB-22982 Tnc accept api change to support new role structure

* SB-22982 Tnc accept api change to support new role structure

* SB-22982 Testcase fix

* SB-24909 calling assign roles actor from bulkuserbackround actor (#850)

* SB-24909 assign roles pointed to wrong actor, rectified it

* SB-24909 adding new usermap while updating user (#851)

* SB-24909 adding new usermap while updating user

* Issue SB-24861 feat:fixed password issue (#852)

Co-authored-by: Harikumar Palemkota <harip@ilimi.in>
Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>
Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Co-authored-by: Mathew Jose Pallan <mathewjpallan@gmail.com>

merge 3.9 to master

* Issue #SB-22988 feat:addedasociationType for user upload

* Issue #SB-22988 feat:added null check

* Issue #SB-22988 feat:added null check

* Issue #SB-22988 feat:addedasociationType for user upload

* Issue #SB-22988 feat:added null check

SB-22988 sso user_organisation association type api changes

Merge branch 'release-4.0.0' of https://github.com/project-sunbird/sunbird-lms-service into SB-229888

SC-2272 API to capture and store TnC acceptance for report viewer role

Merge branch 'release-4.0.0' of https://github.com/project-sunbird/sunbird-lms-service into SB-229888

SB-22988 - SSU User Create with associationMechanism

* Merger master to 37 (#665)

* Revert "Merge release 3.6 to master (#658)" (#663)

This reverts commit 1bbfada9

.

* New master (#664)

* SB-21223 Adding support for org admin TnC (#608)

* SB-21223 Adding support for org admin TnC

* latest changes merging from release-3.4.0 to release-3.5.0 (#614)

* latest changes merging from release-3.4.0 to release-3.5.0

* SC-2067 updated the telemetry version (#615)

* Issue #SB-21776 feat:Removed projectlogger

* Issue #SB-21776 feat:Removed ProjectLogger

* Issue #SB-21776 feat:Removed ProjectLogger

* Issue #SB-21776 feat:Removed ProjectLogger

* Issue #SB-21776 feat:Removed ProjectLogger

* Tg 521 keycloak fix (#585)

Added user search api for keycloak which will remove cassandra dependency from keycloak

* Issue #SB-21776 feat:propagating traceid for all api

* Issue #SB-21776 feat:propagating traceid for all api

* Issue #SB-21776 feat:propagating traceid for all api

* Issue #SB-21776 feat:propagating traceid for all api

* SB-21886 Allowing locationCodes as array of map format which contains type and code of location

* SB-21886 Added test-case

* Issue #SB-21776 feat:add testcase

* Issue #SB-21776 feat:add testcase

* SB-21887 allow cluster to add as location

* SB-21895,SB-21897,SB-21898 Create, update and read api change… (#622)

* Issue # SB-21785 (#625)

* Issue #SB-21785 feat:changed few log level

* SB-21886 validating location type

* SB-21886 validating location type and resolved test-case failure

* SB-21886 added comment for the locationCode field

* SB-21591 Update the current Self declaration form to the new Consent form (#624)

* SB-21591 Update the current Self declaration form to the new Consent form

* SB-21591 Fixing Testcase issues

* Testcase fix

* Fixed testcase issues

* Fixed testcase issues

* SB-22088 allowing school as location-type while creating location

* SB-22088 used school as constant

* Issue #SB-21781 feat:Add entry and exit log

* Issue #SB-21781 feat:add test case

* Issue #SB-21781 feat:fixing logging

* Issue #SB-21781 feat:fixing logging

* Issue #SB-21781 feat:fixing logging

* Issue #SB-21781 feat:fixing logging

* SB-21901 Adding support for user type and user subtype in migrate api

* SB-21901 adding test scenario for coverage

* SB-21901 removing user Type and subType as it will not come as a part of request

* SB-21901 removing user Type and subType as it will not come as a part of request

* Issue #SB-21781 feat:fixing logging

* SB-21591  Update the current Self declaration form to the new Consent form (#630)

* SB-21591 Update the current Self declaration form to the new Consent form

* SB-21591 Fixing Testcase issues

* Testcase fix

* Fixed testcase issues

* Fixed testcase issues

* SB-21591 Update the current Self declaration form to the new Consent form

* SB-21901 Adding support for new user Type and subTypeS

* SB-21901 fixing testcase issues

* SB-21901 fixing testcase issues

* SB-21901 adding new test case

* SB-21901 Adding common validation for user type and sub type

* SB-21901 Adding common validation for user type and sub type

* SB-22088 Draft version of user-update api supporting school as location

* SB-21900 Moving request validator and adding userType validation to cache handler

* SB-21900 Fixing unit testcase

* Issue # SB-21248 feat:user feed api refactoring for scale

* Issue # SB-21248 feat:user feed api refactoring for scale

* Issue #SB-21248 feat: added created and updated by

* SB-22088 user-org record insertion failed issue resolved

* Issue #SB-21248 feat: fixed update api

* SB-22088 test-case for code converage

* Issue #SC-2127 feat:Refactored tnc api for scale

* Issue #SC-2127 feat:Added test case

* Sc 2127 (#636)

* Issue #SB-2127 feat:fixed date issue

* Issue #SB-2127 feat:fixed date issue

* Issue #SC-2125 feat:user read api refactoring

* Issue #SC-2125 feat:refactored user read api

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat:fixed log

* Sc 2127 (#638)

* Issue #SB-2127 feat:fixed date issue

* Issue #SB-2127 feat:fixed date issue

* Issue #SC-2127 feat:fixing tnc issue

* SB-21985 adding school details to user-declared details when profile and user-declarations are submitted

* SB-21985 added testcase testGetUserOrg in UserOrgDaoImplTest

* Issue #SC-2125 feat:fixed test case

* SB-21985 modified testcase UserSelfDeclarationManagementActorTest.testUpdateUserSelfDeclarations

* SB-21985 modified testcase testGetUserOrg in UserOrgDaoImplTest

* SB-21985 modified testcase testGetUserOrg in UserOrgDaoImplTest

* SB-21985 code review changes

* SB-21985 code review changes

* Issue #TG-790 feat:fix dependency issue

* Sc 2125 (#637)

* Issue #SC-2125 feat:user read api refactoring

* SB-21985 user declarations not adding while school is selected and incase it is not having (#640)

* Sc 2125 Usre read api refactoring (#641)

* Issue #SC-2125 feat:user read api refactoring

* Sc 2125 new (#642)

* Issue #SC-2125 feat:Removed future code

* Issue #SC-2125 feat: removed unused code

* Sc 2125 new (#643)

* Issue #SC-2125 feat:Removed future code

* Issue #SC-2125 feat: removed unused code

* Issue #SC-2125 feat:added externalids for user v1 read api

* Issue #SC-2125 feat:add esternalIds in read response (#644)

* Issue #SC-2125 feat:add esternalIds in read response

* SB-21988 Remove the private update user API  (#645)

* SB-21591

Update the current Self declaration form to the new Consent form

* SB-21988 Remove the private update user API

* SB-21988 Remove the private update user API

* SB-21988 Remove the private update user API

* SB-21559 Adding OTP validation success and Failure message (#646)

* SB-21559 Adding otp relation new logg message for success and failure
* SB-21559 Adding small case to user type

* Issue #SC-00 feat:fix tnc url (#649)

* SB-22356 making usersubType null when userType change and subtype is not present (#648)

Co-authored-by: reshmi-nair <54312456+reshmi-nair@users.noreply.github.com>

* Issue #SC-000 feat:orgdaoimpl test fix (#650)

* Issue #SC-000 feat:orgdaoimpl test fix

* Issue #SC-2117 feat:removed unused api from learner routes file (#651)

* Issue #SC-2117 feat:removed unused api from learner routes file

* Issue # SB-22428 feat:fixing group tnc in user read response (#653)

* Issue # SB-22428 feat:fixing group tnc in user read response

* SB- 21899 Caching UserType , UserSubType and Location Types with TTL (#652)

* SB-21899 UserType, userSubType,locationsIds caching and validation

* Issue #SB-22496 feat:Reverting status change (#655)

* SB-22582 Get location from default if not available (#657)

* SB-22582 Get location from default if not available

* SB-22582 Telemetry Version Change

* Issue #SC-00 feat:added falg value (#659)

* Add state flag value new (#660)

* Issue #SC-00 feat:added falg value

* Issue #SC-00 feat:added falg value

* Issue #SC-00 feat:added falg value

* Issue #SC-00 feat:added test case

* SB-22652 Fix: Check with default if user does not have locations (#661)

Co-authored-by: sknirmalkar89 <59080585+sknirmalkar89@users.noreply.github.com>
Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Co-authored-by: Mathew Jose Pallan <mathewjpallan@gmail.com>
Co-authored-by: Harikumar Palemkota <harip@ilimi.in>
Co-authored-by: reshmi-nair <54312456+reshmi-nair@users.noreply.github.com>
Co-authored-by: satish Nirmalkar <satishkumar.nirmalkar@tarento.com>

Co-authored-by: sknirmalkar89 <59080585+sknirmalkar89@users.noreply.github.com>
Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Co-authored-by: Mathew Jose Pallan <mathewjpallan@gmail.com>
Co-authored-by: Harikumar Palemkota <harip@ilimi.in>
Co-authored-by: reshmi-nair <54312456+reshmi-nair@users.noreply.github.com>
Co-authored-by: satish Nirmalkar <satishkumar.nirmalkar@tarento.com>

* SB-22771_new Merging fix from release-3.6.0 to release-3.7.0 (#674)

SB-22771 Merging fix from release-3.6.0 to release-3.7.0

* 3.6stagfixes (#676)

* SB-22787 Merge fir for 3.6.0 (#679)

* Issue #SC-2171 feat:Removing secondary index (#656)

* SB-21223 Adding support for org admin TnC (#608)

* SB-21223 Adding support for org admin TnC

* latest changes merging from release-3.4.0 to release-3.5.0 (#614)

* latest changes merging from release-3.4.0 to release-3.5.0

* SC-2067 updated the telemetry version (#615)

* Issue #SB-21776 feat:Removed projectlogger

* Issue #SB-21776 feat:Removed ProjectLogger

* Issue #SB-21776 feat:Removed ProjectLogger

* Issue #SB-21776 feat:Removed ProjectLogger

* Issue #SB-21776 feat:Removed ProjectLogger

* Tg 521 keycloak fix (#585)

Added user search api for keycloak which will remove cassandra dependency from keycloak

* Issue #SB-21776 feat:propagating traceid for all api

* Issue #SB-21776 feat:propagating traceid for all api

* Issue #SB-21776 feat:propagating traceid for all api

* Issue #SB-21776 feat:propagating traceid for all api

* SB-21886 Allowing locationCodes as array of map format which contains type and code of location

* SB-21886 Added test-case

* Issue #SB-21776 feat:add testcase

* Issue #SB-21776 feat:add testcase

* SB-21887 allow cluster to add as location

* SB-21895,SB-21897,SB-21898 Create, update and read api change… (#622)

* Issue # SB-21785 (#625)

* Issue #SB-21785 feat:changed few log level

* SB-21886 validating location type

* SB-21886 validating location type and resolved test-case failure

* SB-21886 added comment for the locationCode field

* SB-21591 Update the current Self declaration form to the new Consent form (#624)

* SB-21591 Update the current Self declaration form to the new Consent form

* SB-21591 Fixing Testcase issues

* Testcase fix

* Fixed testcase issues

* Fixed testcase issues

* SB-22088 allowing school as location-type while creating location

* SB-22088 used school as constant

* Issue #SB-21781 feat:Add entry and exit log

* Issue #SB-21781 feat:add test case

* Issue #SB-21781 feat:fixing logging

* Issue #SB-21781 feat:fixing logging

* Issue #SB-21781 feat:fixing logging

* Issue #SB-21781 feat:fixing logging

* SB-21901 Adding support for user type and user subtype in migrate api

* SB-21901 adding test scenario for coverage

* SB-21901 removing user Type and subType as it will not come as a part of request

* SB-21901 removing user Type and subType as it will not come as a part of request

* Issue #SB-21781 feat:fixing logging

* SB-21591  Update the current Self declaration form to the new Consent form (#630)

* SB-21591 Update the current Self declaration form to the new Consent form

* SB-21591 Fixing Testcase issues

* Testcase fix

* Fixed testcase issues

* Fixed testcase issues

* SB-21591 Update the current Self declaration form to the new Consent form

* SB-21901 Adding support for new user Type and subTypeS

* SB-21901 fixing testcase issues

* SB-21901 fixing testcase issues

* SB-21901 adding new test case

* SB-21901 Adding common validation for user type and sub type

* SB-21901 Adding common validation for user type and sub type

* SB-22088 Draft version of user-update api supporting school as location

* SB-21900 Moving request validator and adding userType validation to cache handler

* SB-21900 Fixing unit testcase

* Issue # SB-21248 feat:user feed api refactoring for scale

* Issue # SB-21248 feat:user feed api refactoring for scale

* Issue #SB-21248 feat: added created and updated by

* SB-22088 user-org record insertion failed issue resolved

* Issue #SB-21248 feat: fixed update api

* SB-22088 test-case for code converage

* Issue #SC-2127 feat:Refactored tnc api for scale

* Issue #SC-2127 feat:Added test case

* Sc 2127 (#636)

* Issue #SB-2127 feat:fixed date issue

* Issue #SB-2127 feat:fixed date issue

* Issue #SC-2125 feat:user read api refactoring

* Issue #SC-2125 feat:refactored user read api

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat: Added test case

* Issue #SC-2125 feat:fixed log

* Sc 2127 (#638)

* Issue #SB-2127 feat:fixed date issue

* Issue #SB-2127 feat:fixed date issue

* Issue #SC-2127 feat:fixing tnc issue

* SB-21985 adding school details to user-declared details when profile and user-declarations are submitted

* SB-21985 added testcase testGetUserOrg in UserOrgDaoImplTest

* Issue #SC-2125 feat:fixed test case

* SB-21985 modified testcase UserSelfDeclarationManagementActorTest.testUpdateUserSelfDeclarations

* SB-21985 modified testcase testGetUserOrg in UserOrgDaoImplTest

* SB-21985 modified testcase testGetUserOrg in UserOrgDaoImplTest

* SB-21985 code review changes

* SB-21985 code review changes

* Issue #TG-790 feat:fix dependency issue

* Sc 2125 (#637)

* Issue #SC-2125 feat:user read api refactoring

* SB-21985 user declarations not adding while school is selected and incase it is not having (#640)

* Sc 2125 Usre read api refactoring (#641)

* Issue #SC-2125 feat:user read api refactoring

* Sc 2125 new (#642)

* Issue #SC-2125 feat:Removed future code

* Issue #SC-2125 feat: removed unused code

* Sc 2125 new (#643)

* Issue #SC-2125 feat:Removed future code

* Issue #SC-2125 feat: removed unused code

* Issue #SC-2125 feat:added externalids for user v1 read api

* Issue #SC-2125 feat:add esternalIds in read response (#644)

* Issue #SC-2125 feat:add esternalIds in read response

* SB-21988 Remove the private update user API  (#645)

* SB-21591

Update the current Self declaration form to the new Consent form

* SB-21988 Remove the private update user API

* SB-21988 Remove the private update user API

* SB-21988 Remove the private update user API

* SB-21559 Adding OTP validation success and Failure message (#646)

* SB-21559 Adding otp relation new logg message for success and failure
* SB-21559 Adding small case to user type

* Issue #SC-00 feat:fix tnc url (#649)

* SB-22356 making usersubType null when userType change and subtype is not present (#648)

Co-authored-by: reshmi-nair <54312456+reshmi-nair@users.noreply.github.com>

* Issue #SC-000 feat:orgdaoimpl test fix (#650)

* Issue #SC-000 feat:orgdaoimpl test fix

* Issue #SC-2117 feat:removed unused api from learner routes file (#651)

* Issue #SC-2117 feat:removed unused api from learner routes file

* Issue # SB-22428 feat:fixing group tnc in user read response (#653)

* Issue # SB-22428 feat:fixing group tnc in user read response

* SB- 21899 Caching UserType , UserSubType and Location Types with TTL (#652)

* SB-21899 UserType, userSubType,locationsIds caching and validation

* Issue #SB-22496 feat:Reverting status change (#655)

* Issue #SC-2171 feat:Removing secondary index

* SB-22582 Get location from default if not available (#657)

* SB-22582 Get location from default if not available

* SB-22582 Telemetry Version Change

* Issue #SC-2171 feat:Removing secondary index

* Issue #SC-2171 feat:Removing secondary index

* Issue #SC-2171 feat:fix secondary index issue

* Issue #SC-2171 feat:merge release-3.7.0

* Issue #SC-2171 feat:add test case

* Issue #SC-2171 feat:add test case

* Issue #SC-2171 feat: removed code related to allow filtering caa

* Issue #SC-2171 feat: removed code related to allow filtering call

* Issue #SC-2171 feat: removed code related to allow filtering call

* Issue #SC-2171 feat: removed code related to allow filtering call

* Issue #SC-2171 feat: removed code related to allow filtering call

Co-authored-by: sknirmalkar89 <59080585+sknirmalkar89@users.noreply.github.com>
Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Co-authored-by: Mathew Jose Pallan <mathewjpallan@gmail.com>
Co-authored-by: Harikumar Palemkota <harip@ilimi.in>
Co-authored-by: reshmi-nair <54312456+reshmi-nair@users.noreply.github.com>
Co-authored-by: satish Nirmalkar <satishkumar.nirmalkar@tarento.com>

* updated test files

* added few more tests

* Test

* added test cases for location APIs

* added test cases for location APIs

* Issue #SC-2172 feat: upgrade learner to jdk11 (#654)

Upgrading learner to jdk11

* Issue #SB-000 feat:merge release-3.6.0 to release-3.7.0 (#686)

* Issue #SB-000 feat:merge release-3.6.0 to release-3.7.0

* SC 2169 Decommissioning unused APIs (#687)

* SC 2169 Decommissioning unused APIs, merging release-3.6.0 to release-3.7.0

* Issue fix for encryption and decryption (#689)

* Issue fix for encryption and decryption

* Issue #SC-2213 feat:fix user mapping

* Issue #SC-2213 feat:user mapping fix

* Issue #SC-2213 feat:fix user mapping

* Issue #SC-2213 feat:fix user mapping

* fix: updating JFs as per new jenkins jobs parameter (#691)

* fix: issue / image in tag names (#692)

* Issue #SC-2213 feat:removed mapping from index file

* Issue #SC-2213 feat:user mapping file

* Issue #SC-2213 feat:user mapping file

* Org testcase

* Issue #SC-2213

* minor changes

* Issue #SC-2213 feat:added alias for user index

* Issue #SC-2213 feat:added alias for user index

* SC-2135 Drop queries to be added for removed Tables and refactor code to remove reference to these tables (#680)

Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>

* SC-2124 Refractor UserCreate API and merge v1 and v2 to v3 (#688)

* SC-2124: Refactoring create user api

* Issue #SC-2213 feat:fix user mapping

* Issue #SC-2213 feat:fix user mapping

* testcase

* Issue #SC-2213 feat:add alias for user index

* Issue #SC-2213 feat:add log for index printing

* SB-23206 user-type casting throwing error regarding alltncaccepted field in user model (#702)

* testcase

* Update api internal_error issue (#706)

* Issue #SC-2228 feat:Code change to support sms template id (#703)

* Issue #SC-2228 feat:Code change to support sms template id

* Sc 2228 sms template changes (#708)

* Issue #SC-2228 feat:Code change to support sms template id

* changes

* SC-2227 user create API changes

* SC-2227 user create API changes

* Merge release-sms change to 3.8 (#721)

Merging sms template change to 3.8

* SB-22745 adding isMinor flag in the read response (#716)

* SB-22745 adding isMinor flag in the read response

* Sc 2254 : Depricate APIs related to OrgType (#724)

* Issue #SC-2254 feat:Depricate OrgType APIs

* Issue #SC-2254 feat:Removed unused jsonkey

* SB-22745 changes done to update api regarding isMinor flag (#725)

* sc-2227 user create and update api changes

* SC-2232 user search and read api changes (#722)

* SC-2232 search and read user api changes

* SB-22745 user creation and updation failing since dob validation happening twice (#728)

* sc-2227 user create and update api changes

* sc-2227 api changes

* sc-2227 changes to add profile location

* sc-2227 profile usertype update

* sc-2227 added profileLocation

* profileusertype and profilelocation changes

* removed white spaces

* removed white spaces

* profilelocation changes

* dependency is added

* Revert "SC-2232 user search and read api changes (#722)" (#733)

This reverts commit b9e27d6d.

* Revert "Revert "SC-2232 user search and read api changes (#722)" (#733)" (#735)

This reverts commit f37e1ca4

.

* Sc 2259 Depricating update login api (#730)

* Issue #SC-2259 feat:Changed login api to return 200Ok always

* sc-2227 added testcases

* sc-2227 added testcases

* sc-2227 added testcases

* sc-2227 added testcases

* sc-2227 tests updated

* sc-2227 tests updated

* sc-2227 test locationcodes

* sc-2227 adding testcases

* sc-2227 adding testcases

* SC-2232 User Search request api changes, User Search and Read response api changes (#732)

* SC-2232 search and read user api changes

* SC-2190 Schools to be considered as organisations instead of sub-organisations (#731)

SC-2190 Schools to be considered as organisations instead of sub-organisations

* SC-2233 Updating orglocationids as List (#739)

* Master upgrade3.7 (#723)

* Updating orglocationids as List

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* SB-23505 User is not getting SMS notification if uploaded via bulk upload (#740)

* SB-23505 User is not getting SMS notification if uploaded via bulk upload

* ISsue #SB-23537 feat:add attempted count to properties file (#743)

* Issue #SB-23844 (#744)

* Sb 23849 feat:fixin user profile location issue (#745)

* Issue #SB-23844

* Issue #SB-23849 feat:fix profile location issue

* SC-2221 , SC-2258 OrgLocation and organisationType changes (#746)

* Issue #SC-2258 feat:Removing unused columns and supporting backward compatibility

* SB-23888 SB-23802 Self declaration form submit issues fixed (#747)

* Master upgrade3.7 (#723)

* SB-23888

User is not able to Submit Details after selecting value from State/Institution field

* SB-23888 User is not able to Submit Details after selecting value from State/Institution field

* SB-23888 User is not able to Submit Details after selecting value from State/Institution field

* SB-23888 User is not able to Submit Details after selecting value from State/Institution field

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* SB-23746: Adding log to check google captcha request (#750)

* Sb 23746 (#751)

* SB-23746: Adding log to check google captcha request

* SB-23746:Updating log

* SB-23746:Updating log

* Sb 23746 (#753)

* SB-23746: Adding log to check google captcha request

* SB-23746:Updating log

* SB-23746:Updating log

* SB-23798 Not able to create new SSO user and login with old SSO users (#752)

* Master upgrade3.7 (#723)

* SB-23798 User is not able to create new SSO user and login with old SSO users

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* SB-23802 added logs for exception traceout (#754)

* SB-23802 User is not able to submit the self declaration form by filling mandatory fields (#755)

* Master upgrade3.7 (#723)

* SB-23802 User is not able to submit the self declaration form by filling manadatory fields

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* Sb 23746 (#756)

* SB-23746: Adding log to check google captcha request

* SB-23746:Updating log

* SB-23746:Updating log

* SB-23746: Adding log

* Sb 23746 (#758)

* SB-23746: Adding log to check google captcha request

* Issue #SC-2221 feat:org externalid update issue fix (#757)

* Issue #SC-2221 feat:org externalid update issue fix

* Sc 2221 hashtagid change (#760)

* SB-23964 User is not able to merge or create new sso with exisiting custodian user (#762)

* Master upgrade3.7 (#723)

* User is not able to merge or create new sso with exisiting custodian user

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* Sc 2190 sync api change (#761)

* Issue #SC-2190 feat:es sync api change

* SB-23964 User is not able to merge or create new sso with exisiting custodian user (#763)

* Master upgrade3.7 (#723)

* User is not able to merge or create new sso with exisiting custodian user

* User is not able to merge or create new sso with exisiting custodian user

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* Issue #SC-2190 feat:fix hashtagid issue (#764)

* SB-23964 User is not able to merge or create new sso with exisiting custodian user (#765)

* Master upgrade3.7 (#723)

* User is not able to merge or create new sso with exisiting custodian user

* User is not able to merge or create new sso with exisiting custodian user

* User is not able to merge or create new sso with exisiting custodian user

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* Issue #SB-23978 feat:fix school locn update issue (#767)

* Sb 23978 (#768)

* Issue #SB-23978 feat:fix school locn update issue

* Issue #SC-2190 feat:added default user and org data to response (#769)

* Issue #SC-2190 feat:added null & empty check for reading rootOrg details (#770)

* Sc 2190 null check for rootorgid (#771)

* Issue #SC-2190 feat:added null & empty check for reading rootOrg details

* Issue #SC-2190 feat:Added null or empty check on primary key

* Issue #SC-2190 feat:added empty check for root org (#772)

* Issue #SC-2190 feat:added empty check for root org

* Issue #SC-2190 feat:added empty check for flags value

* Sc 2190 rootorg issue (#773)

* Issue #SC-2190 feat:added empty check for root org

* Issue #SC-2190 feat:added empty check for flags value

* Issue #SC-2190 feat:fetching user org by id instead of userid

* SB-23719 - New version for org search API (#766)

SB-23719 - New version for org search API

* SB-23717 user update and create api changes (#749)

* SB-23717 user update and create  api changes

* SB-23718 - New version for user read and user search APIs (#748)

* sc-2227 changes

* v4/user/read new API version

* new user read API version changes

Co-authored-by: reshmi-nair <54312456+reshmi-nair@users.noreply.github.com>

* SB-23717 user create api changes (#778)

* SB-23717 user create api changes

* SB-23719 Org search API changes (#780)

SB-23719 Org search API changes

* SB-23717 email and phone verified changes (#781)

* SB-23717 user update api changes

* SB-23717 Switching case change createUserV3 (#782)

* SB-23717 user create api changes

* Merge 38 to 39 (#786)

* Issue #SC-2190 feat:removed bulk insert code from org sync (#774)

* Issue #SC-2211 feat:org mapping change (#775)

* Issue #SB-23718 feat:added backward compatibility to user read and se… (#785)

* Issue #SB-23718 feat:added backward compatibility to user read and search

* Issue #SC-2265 feat:added isSchool in user read response (#789)

* SC-2260 AUDIT Telemetry Event Generation Correction (#742)

* SC-2260 Telemetry AUDIT - Migrate and Merge user edata type and state changes

* SB-24187 New v4 read api specific fields is present in response (#790)

* SB-24187 New v4 read api specific fields is present in response for existing/new users which is not expected

* Issue #SC-2265 feat:added iSchool to org Search and read api response (#793)

* SC-2267 Move telemetry version to be saved to System Settings (#794)

* Issue #SB-000 feat:merge release-3.8.0 to 3.9.0 (#798)

* Issue #SB-000 feat:merge release-3.8.0 to 3.9.0

* SB24212 User Update V1 api changes (#799)

* SB-23717 user update api changes

* SB 24342 Searching locationids[] in v1 user search api is throwing 500 error (#801)

* Issue #SB-24402 feat:org upload issue fix (#802)

* Issue #SB-24402 feat:org upload issue fix

* Issue #SB-24446 feat:added new env for installation name for sms (#803)

* Sb 24446 (#805)

* Issue #SB-24446 feat:added logs to debug sms issue

* SB-24240 added for better logging (#806)

* SB-24240 added for better logging

* SB-24240 (#807)

* SB-24240 added for better logging

* Merging release-3.9.0 to master

* Sb 24446 (#809)

* Issue #SB-24446 feat:reverted logs for sms issue

Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>
Co-authored-by: sknirmalkar89 <59080585+sknirmalkar89@users.noreply.github.com>
Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Co-authored-by: Mathew Jose Pallan <mathewjpallan@gmail.com>
Co-authored-by: Harikumar Palemkota <harip@ilimi.in>
Co-authored-by: satish Nirmalkar <satishkumar.nirmalkar@tarento.com>
Co-authored-by: fathimasherin <fathimasherin362@gmail.com>
Co-authored-by: Keshav Prasad <keshavprasadms@gmail.com>
Co-authored-by: sreeragksgh <58926794+sreeragksgh@users.noreply.github.com>
Co-authored-by: FsherinP <58927135+FsherinP@users.noreply.github.com>

Merge branch 'release-3.9.0' of https://github.com/project-sunbird/sunbird-lms-service into SB-229888