SC 1397 - merged to release-2.4.0 (#811)

* Issue #SB-14333 feat: changes for reset url * Issue #SB-14333 feat: changes for reset url * Issue #SB-14223 instead of normal updates, now we can update with batch and changes regarding while adding and getting json data * Issue#SC-1258 HEADER IS BEEN SET TO THE POST REQUEST * Issue#SC-1293 added courseId and batchId in cert add request * Issue#SC-1293 removed extra batchId field * Issue#SC-1293 removed extra batchId field * Issue #SB-14377 feat: sending email/sms notification after user account merge * Issue #SB-14377 feat: adding firstname in email request * Issue #SB-14377 feat: chnages for get user by id call * Issue #SB-14372 Telemetry code changes while adding certificate, merging certificate and merging user * Issue #SB-14372 bug: if fromaccount deosn't contains certificates, response is not triggering and hence socekt timeout is happening in this scenario * Issue#SC-14483 number of instances increased for UserManagement and other utility actors * background actor instances increased * Issue#SC-1308 added support for recoveryEmail and recoveryPhone * Issue#SC-1308 added masked recoveryEmail and recoveryPhone * Issue#SC-1308 added logs * Issue #SB-14537 feat:checking user belongs to state and validating * Issue #SB-14537 user json change * Issue#SC-1308 METHOD NAME CHANGED * Issue#SC-1308 METHOD NAME CHANGED * Issue #SB-14537 review changes * Issue #SB-14537 added cache capability, checking root-org-channel value is present in cache else get and set in cache * Issue#SC-1308 method signature changed * Issue#SC-1308 init method initialized * Issue#SC-1308 added conditions for recovery email * Issue#SC-1308 dual initiliazation removed * Issue#SC-1308 pr comments resolved * Issuse #SB-00 feat:changes for submodules * Issue #SB-15437 code review changes * Issue #SB-00 feat: creating new branch from release-2.3.0 * Issue#SC-1310 added builder to validate request * Validation started * Issue#SC-1308 nullify recoveryEmail/phone if present in request and is blank * Issue#SC-1310 headers validated * Issue SB-14537 adding statevalidation for non-custodian and flags to decimal value * Issue #SB-14537 adding boolean flags to es * Issue #SB-14537 removed boolean flags * removing course batch count scheduler from learner-service * removing invalid report metric job from scheduler * removing commented call * removing unused course publish job * Issue #SB-14630 fix: changes for email subject incase of reset password * Issue #SB-14630 fix: changes for matching logic * Issue #SB-14630 fix: changes for method call order * Issue#SC-1310 validation started * Issue#SC-1310 user record inserted to cassandra with data encryption * Issue#SC-1310 rows validated * Issue#SC-1310 dispatcher added for list * Issue#SC-1310 added csverror dispatcher * Issue#SC-1310 added csverror dispatcher * Issue#SC-1310 changed error message for list diaptcher * Issue#SC-1310 added timestamp for encrption * Issue#SC-1310 reading csv once only * Issue#SC-1310 pr comments resolved * Issue #SB-14537 adding constants * Issue#SC-1310 discussed changes made * Issue#SC-1310 ADDED JAVA DOC FOR VALIDATOR CLASS * Issue#SC-1310 added comparator for rows * Issue#SC-1310 unused import reoved * Issue#SC-1310 method renamed * Issue#SC-1310 blank csv check made * Issue#SC-1310 added channel from the user token * Issue#SC-1310 ADDED ROOT ORGANISATION ID IN THE RECORD * Issue#SC-1310 changed retry count to 2 * Issue #SC-1324 feat:fixed compilation issue of UserMergeActor class * Issue #SB-14665 feat:removing code to nullify username while merge * Issue #SB-14537 created userflag util for enum value conversion * Issue #SB-14537 code-review changes * Issue#SC-1323 record inserted to shadow db * Issue#SC-1323 USER STARTED UPDATING * Issue#SC-1323 STATUS MESSAGES ADDED * Issue #SB-14665 feat: reverting back the code * Issue#SC-1323 stage 2 completed * Issue #14537 As of now ignoring test cases for making build success * Issue #14537 As of now ignoring test cases for making build success(removing from base class) * Issue #14537 As of now ignoring UserFrameWork test for making build success * Stage3 processing * Stage3 completed * Stage3 completed * issue# Sb-14608 : sent notification after migrating user * Issue #SB-14537 replacing with constants * Issue #SB-14537 fix for test case failures * Issue #SB-14537 removed unnecessary code * issue#SB-14608: review changes, added contant for sunbird_account_merge_subject * Issue#SC-1323 used added to user external id tabe * added process id in response * Issue#SC-1323 if user is claimed then only add userId * Issue #SB-14537 updating exisiting user are failing, fixed * Issue#SC-1323 scenerio tested * Issue #SB-14537 tenantmigration changes for stateValidation field * Issue #SB-14537 comment added * Issue#SC-1323 added scheduler job * Issue SB-14537 usertype not reflecting since request doesn't contain the value * Issue#SB-14784 splitted name in fuzzy search * Issue #SB-14729 feat: exception msg change * Issue#SC-1323 added cronjob for trigerring shadow user migration * Issue#SC-1323 added userIds when esUserMap is greater than 1 * Issue#SC-1323 pr comments resolved * Issue#SC-1323 CACHING OF ORGID IS DONE ON BASED OF CHANNEL * Issue#SC-1323 added LOCAL CACHE FOR ORGEXTERNALID as well * Issue#SC-1323 added LOCAL CACHE FOR ORGEXTERNALID as well * Issue#SC-1323 EXTERNALIDMISMATCH TO ORGEXTERNALIDMISMATCH and checking combination to channel and orgExternaid in set * Issue#SC-1323 EXTERNALIDMISMATCH TO ORGEXTERNALIDMISMATCH and checking combination to channel and orgExternaid in set * Issue#SC-1323 EXTERNALIDMISMATCH TO ORGEXTERNALIDMISMATCH and checking combination to channel and orgExternaid in set * Issue#SC-1323 orgexternalid to lower case and more logs added * Issue#SC-1323 orgexternalid to lower case and more logs added * Issue#SC-1323 added logs * Issue#SC-1323 custodian org id made non static * Issue#SC-1323 LOGS ADDED * Issue#SC-1323 LOGS ADDED * Issue#SC-1323 logs added * Issue#SC-1323 ADDED LOGS * Issue#SC-1323 ADDED LOGS * Issue#SC-1323 ADDED LOGS * Issue#SC-1323 Added Logs * #Issue#SC-1323 logs added with processId * Issue#SC-1323 updating processId * Issue #SB-14537 removed boolean flag parameter from UserFlagEnum * Issue #SB-14537 in getFlagValue method flagEnabled value no need to check with default value * Issue #SC-1333 feat: merge release-2.3.5 to release-2.4.0 * Issue#SC-1323 updated processid * Issue#SC-1323 remove organisations when ext org id provided in null * Issue#SC-1323 ORG DELETED * Issue#SC-1323 ORG DELETED * Issue#SC-1323 shadowprocessor object to local varibale * Issue #SC-1335 feat:masked email and masked phone issue fix * Issue#SC-1323 Flagvalue is been added to user data * Issue#SC-1323 ADDED FLAGSVALUE * Issue#SC-1323 added flasg * Issue#SC-1323 started processing user processIds wise * Issue#SC-1323 started processing user processIds wise * Issue#SC-1323 Async Call to update methods * Issue#SC-1323 Cassandra Async exectured * Issue#SC-1323 EXECUTOR THREADS REDUCED TO 5 * Issue#SC-1323 EXECUTOR THREADS REDUCED TO 5 * Revert "Issue#SC-1323 Async Call to update methods" * Issue#SC-1323 ADDED LOGS * Issue#SC-1323 ADDED LOGS TO DIFFRENTIATE BUILD * Issue#SC-1323 ADDED LOGS TO DIFFRENTIATE BUILD * Issue#SC-1323 ADDED SENNDE LOG * Issue#SC-1323 claimed status changed * #Issue#SC-1323 CHANGED * Issue#SC-1323 added logs * Issue#SC-1323 encryption issue fixed * Issue#SC-1323 started picking all unclaimed user in batches * Issue#SC-1339 teleemtry added * Issue#SC-1339 added telemetrycontext in bulk upload process table * Issue#SC-1339 added telemetry while claiming user * Issue#SC-1339 changed actor type from user to system with uuid * Issue#SC-1339 email and phone to lower case * Issue#SC-1339 email and phone to lower case * issue #SB-14977 fix: changes for travis build failure due to open jdk * Update .travis.yml * Issue#SC-1332 fixed headers validation * Issue#SB-15047 pr comments resolved * Issue #SB-15085 checking emailverified and phoneverified for existing users * Issue #SB-13773 fix: changes for amking syn call for user update and sunstracting flagsvalue as well , if present. * Issue #SB-15085 condition changed for existing users * Issue #SB-15085 moved to separate function * SB-15098 (#776) * Issue#SB-15098 ADDED NAME REGEX MATCHES * Issue#SB-15098 name trimmed before setting to object * SB-15106 (#777) * Issue#SB-15106 CONFIGURED DUPLICATE CHECK FOR EMAIL AND PHONE IN CSV * Issue#SB-15106 removed configuration permanently disabled the duplicate email and phone check * Issue #SB-14999 code changes for kafka producer issue * Issue #SB-14999 added log to see code is reflected or not. * Issue #00 feat: adding circleci config file (#782) * Issue#SB-15220 added recoveryEmail and recoveryPhone in otp generate request (#783) * Issue#SB-15220 enhance OTP functionality to send otp to Recovery email and phone (#784) * Issue#SC-1382 deleting OTP when its verified (#786) * Issue#SB-15342 removed special charater check (#788) * SC-15342 (#789) * Issue#SB-15342 removed special charater check * Issue#SB-15342 username can' contains . at begining and special characters * issue #SB-15346 fix: in forgot password supporting multi language for fuzzy match * issue #SB-15346 fix: in forgot password supporting multi language for fuzzy match
project-sunbird · Oct 31, 2019 · fd4f8c4 · fd4f8c4
1 parent 8f2854e
commit fd4f8c4
Show file tree

Hide file tree

Showing 47 changed files with 3,485 additions and 522 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,20 @@
+version: 2.1
+jobs:
+  build:
+    machine: true
+    steps:
+      - checkout
+      - run: git submodule update --init
+      - run: git submodule update --init --recursive --remote
+      - restore_cache:
+          key: lms-dependency-cache-{{ checksum "pom.xml" }}
+      - run: mvn clean install
+      - save_cache:
+          key: lms-dependency-cache-{{ checksum "pom.xml" }}
+          paths: ~/.m2
+
+workflows:
+  version: 2.1
+  workflow:
+    jobs:
+      - build
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: java
 jdk: openjdk8
 install: echo "Over-riding default script for travis-ci"
+dist: trusty
 script:
   - jdk_switcher use openjdk8
-  - mvn clean package '-Dtest=!%regex[io.opensaber.registry.client.*]' -DfailIfNoTests=false
+  - mvn clean package -q '-Dtest=!%regex[io.opensaber.registry.client.*]' -DfailIfNoTests=false
   - bash <(curl -s https://codecov.io/bash)
 cache:
   directories:

diff --git a/actors/common/src/main/java/org/sunbird/bean/ClaimStatus.java b/actors/common/src/main/java/org/sunbird/bean/ClaimStatus.java
@@ -0,0 +1,26 @@
+package org.sunbird.bean;
+
+
+/**
+ * this class will have user action performed on the shadow user record.
+ * @author anmolgupta
+ *
+ */
+public enum ClaimStatus {
+
+
+    CLAIMED(1),
+    UNCLAIMED(0),
+    REJECTED(2),
+    FAILED(3),
+    MULTIMATCH(4),
+    ORGEXTERNALIDMISMATCH(5);
+
+    private int value;
+    ClaimStatus(int value) {
+        this.value = value;
+    }
+    public int getValue() {
+        return value;
+    }
+}
diff --git a/actors/common/src/main/java/org/sunbird/bean/MigrationUser.java b/actors/common/src/main/java/org/sunbird/bean/MigrationUser.java
@@ -0,0 +1,88 @@
+package org.sunbird.bean;
+
+
+import java.io.Serializable;
+
+public class MigrationUser implements Serializable {
+
+    private String email;
+    private String phone;
+    private String name;
+    private String userExternalId;
+    private String orgExternalId;
+    private String channel;
+    private String inputStatus;
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setUserExternalId(String userExternalId) {
+        this.userExternalId = userExternalId;
+    }
+
+    public void setOrgExternalId(String orgExternalId) {
+        this.orgExternalId = orgExternalId;
+    }
+
+    public void setChannel(String state) {
+        this.channel = state;
+    }
+
+    public void setInputStatus(String inputStatus) {
+        this.inputStatus = inputStatus;
+    }
+
+    public MigrationUser() {
+    }
+
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getUserExternalId() {
+        return userExternalId;
+    }
+
+    public String getOrgExternalId() {
+        return orgExternalId;
+    }
+
+    public String getChannel() {
+        return channel;
+    }
+
+    public String getInputStatus() {
+        return inputStatus;
+    }
+
+    @Override
+    public String toString() {
+        return "MigrationUser{" +
+                "email='" + email + '\'' +
+                ", phone='" + phone + '\'' +
+                ", name='" + name + '\'' +
+                ", userExternalId='" + userExternalId + '\'' +
+                ", orgExternalId='" + orgExternalId + '\'' +
+                ", state='" + channel + '\'' +
+                ", inputStatus=" + inputStatus +
+                '}';
+    }
+}
diff --git a/actors/common/src/main/java/org/sunbird/bean/ShadowUser.java b/actors/common/src/main/java/org/sunbird/bean/ShadowUser.java
@@ -0,0 +1,218 @@
+package org.sunbird.bean;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+
+/**
+ * this is POJO class for the shadow user in the shadow_user table
+ * @author anmolgupta
+ */
+public class ShadowUser {
+    private Timestamp claimedOn;
+    private int claimStatus;
+    private Timestamp createdOn;
+    private String email;
+    private String name;
+    private String orgExtId;
+    private String phone;
+    private String processId;
+    private Timestamp updatedOn;
+    private String userExtId;
+    private String userId;
+    private int userStatus;
+    private List<String>userIds;
+    private String channel;
+    private String addedBy;
+
+    public ShadowUser() {
+    }
+
+    public ShadowUser(ShadowUserBuilder shadowUserBuilder) {
+        this.claimedOn = shadowUserBuilder.claimedOn;
+        this.claimStatus = shadowUserBuilder.claimStatus;
+        this.createdOn = shadowUserBuilder.createdOn;
+        this.email = shadowUserBuilder.email;
+        this.name = shadowUserBuilder.name;
+        this.orgExtId = shadowUserBuilder.orgExtId;
+        this.phone = shadowUserBuilder.phone;
+        this.processId = shadowUserBuilder.processId;
+        this.updatedOn = shadowUserBuilder.updatedOn;
+        this.userExtId = shadowUserBuilder.userExtId;
+        this.userId = shadowUserBuilder.userId;
+        this.userStatus = shadowUserBuilder.userStatus;
+        this.channel=shadowUserBuilder.channel;
+        this.addedBy=shadowUserBuilder.addedBy;
+        this.userIds=shadowUserBuilder.userIds;
+    }
+    public Timestamp getClaimedOn() {
+        return claimedOn;
+    }
+
+    public String getAddedBy() {
+        return addedBy;
+    }
+
+
+    public List<String> getUserIds() {
+        return userIds;
+    }
+
+    public int getClaimStatus() {
+        return claimStatus;
+    }
+
+    public Timestamp getCreatedOn() {
+        return createdOn;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getOrgExtId() {
+        return orgExtId;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public String getProcessId() {
+        return processId;
+    }
+
+    public Timestamp getUpdatedOn() {
+        return updatedOn;
+    }
+
+    public String getUserExtId() {
+        return userExtId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public int getUserStatus() {
+        return userStatus;
+    }
+
+    public String getChannel() {
+        return channel;
+    }
+
+    public static class ShadowUserBuilder{
+
+        private Timestamp claimedOn;
+        private int claimStatus;
+        private Timestamp createdOn;
+        private String email;
+        private String name;
+        private String orgExtId;
+        private String phone;
+        private String processId;
+        private Timestamp updatedOn;
+        private String userExtId;
+        private String userId;
+        private int userStatus;
+        private String channel;
+        private String addedBy;
+        private List<String>userIds;
+
+        public ShadowUserBuilder setUserIds(List<String> userIds) {
+            this.userIds = userIds;
+            return this;
+        }
+
+        public ShadowUserBuilder setAddedBy(String addedBy) {
+            this.addedBy = addedBy;
+            return this;
+        }
+
+        public ShadowUserBuilder setChannel(String channel) {
+            this.channel = channel;
+            return this;
+        }
+
+        public ShadowUserBuilder setClaimedOn(Timestamp claimedOn) {
+            this.claimedOn = claimedOn;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setClaimStatus(int claimStatus) {
+            this.claimStatus = claimStatus;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setCreatedOn(Timestamp createdOn) {
+            this.createdOn = createdOn;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setEmail(String email) {
+            this.email = email;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setName(String name) {
+            this.name = name;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setOrgExtId(String orgExternalId) {
+            this.orgExtId = orgExternalId;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setPhone(String phone) {
+            this.phone = phone;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setProcessId(String processId) {
+            this.processId = processId;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setUpdatedOn(Timestamp updatedOn) {
+            this.updatedOn = updatedOn;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setUserExtId(String userExtId) {
+            this.userExtId = userExtId;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setUserId(String userId) {
+            this.userId = userId;
+            return this;
+
+        }
+
+        public ShadowUserBuilder setUserStatus(int userStatus) {
+            this.userStatus = userStatus;
+            return this;
+        }
+
+        public ShadowUser build(){
+            ShadowUser shadowUser=new ShadowUser(this);
+            return shadowUser;
+        }
+    }
+}