Merge branch 'master' of https://github.com/project-sunbird/sunbird-l…

…ms-mw
project-sunbird · Sep 25, 2017 · 93e9a49 · 93e9a49
2 parents 020f610 + b70654b
commit 93e9a49
Show file tree

Hide file tree

Showing 4 changed files with 529 additions and 69 deletions.
diff --git a/actors/src/main/java/org/sunbird/learner/actors/SchedularActor.java b/actors/src/main/java/org/sunbird/learner/actors/SchedularActor.java
@@ -28,7 +28,7 @@ public SchedularActor() {
   public void onReceive(Object message) throws Throwable {
     if (message instanceof Request) {
       try {
-        ProjectLogger.log("BulkUploadBackGroundJobActor onReceive called");
+        ProjectLogger.log("SchedularActor onReceive called");
         Request actorMessage = (Request) message;
         if (actorMessage.getOperation().equalsIgnoreCase(ActorOperations.SCHEDULE_BULK_UPLOAD.getValue())) {
           schedule(actorMessage);

diff --git a/actors/src/main/java/org/sunbird/learner/actors/UserManagementActor.java b/actors/src/main/java/org/sunbird/learner/actors/UserManagementActor.java
@@ -1813,7 +1813,7 @@ private Map<String, Object> getUserDetails(Request actorMessage) {
   private void blockUser(Request actorMessage) {
 
     ProjectLogger.log("Method call  "+"deleteUser");
-    Util.DbInfo usrDbInfo = Util.dbInfoMap.get(JsonKey.USER_DB);
+    Util.DbInfo usrDbInfo = Util.dbInfoMap.get(JsonKey.USER_DB); 
     Map<String , Object> userMap=(Map<String, Object>) actorMessage.getRequest().get(JsonKey.USER);
     if(ProjectUtil.isNull(userMap.get(JsonKey.USER_ID))) {
       ProjectCommonException exception = new ProjectCommonException(

diff --git a/actors/src/main/resources/cassandra.cql b/actors/src/main/resources/cassandra.cql
@@ -557,4 +557,7 @@ updatedDate text, updatedBy text, isDeleted boolean, PRIMARY KEY (id));
 
 CREATE INDEX inx_un_userId ON sunbird.user_notes(userId);
 CREATE INDEX inx_un_courseId ON sunbird.user_notes(courseId);
-CREATE INDEX inx_un_contentId ON sunbird.user_notes(contentId);
+CREATE INDEX inx_un_contentId ON sunbird.user_notes(contentId);
+
+//Sept 25th 2017
+ALTER TABLE sunbird.user ADD createdBy text;