Issue SB-1 feat : code merge.

project-sunbird · Oct 30, 2017 · 5756293 · 5756293
2 parents 67ec644 + 42507b8
commit 5756293
Show file tree

Hide file tree

Showing 20 changed files with 55 additions and 35 deletions.
diff --git a/actors/libs b/actors/libs
diff --git a/actors/src/main/java/org/sunbird/learner/Application.java b/actors/src/main/java/org/sunbird/learner/Application.java
@@ -56,7 +56,8 @@ private static void startRemoteActorSystem() {
 
 
   public static void checkCassandraConnection() {
-    Util.checkCassandraDbConnections();
+    Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
+    Util.checkCassandraDbConnections(JsonKey.SUNBIRD_PLUGIN);
     SchedulerManager.schedule();
   }
 

diff --git a/actors/src/main/java/org/sunbird/learner/actors/syncjobmanager/EsSyncActor.java b/actors/src/main/java/org/sunbird/learner/actors/syncjobmanager/EsSyncActor.java
@@ -167,6 +167,7 @@ private String getType(String objectType) {
   private Map<String, Object> getOrgDetails(Entry<String, Object> entry) {
     ProjectLogger.log("fetching org data started");
     Map<String, Object> orgMap = (Map<String, Object>) entry.getValue();
+    orgMap.remove(JsonKey.ORG_TYPE);
     if (orgMap.containsKey(JsonKey.ADDRESS_ID)
         && !ProjectUtil.isStringNullOREmpty((String) orgMap.get(JsonKey.ADDRESS_ID))) {
       orgMap.put(JsonKey.ADDRESS, getDetailsById(Util.dbInfoMap.get(JsonKey.ADDRESS_DB),

diff --git a/actors/src/main/java/org/sunbird/learner/util/DataCacheHandler.java b/actors/src/main/java/org/sunbird/learner/util/DataCacheHandler.java
@@ -10,6 +10,7 @@
 import org.sunbird.common.models.response.Response;
 import org.sunbird.common.models.util.JsonKey;
 import org.sunbird.common.models.util.ProjectLogger;
+import org.sunbird.common.models.util.ProjectUtil;
 import org.sunbird.helper.ServiceFactory;
 
 /**
@@ -27,6 +28,7 @@ public class DataCacheHandler implements Runnable {
   private static Map<String, Object> roleMap = new ConcurrentHashMap<>();
   private static Map<String, String> orgTypeMap = new ConcurrentHashMap<>();
   CassandraOperation cassandraOperation = ServiceFactory.getInstance();
+  private static final String KEY_SPACE_NAME = "sunbird";
 
   @Override
   public void run() {
@@ -39,7 +41,7 @@ public void run() {
 
   private void orgTypeCache(Map<String, String> orgTypeMap) {
     Response response =
-        cassandraOperation.getAllRecords(Util.getProperty("db.keyspace"), JsonKey.ORG_TYPE_DB);
+        cassandraOperation.getAllRecords(KEY_SPACE_NAME, JsonKey.ORG_TYPE_DB);
     List<Map<String, Object>> responseList =
         (List<Map<String, Object>>) response.get(JsonKey.RESPONSE);
     if (null != responseList && !responseList.isEmpty()) {
@@ -51,7 +53,7 @@ private void orgTypeCache(Map<String, String> orgTypeMap) {
 
   private void roleCache(Map<String, Object> roleMap) {
     Response response =
-        cassandraOperation.getAllRecords(Util.getProperty("db.keyspace"), JsonKey.ROLE_GROUP);
+        cassandraOperation.getAllRecords(KEY_SPACE_NAME, JsonKey.ROLE_GROUP);
     List<Map<String, Object>> responseList =
         (List<Map<String, Object>>) response.get(JsonKey.RESPONSE);
     if (null != responseList && !responseList.isEmpty()) {
@@ -60,7 +62,7 @@ private void roleCache(Map<String, Object> roleMap) {
       }
     }
     Response response2 =
-        cassandraOperation.getAllRecords(Util.getProperty("db.keyspace"), JsonKey.ROLE);
+        cassandraOperation.getAllRecords(KEY_SPACE_NAME, JsonKey.ROLE);
     List<Map<String, Object>> responseList2 =
         (List<Map<String, Object>>) response2.get(JsonKey.RESPONSE);
     if (null != responseList2 && !responseList2.isEmpty()) {
@@ -74,7 +76,7 @@ private void roleCache(Map<String, Object> roleMap) {
   private void cache(Map<String, Map<String, Object>> map, String tableName) {
     try {
       Response response =
-          cassandraOperation.getAllRecords(Util.getProperty("db.keyspace"), tableName);
+          cassandraOperation.getAllRecords(KEY_SPACE_NAME, tableName);
       List<Map<String, Object>> responseList =
           (List<Map<String, Object>>) response.get(JsonKey.RESPONSE);
       if (null != responseList && !responseList.isEmpty()) {
@@ -88,6 +90,8 @@ private void cache(Map<String, Map<String, Object>> map, String tableName) {
           }
         }
       }
+      ProjectLogger.log("pagemap size" +map.size());
+      ProjectLogger.log("pagemap keyset "+map.keySet());
     } catch (Exception e) {
       ProjectLogger.log(e.getMessage(), e);
     }

diff --git a/actors/src/main/java/org/sunbird/learner/util/Util.java b/actors/src/main/java/org/sunbird/learner/util/Util.java
@@ -181,30 +181,30 @@ public static boolean checkOrgStatusTransition(Integer currentState , Integer ne
      * provided environment variable , if environment variable values 
      * are not set then connection will be established from property file.
      */
-    public static void checkCassandraDbConnections() {
+    public static void checkCassandraDbConnections(String keySpace) {
 
       PropertiesCache propertiesCache = PropertiesCache.getInstance();
 
       String cassandraMode = propertiesCache.getProperty(JsonKey.SUNBIRD_CASSANDRA_MODE);
       if (ProjectUtil.isStringNullOREmpty(cassandraMode) || cassandraMode
           .equalsIgnoreCase(JsonKey.EMBEDDED_MODE)) {
 
-          // configure the Embeddee mode and return true here ....
+          // configure the Embedded mode and return true here ....
           CassandraConnectionManager cassandraConnectionManager = CassandraConnectionMngrFactory
               .getObject(cassandraMode);
-          boolean result = cassandraConnectionManager.createConnection(null , null , null ,null, KEY_SPACE_NAME);
+          boolean result = cassandraConnectionManager.createConnection(null , null , null ,null, keySpace);
         if (result) {
           ProjectLogger
               .log("CONNECTION CREATED SUCCESSFULLY FOR IP:" + " : KEYSPACE :"
-                      + KEY_SPACE_NAME,
+                      + keySpace,
                   LoggerEnum.INFO.name());
         } else {
           ProjectLogger
-              .log("CONNECTION CREATION FAILED FOR IP: " +  " : KEYSPACE :" + KEY_SPACE_NAME);
+              .log("CONNECTION CREATION FAILED FOR IP: " +  " : KEYSPACE :" + keySpace);
         }
 
         } else if (cassandraMode.equalsIgnoreCase(JsonKey.STANDALONE_MODE)) {
-          if (readConfigFromEnv()) {
+          if (readConfigFromEnv(keySpace)) {
             ProjectLogger.log("db connection is created from System env variable.");
             return;
           }
@@ -249,7 +249,7 @@ public static void checkCassandraDbConnections() {
      * This method will read the configuration from System variable.
      * @return boolean
      */
-    public static boolean readConfigFromEnv() {
+    public static boolean readConfigFromEnv(String keyspace) {
         boolean response = false;
         String ips = System.getenv(JsonKey.SUNBIRD_CASSANDRA_IP);
         String envPort = System.getenv(JsonKey.SUNBIRD_CASSANDRA_PORT);
@@ -267,11 +267,11 @@ public static boolean readConfigFromEnv() {
             String ip = ipList[i];
             String port = portList[i];
             try {
-                boolean result = cassandraConnectionManager.createConnection(ip, port, userName, password, KEY_SPACE_NAME);
+                boolean result = cassandraConnectionManager.createConnection(ip, port, userName, password, keyspace);
                 if (result) {
-                    ProjectLogger.log("CONNECTION CREATED SUCCESSFULLY FOR IP: " + ip + " : KEYSPACE :" + KEY_SPACE_NAME, LoggerEnum.INFO.name());
+                    ProjectLogger.log("CONNECTION CREATED SUCCESSFULLY FOR IP: " + ip + " : KEYSPACE :" + keyspace, LoggerEnum.INFO.name());
                 } else {
-                    ProjectLogger.log("CONNECTION CREATION FAILED FOR IP: " + ip + " : KEYSPACE :" + KEY_SPACE_NAME, LoggerEnum.INFO.name());
+                    ProjectLogger.log("CONNECTION CREATION FAILED FOR IP: " + ip + " : KEYSPACE :" + keyspace, LoggerEnum.INFO.name());
                 }
                 response = true;
             } catch (ProjectCommonException ex) {
@@ -598,7 +598,8 @@ public static String validateRoles(List<String> roleList){
 
   public static void main(String[] args) {
     System.out.println("MAIN STARTED");
-    checkCassandraDbConnections();
+    checkCassandraDbConnections(JsonKey.SUNBIRD);
+    checkCassandraDbConnections(JsonKey.SUNBIRD_PLUGIN);
     System.out.println("MAIN END");
   }
 

diff --git a/actors/src/main/resources/cassandra.cql b/actors/src/main/resources/cassandra.cql
@@ -607,3 +607,16 @@ ALTER TABLE sunbird.user ADD tcupdatedat text;
 
 
 
+
+
+
+
+//Announcement apis -27th Oct
+CREATE KEYSPACE IF NOT EXISTS sunbirdplugin WITH replication = {'class':'SimpleStrategy','replication_factor':1};
+//CREATE TYPE IF NOT EXISTS sunbirdplugin.attachment (id text,filename text,mimetype text);
+CREATE TABLE sunbirdplugin.announcement (id text,userid text,sourceid text,details map<text, text>,links list<text>,attachments list<text>,target text,sentcount int,priority text,expiry text,status text,createddate text,updateddate text, PRIMARY KEY (id));
+CREATE TABLE sunbirdplugin.attachment (id text,file text,filename text,mimetype text,createdby text,status text,createddate text, PRIMARY KEY (id));
+CREATE TABLE sunbirdplugin.metrics (id text,userid text,announcementid text,activity text,channel text,createddate text, PRIMARY KEY (id));
+CREATE TABLE sunbirdplugin.announcementtype (id text,rootorgid text,name text,status text,createddate text, PRIMARY KEY (id));
+CREATE TABLE sunbirdplugin.announcementauth (id text,userid text,rootorgid text,permissions map<text, text>,status text,createddate text, PRIMARY KEY (id));
+
diff --git a/actors/src/test/java/org/sunbird/learner/actors/AssessmentItemActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/AssessmentItemActorTest.java
@@ -32,7 +32,7 @@ public class AssessmentItemActorTest {
     @BeforeClass
     public static void setUp() {
         system = ActorSystem.create("system");
-        Util.checkCassandraDbConnections();
+        Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
         ref = TestActorRef.create(system, props, "testActor");
     }
 

diff --git a/actors/src/test/java/org/sunbird/learner/actors/CourseEnrollmentActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/CourseEnrollmentActorTest.java
@@ -55,7 +55,7 @@ public class CourseEnrollmentActorTest {
   @BeforeClass
   public static void setUp() {
     system = ActorSystem.create("system");
-    Util.checkCassandraDbConnections();
+    Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
     userCoursesdbInfo = Util.dbInfoMap.get(JsonKey.LEARNER_COURSE_DB);
     //PowerMockito.mockStatic(EkStepRequestUtil.class);
     insertBatch();

diff --git a/actors/src/test/java/org/sunbird/learner/actors/CourseManagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/CourseManagementActorTest.java
@@ -31,7 +31,7 @@ public class CourseManagementActorTest {
     //@BeforeClass
     public static void setUp() {
         system = ActorSystem.create("system");
-        Util.checkCassandraDbConnections();
+        Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
         ref = TestActorRef.create(system, props, "testActor");
         courseManagementActor = ref.underlyingActor();
     }

diff --git a/actors/src/test/java/org/sunbird/learner/actors/CourseSearchActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/CourseSearchActorTest.java
@@ -32,7 +32,7 @@ public class CourseSearchActorTest {
     @BeforeClass
     public static void setUp() {
         system = ActorSystem.create("system");
-        Util.checkCassandraDbConnections();
+        Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
     }
 
     //@Test

diff --git a/actors/src/test/java/org/sunbird/learner/actors/LearnerStateActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/LearnerStateActorTest.java
@@ -44,7 +44,7 @@ public class LearnerStateActorTest {
     @BeforeClass
     public static void setUp() {
         system = ActorSystem.create("system");
-        Util.checkCassandraDbConnections();
+        Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
         ref = TestActorRef.create(system, props, "testActor");
         insertCourse();
         insertContent();

diff --git a/actors/src/test/java/org/sunbird/learner/actors/LearnerStateUpdateActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/LearnerStateUpdateActorTest.java
@@ -49,7 +49,7 @@ public class LearnerStateUpdateActorTest {
     @BeforeClass
     public static void setUp() {
         system = ActorSystem.create("system");
-        Util.checkCassandraDbConnections();
+        Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
         insertCourse();
         insertBatch();
     }

diff --git a/actors/src/test/java/org/sunbird/learner/actors/NotesManagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/NotesManagementActorTest.java
@@ -55,7 +55,7 @@ public class NotesManagementActorTest {
   public static void setUp() {
     system = ActorSystem.create("system");
     ref = TestActorRef.create(system, props, "testActor");
-    Util.checkCassandraDbConnections();
+    Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
     insertUserDataToES();
   }
   /**

diff --git a/actors/src/test/java/org/sunbird/learner/actors/OrganisationManagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/OrganisationManagementActorTest.java
@@ -62,7 +62,7 @@ public class OrganisationManagementActorTest {
     public static void setUp() {
         Application.startLocalActorSystem();
         system = ActorSystem.create("system");
-        Util.checkCassandraDbConnections();
+        Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
         userManagementDB = Util.dbInfoMap.get(JsonKey.USER_DB);
         addressDB = Util.dbInfoMap.get(JsonKey.ADDRESS_DB);
         orgTypeDbInfo = Util.dbInfoMap.get(JsonKey.ORG_TYPE_DB);
@@ -193,8 +193,8 @@ public void test13CreateOrgWithSourceAndExternalIdSuc(){
       orgMap.put(JsonKey.ORGANISATION_NAME , "CBSE");
       orgMap.put(JsonKey.DESCRIPTION, "Central Board of Secondary Education");
       orgMap.put("orgCode", "CBSE");
-      orgMap.put(JsonKey.PROVIDER, "pr0001");
-      orgMap.put(JsonKey.EXTERNAL_ID, "ex0001");
+      orgMap.put(JsonKey.PROVIDER, "pr00001");
+      orgMap.put(JsonKey.EXTERNAL_ID, "ex00001");
      // orgMap.put("channel", "test1");
       innerMap.put(JsonKey.ORGANISATION , orgMap);
 
@@ -223,8 +223,8 @@ public void test14CreateOrgWithSameSourceAndExternalIdExc(){
       orgMap.put(JsonKey.ORGANISATION_NAME , "CBSE");
       orgMap.put(JsonKey.DESCRIPTION, "Central Board of Secondary Education");
       orgMap.put("orgCode", "CBSE");
-      orgMap.put(JsonKey.PROVIDER, "pr0001");
-      orgMap.put(JsonKey.EXTERNAL_ID, "ex0001");
+      orgMap.put(JsonKey.PROVIDER, "pr00001");
+      orgMap.put(JsonKey.EXTERNAL_ID, "ex00001");
       orgMap.put("channel", "test");
       innerMap.put(JsonKey.ORGANISATION , orgMap);
 

diff --git a/actors/src/test/java/org/sunbird/learner/actors/PageManagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/PageManagementActorTest.java
@@ -50,7 +50,7 @@ public class PageManagementActorTest {
     @BeforeClass
     public static void setUp() {
         system = ActorSystem.create("system");
-        Util.checkCassandraDbConnections();
+        Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
         pageMgmntDbInfo = Util.dbInfoMap.get(JsonKey.PAGE_MGMT_DB);
         pageSectionDbInfo = Util.dbInfoMap.get(JsonKey.PAGE_SECTION_DB);
     }

diff --git a/actors/src/test/java/org/sunbird/learner/actors/UserManagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/UserManagementActorTest.java
@@ -74,7 +74,7 @@ public static void setUp() {
     Application.startLocalActorSystem();
     encryption = PropertiesCache.getInstance().getProperty(JsonKey.SUNBIRD_ENCRYPTION);
     system = ActorSystem.create("system");
-    Util.checkCassandraDbConnections();
+    Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
     userManagementDB = Util.dbInfoMap.get(JsonKey.USER_DB);
     addressDB = Util.dbInfoMap.get(JsonKey.ADDRESS_DB);
     jobDB = Util.dbInfoMap.get(JsonKey.JOB_PROFILE_DB);

diff --git a/actors/src/test/java/org/sunbird/learner/actors/recommend/RecommendorActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/recommend/RecommendorActorTest.java
@@ -29,7 +29,7 @@ public class RecommendorActorTest {
     @BeforeClass
     public static void setUp() {
         system = ActorSystem.create("system");
-        Util.checkCassandraDbConnections();
+        Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
     }
 
     @Test()

diff --git a/actors/src/test/java/org/sunbird/learner/actors/skill/SkillmanagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/skill/SkillmanagementActorTest.java
@@ -56,7 +56,7 @@ public static void setUp(){
     system = ActorSystem.create("system");
 
     skillsList.add("Java");
-    Util.checkCassandraDbConnections();
+    Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
     insertUserDataInCassandraAndEs();
 
   }

diff --git a/actors/src/test/java/org/sunbird/learner/audit/AuditLogServiceImplTest.java b/actors/src/test/java/org/sunbird/learner/audit/AuditLogServiceImplTest.java
@@ -46,7 +46,7 @@ public class AuditLogServiceImplTest {
   @BeforeClass
   public static void setUp() {
     system = ActorSystem.create("system");
-    Util.checkCassandraDbConnections();
+    Util.checkCassandraDbConnections(JsonKey.SUNBIRD);
   }
 
   @SuppressWarnings({"deprecation", "unchecked"})

diff --git a/actors/src/test/resources/dbconfig.properties b/actors/src/test/resources/dbconfig.properties
@@ -2,4 +2,4 @@ db.ip=127.0.0.1
 db.port=9042
 db.username=cassandra
 db.password=password
-db.keyspace=sunbird
+db.keyspace=sunbird,sunbirdplugin