Merge 2.8.0 with master (#385)

* updating module to corresponding branch

* minor changes to remove unnecessary dependencies

* changes for textbook operation import

* Issue #000 fix: update submodules.

* Issue #000 fix: remove pointer

* Issue #000 fix: remove pointer.

* Revert "Issue #000 fix: remove pointer."

This reverts commit d624184.

* Issue #000 fix: update submodule pointer

* correcting gitmodules

* gitmodule changes as per 2.1.0

* excluding old guava jar

* SB-13241 Adding enrollment end date parameter

* Issues #SB-00 fix:creating new branch release-2.2.0

* changed service name to lms_service

* changed learner folder to lms

* Revert "changed learner folder to lms"

This reverts commit 25121f0.

* Revert "changed service name to lms_service"

This reverts commit 67a3b7a.

* Update Dockerfile

* initial cpommmit

* Issue #SB-00 feat: creating new branch for release-2.3.0

* Issue#SC-13803 added dummy response for user freeup controller

* Issue#SC-13803 added dummy response for user freeup controller

* Issue#SB-13803 added identifierFreeUpController

* Issue#SB-13803 changed actor name

* Issue13803 modified java doc for controller class

* Issue #SB-13896 merge user changes

* Issue #SB-14036 feat: reset password api impl

* Issue #SB-10436 feat: removed unused imports

* Issue #SB-14033 feat: otprequest validator change

* Issue #SB-13896 merge issue

* Issue #SB-14033 feat: changed otp request validator

* Issue #SB-14101 feat: added teletery for reset password api

* Issue #SB=13896 telemetry event generation changes in merge-api

* Issue #SC-1258 certificate validation first cut

* Issue #SC-1258 added controller and config changes

* Issue #SC-1258 review code fixes

* Issue#SC-1259 added routes and action method for add certificate

* Issue#SC-1259 handlerequest method changed

* Issue#SC-1259 added API  in apiHeaderIgnoreMap

* Issue #SB-13896 code changes for source-user and user-auth token checking changes

* #IssueSC-1190 added routes file and controller action method

* Issue #SB-14163 feat: changes for reset password work flow , now it will send sms or email based on selected type

* Issue#SC-1190 changed the name of controller to KeyManagementController

* Issue#SC-1190 validator name changed

* Issue #SB-14223 merge user-cert api modifications

* Issue #SB-14223 merge user-cert api changes

* Issue #SC-1285 feat: adding new endpoint for sign url

* Issue #SC-1285 feat: adding new endpoint for sign url

* Issue #SB-14373 fix:adding private endpoint for send notification

* Issue #SB-14372 no-need of adding this global class

* Issuse #SB-00 feat:changes for submodules

* Issue #SB-00 feat: creating new branch from release-2.3.0

* Actor operation changed

* Issue#SC-1310 added new endpoint for user migrate

* Issue#SC-1310 changed api

* Issue#SC-1310 changes apis

* issue #SB-14977 fix: changes for travis build fix

* SB-15019 (#314)

* Issue#SB-15019 routes for course batch page assemble and dashboard contentlink APIs been removed

* Issue#SB-15019 removed course batch page assemble related controllers and validators

* Issue#SB-15019 removed course batch page assemble related controllers and validators test cases

* Issue#SB-15019 header ignore map removed

* submodules path cnaged (#322)

* Issue#SC-1388 ADDED API TO HANDLE THE TENANT REJECTION (#324)

* Sc 1388 (#325)

* Issue#SC-1388 ADDED API TO HANDLE THE TENANT REJECTION

* SC-1388 validating auth token for the reject request

* Issue#SC-1388 TOKEN ID VALIDATION WAY CHANGED

* Revert "Sc 1388 (#325)" (#329)

This reverts commit bf5e1a0.

* SC-1073 play upgradation changes (#331)

* Issue #SB:00 feat:play upgradation to 2.7 and akka lib changes

* Issue #SB-00 tenantReject method signature changes

* Issue #SB:00 feat:play upgradation to 2.7.2 and akka lib changes (#326)

* Issue #SB:00 feat:play upgradation to 2.7 and akka lib changes

* Issue #SB-00 tenantReject method signature changes

* Issue #SB-00 submodule changed to play-2.7 branch

* Play 2.7 (#327)

* Issue #SB:00 feat:play upgradation to 2.7 and akka lib changes

* Issue #SB-00 tenantReject method signature changes

* Issue #SB-00 submodule changed to play-2.7 branch

* Issue #SC-1073 added pom properties in order to reduce redundancy of version numbers and review code changes

* SB-15220  (#323) (#334)

* Issue#SB-15220 added recoveryPhone and recoverEmail in allowed fields in otp generate

* Issue#SB-15220 added recoveryPhone and recoverEmail in allowed fields in otp generate

* issue #SB-15487 fix: test case change passing int instead of bigInt (#333) (#335)

* Update .gitmodules

changes for submodule only.

* SC-1380 (#328)

* Issue#SC-1388 ADDED API TO HANDLE THE TENANT REJECTION

* SC-1388 validating auth token for the reject request

* Issue#SC-1388 TOKEN ID VALIDATION WAY CHANGED

* Issue#SC-1380 Added migrate API

* Issue#SC-1380 PR COMMENTS RESOLVED

* fixed resolve conflicts

* SC-1380 (#336)

* Issue#SC-1388 ADDED API TO HANDLE THE TENANT REJECTION

* SC-1388 validating auth token for the reject request

* Issue#SC-1388 TOKEN ID VALIDATION WAY CHANGED

* Issue#SC-1380 Added migrate API

* Issue#SC-1380 PR COMMENTS RESOLVED

* fixed resolve conflicts

* Test Cases Fixed

* remove reduntant code for static method

* Resolved Pr comments

* Unused Test Cases Ignored

* resolving PR comments

* issue #SB-15791 fix: chnages for unit test (#342)

changes for unit test.

* Issue #00 feat: Integrating sonacloud for release branch

* SC-1380 (#341) - Consolidate reject and accept in migrate API

* Issue#SC-1388 ADDED API TO HANDLE THE TENANT REJECTION

* SC-1388 validating auth token for the reject request

* Issue#SC-1388 TOKEN ID VALIDATION WAY CHANGED

* Issue#SC-1380 Added migrate API

* Issue#SC-1380 PR COMMENTS RESOLVED

* fixed resolve conflicts

* Test Cases Fixed

* remove reduntant code for static method

* Resolved Pr comments

* Unused Test Cases Ignored

* resolving PR comments

* Issue#SC-1380 reject API removed for migration

* Issue#SC-1380 TestCases Added

* Issue#SC-1380 Identifier Freeup controller test cases added

* Issue#SC-1380 added test cases for notesValidator and CertificateController

* Issue#SC-1380 added test cases for notesValidator and CertificateController

* Issue#SC-1380 validator test handled with try catch

* Issue#SC-1380 Validated Action enum from Enum class

* SC1380 (#344) - Add migrate accept/reject error message with payload validation

* Issue#SC-1388 ADDED API TO HANDLE THE TENANT REJECTION

* SC-1388 validating auth token for the reject request

* Issue#SC-1388 TOKEN ID VALIDATION WAY CHANGED

* Issue#SC-1380 Added migrate API

* Issue#SC-1380 PR COMMENTS RESOLVED

* fixed resolve conflicts

* Test Cases Fixed

* remove reduntant code for static method

* Resolved Pr comments

* Unused Test Cases Ignored

* resolving PR comments

* Issue#SC-1380 reject API removed for migration

* Issue#SC-1380 TestCases Added

* Issue#SC-1380 Identifier Freeup controller test cases added

* Issue#SC-1380 added test cases for notesValidator and CertificateController

* Issue#SC-1380 added test cases for notesValidator and CertificateController

* Issue#SC-1380 validator test handled with try catch

* Issue#SC-1380 Validated Action enum from Enum class

* Issue#SC-1380 modified the validation for user migrations

* Issue#SC-1380 RESPONSE CODE CHANGED

* Issue#SC-1380 Test case modified

* Issue#SC-1380 PR COMMENTS RESOLVED

* Issue#SC-1380 Refractored the isActionAccept

* Issue#SC-1380 changed error for invalid action values

* Issue#SC-1380 changed error message for invalid action param

* Issue#SC-1499 added MOCK /feed API (#345)

* Sc 1396 (#346)

* issue #SC-1396 feat: changes for unit test

* issue #SC-1396 feat: changes for unit test

* Sc 1511 (#348)

* Issue #SC-1470 feat: Feed API changes

* Issue #SC-1470 feat: code review fix

* Issue #SC-1511 feat: test case and code review fix

* Issue #SC-1511 feat: test case and code review fix

* Issue #SC-1511 feat: test case and code review fix

* Issue #SC-1511 feat: test case and code review fix

* Issue #SC-1511 feat: test case and code review fix

* Issue#SC-1534 removed CacheController (#349)

* Issue #SB-15180 validation condition to templateId (#368)

* Issue #SB-15180 validation condition to templateId

* Issue #SB-15180 changed the branch version

* Merge 2.6.5 to 2.7.0 (#372)

* issue #SC-1544 feat: changes for git submodule (#353)

* issue #SC-1582 fix: on load test disable test case (#354)

* exixt api added

* exixt api added (#356)

* Sc 1582 (#357)

* issue #SC-1582 fix: on load test disable test case

* issue SC-1582 feat: adding new api v3 for user create

* Sc 1582 (#358)

* issue #SC-1582 fix: on load test disable test case

* issue SC-1582 feat: adding new api v3 for user create

* issue SC-1582 feat: making create user v3 call as public

* base controller async

* Uservalidapi (#359)

* exixt api added

* base controller async

* Issue#SC-1589 removed auth token requirement from user exists API and reverting back the changes toApply

* Uservalidapi (#360)

* exixt api added

* base controller async

* Issue#SC-1589 removed auth token requirement from user exists API and reverting back the changes toApply

* role read api auth token requirement removed

* Uservalidapi (#361)

* exixt api added

* base controller async

* Issue#SC-1589 removed auth token requirement from user exists API and reverting back the changes toApply

* role read api auth token requirement removed

* Update .gitmodules (#362)

chnages for gitmodules.

* route name changed

* SC-1589 (#363)

* exixt api added

* base controller async

* Issue#SC-1589 removed auth token requirement from user exists API and reverting back the changes toApply

* role read api auth token requirement removed

* route name changed

* Update Jenkinsfile

* auth token not required for user exists API

* SC-1608 Loadtest release 2.6.0 (#370)

* Release 2.6.5 (#366)

* exixt api added

* base controller async

* Issue#SC-1589 removed auth token requirement from user exists API and reverting back the changes toApply

* role read api auth token requirement removed

* route name changed

* auth token not required for user exists API

Co-authored-by: Anmol Gupta <[email protected]>
Co-authored-by: amorphous-1 <[email protected]>

* issue #SB-00 fix: failing with NP

* issue #SC-1549 skip test case on load test

* Update .gitmodules (#369)

* issue #SC-1606 fix: changes for reset password

* issue #SC-1608 fix: changes for v3 create user to v1 user signup

* issue #SC-1608 fix: adding entry to request interceptor

* Update .gitmodules

* Update Jenkinsfile

Co-authored-by: Anmol Gupta <[email protected]>
Co-authored-by: amorphous-1 <[email protected]>

* Uservalidapi (#373)

* Release 2.6.5 (#366)

* exixt api added

* base controller async

* Issue#SC-1589 removed auth token requirement from user exists API and reverting back the changes toApply

* role read api auth token requirement removed

* route name changed

* auth token not required for user exists API

Co-authored-by: Anmol Gupta <[email protected]>
Co-authored-by: amorphous-1 <[email protected]>

* user exist API test case added

* user v3 api test cases added

* issue #SB-00 fix: failing with NP

* issue #SC-1549 skip test case on load test

* Update .gitmodules (#369)

* issue #SC-1606 fix: changes for reset password

* issue #SC-1608 fix: changes for v3 create user to v1 user signup

* issue #SC-1608 fix: adding entry to request interceptor

* Update .gitmodules

* Update Jenkinsfile

* changed v3 uri

* removed unused code

Co-authored-by: manzarul Haque <[email protected]>
Co-authored-by: amorphous-1 <[email protected]>

* issues #SB-00 fix: changes for submodules

Co-authored-by: Anmol Gupta <[email protected]>
Co-authored-by: amorphous-1 <[email protected]>

* Update .gitmodules

changes for git submodule

* Issue #SC-1619 feat:gitmodule file change (#375)

* Issue # SC-1652 feat:updated jenkins file (#376)

* Issue#SC-1632 upgrade jackson version (#379)

* Issue #SC-1654 Initial draft for Trigger scheduler on demand (#378)

* Issue #SC-1654 Intial draft for Trigger scheduler on demand

* Issue #SC-1654 code changes done after review comments

* Issue #SC-1654 added test case for scheduler controller

* Issue #SC-1654 added space to run build

Co-authored-by: manzarul Haque <[email protected]>

* SC 1670- Add v3/user/create that does ES sync (#381)

* Issue #SC-1654 Intial draft for Trigger scheduler on demand

* Issue #SC-1654 code changes done after review comments

* Issue #SC-1654 added test case for scheduler controller

* Issue #SC-1654 added space to run build

* Issue #SC-1670 user create sync api

* Issue #SC-1670 id added to api-response

Co-authored-by: manzarul Haque <[email protected]>

* Issue #SB-17959 feat:changes the build tag (#382)

* removing uncommneted code

* submodules added

* gitmodules path changed to master branch

* stop running test when analyszing with sonal

Co-authored-by: rahul-tarento <[email protected]>
Co-authored-by: Mahesh Kumar Gangula <[email protected]>
Co-authored-by: AMIT KUMAR <[email protected]>
Co-authored-by: manzarul Haque <[email protected]>
Co-authored-by: Niharika Singh <[email protected]>
Co-authored-by: G33tha <[email protected]>
Co-authored-by: Hari-stackroute <[email protected]>
Co-authored-by: Harsha <[email protected]>
Co-authored-by: amorphous-1 <[email protected]>

.circleci/config.yml

@@ -8,12 +8,16 @@ jobs:
       - run: git submodule update --init --recursive --remote
       - restore_cache:
           key: lms-dependency-cache-{{ checksum "pom.xml" }}
-      - run: mvn clean install -DskipTests=true
+      - run: mvn clean install
       - run: cd service && mvn play2:dist
       - save_cache:
           key: lms-dependency-cache-{{ checksum "pom.xml" }}
           paths: ~/.m2
-
+      - run:
+         name: Analyze on SonarCloud
+         command: mvn verify -DskipTests sonar:sonar -Dsonar.projectKey=project-sunbird_sunbird-lms-service -Dsonar.organization=project-sunbird -Dsonar.host.url=https://sonarcloud.io -Dsonar.coverage.jacoco.xmlReportPaths=/home/circleci/project/service/target/site/jacoco/jacoco.xml
+
+
 workflows:
   version: 2.1
   workflow:

Jenkinsfile

@@ -19,12 +19,12 @@ node('build-slave') {
                 checkout scm
                 commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
                 branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim()
-                build_tag = branch_name + "_" + commit_hash
+                build_tag = branch_name + "_" + commit_hash + "_" + env.BUILD_NUMBER
                 println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL)
             } else {
                 def scmVars = checkout scm
                 checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/$params.github_release_tag"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
-                build_tag = params.github_release_tag
+                build_tag = params.github_release_tag + "_" + env.BUILD_NUMBER
                 println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag specified, building from tag: " + params.github_release_tag + ANSI_NORMAL)
             }
             echo "build_tag: " + build_tag
@@ -36,14 +36,12 @@ node('build-slave') {
                 sh('git submodule update --init --recursive --remote')
                 sh 'git log -1'
                 sh 'cat service/conf/routes | grep v2'
-                sh 'mvn clean install -DskipTests=true '
+                sh 'mvn clean install -U -DskipTests=true '
 
             }
-
-            stage('Unit Tests') {
-                sh "mvn test '-Dtest=!%regex[io.opensaber.registry.client.*]' -DfailIfNoTests=false"
+            stage('Unit Tests') {	
+                sh "mvn test '-Dtest=!%regex[io.opensaber.registry.client.*]' -DfailIfNoTests=false"	
             }
-
             stage('Package') {
                 dir('service') {
                     sh 'mvn play2:dist'