diff --git a/controller/app/controllers/BaseController.java b/controller/app/controllers/BaseController.java
index 3c83de23260d354ee8a7648a88deacb1b287feb4..2a2b395b8ff47a3f1b4c8558312652293b98d3e7 100644
--- a/controller/app/controllers/BaseController.java
+++ b/controller/app/controllers/BaseController.java
@@ -842,27 +842,30 @@ public class BaseController extends Controller {
reqObj.setRequestId(Common.getFromRequest(httpReq, Attrs.X_REQUEST_ID));
reqObj.getContext().putAll((Map<String, Object>) requestInfo.get(JsonKey.CONTEXT));
reqObj.getContext().putAll((Map<String, Object>) requestInfo.get(JsonKey.ADDITIONAL_INFO));
- reqObj.setRequestContext(
- getRequestContext(
- (Map<String, Object>) requestInfo.get(JsonKey.CONTEXT), reqObj.getOperation()));
+ reqObj.setRequestContext(getRequestContext(requestInfo, reqObj.getOperation()));
} catch (Exception ex) {
ProjectCommonException.throwServerErrorException(ResponseCode.SERVER_ERROR);
}
}
- private RequestContext getRequestContext(Map<String, Object> context, String actorOperation) {
- return new RequestContext(
- (String) context.get(JsonKey.ACTOR_ID),
- (String) context.get(JsonKey.DEVICE_ID),
- (String) context.get(JsonKey.X_Session_ID),
- (String) context.get(JsonKey.APP_ID),
- (String) context.get(JsonKey.X_APP_VERSION),
- (String) context.get(JsonKey.X_REQUEST_ID),
- (String)
- ((context.get(JsonKey.X_TRACE_ENABLED) != null)
- ? context.get(JsonKey.X_TRACE_ENABLED)
- : debugEnabled),
- actorOperation);
+ private RequestContext getRequestContext(Map<String, Object> requestInfo, String actorOperation) {
+ Map<String, Object> context = (Map<String, Object>) requestInfo.get(JsonKey.CONTEXT);
+ RequestContext requestContext =
+ new RequestContext(
+ (String) context.get(JsonKey.ACTOR_ID),
+ (String) context.get(JsonKey.DEVICE_ID),
+ (String) context.get(JsonKey.X_Session_ID),
+ (String) context.get(JsonKey.APP_ID),
+ (String) context.get(JsonKey.X_APP_VERSION),
+ (String) context.get(JsonKey.X_REQUEST_ID),
+ (String) context.get(JsonKey.X_Source),
+ (String)
+ ((context.get(JsonKey.X_TRACE_ENABLED) != null)
+ ? context.get(JsonKey.X_TRACE_ENABLED)
+ : debugEnabled),
+ actorOperation);
+ requestContext.setTelemetryContext(requestInfo);
+ return requestContext;
}
public Map<String, String> getAllRequestHeaders(Request request) {
diff --git a/controller/app/controllers/usermanagement/UserController.java b/controller/app/controllers/usermanagement/UserController.java
index d88036c7692b0a76d79c203c0d891df447e24484..5a0455363d3a82091fea3cb20be7969de1795d68 100644
--- a/controller/app/controllers/usermanagement/UserController.java
+++ b/controller/app/controllers/usermanagement/UserController.java
@@ -203,28 +203,30 @@ public class UserController extends BaseController {
true,
httpRequest);
}
+
public CompletionStage<Result> updateUserV3(Http.Request httpRequest) {
return handleRequest(
userUpdateActor,
ActorOperations.UPDATE_USER_V3.getValue(),
httpRequest.body().asJson(),
req -> {
- Request request = (Request) req;
- request
- .getContext()
- .put(JsonKey.USER_ID, Common.getFromRequest(httpRequest, Attrs.USER_ID));
- new UserRequestValidator().validateUpdateUserRequestV3(request);
- request
- .getContext()
- .put(JsonKey.IS_AUTH_REQ, Common.getFromRequest(httpRequest, Attrs.IS_AUTH_REQ));
-
- return null;
+ Request request = (Request) req;
+ request
+ .getContext()
+ .put(JsonKey.USER_ID, Common.getFromRequest(httpRequest, Attrs.USER_ID));
+ new UserRequestValidator().validateUpdateUserRequestV3(request);
+ request
+ .getContext()
+ .put(JsonKey.IS_AUTH_REQ, Common.getFromRequest(httpRequest, Attrs.IS_AUTH_REQ));
+
+ return null;
},
null,
null,
true,
httpRequest);
}
+
public CompletionStage<Result> getUserByIdV3(String userId, Http.Request httpRequest) {
return handleGetUserProfileV3(
ActorOperations.GET_USER_PROFILE_V3.getValue(),
diff --git a/controller/test/controllers/usermanagement/UserControllerTest.java b/controller/test/controllers/usermanagement/UserControllerTest.java
index 69525969bd1a1ca488e5127a4d02ad58bf17cb70..110f012f8295b2c00e52c5c03f77fe335951d523 100644
--- a/controller/test/controllers/usermanagement/UserControllerTest.java
+++ b/controller/test/controllers/usermanagement/UserControllerTest.java
@@ -9,11 +9,7 @@ import controllers.BaseApplicationTest;
import controllers.DummyActor;
import controllers.TestUtil;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import modules.OnRequestHandler;
import org.apache.commons.lang3.StringUtils;
import org.junit.Before;
@@ -264,10 +260,10 @@ public class UserControllerTest extends BaseApplicationTest {
@Test
public void testUpdateUserV3Success() throws Exception {
Result result =
- performTest(
- "/v3/user/update",
- "PATCH",
- (Map) createOrUpdateUserRequest(null, phoneNumber, userId, true, null));
+ performTest(
+ "/v3/user/update",
+ "PATCH",
+ (Map) createOrUpdateUserRequest(null, phoneNumber, userId, true, null));
assertEquals(getResponseCode(result), ResponseCode.success.getErrorCode().toLowerCase());
assertTrue(getResponseStatus(result) == 200);
}
diff --git a/core/platform-common/src/main/java/org/sunbird/exception/ResponseCode.java b/core/platform-common/src/main/java/org/sunbird/exception/ResponseCode.java
index 109d8a450b85e58fb1262698476c9569fa6f5b8e..3bcb56ecd74cdedbd0420ed9063d4f9eaf08b91d 100644
--- a/core/platform-common/src/main/java/org/sunbird/exception/ResponseCode.java
+++ b/core/platform-common/src/main/java/org/sunbird/exception/ResponseCode.java
@@ -61,7 +61,9 @@ public enum ResponseCode {
ResponseMessage.Key.ERROR_ATTRIBUTE_CONFLICT,
ResponseMessage.Message.ERROR_ATTRIBUTE_CONFLICT),
rolesRequired(ResponseMessage.Key.ROLES_MISSING, ResponseMessage.Message.ROLES_MISSING),
- profileUserTypesRequired(ResponseMessage.Key.PROFILE_USER_TYPES_MISSING, ResponseMessage.Message.PROFILE_USER_TYPES_MISSING),
+ profileUserTypesRequired(
+ ResponseMessage.Key.PROFILE_USER_TYPES_MISSING,
+ ResponseMessage.Message.PROFILE_USER_TYPES_MISSING),
emptyRolesProvided(
ResponseMessage.Key.EMPTY_ROLES_PROVIDED, ResponseMessage.Message.EMPTY_ROLES_PROVIDED),
contentTypeRequiredError(
diff --git a/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java b/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
index 5c9ed8eff4b2c42f33b09bef7276e0a9c3b41bcf..0b904c1e3c7bcc7468840b0459035f3471290d8d 100644
--- a/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
+++ b/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
@@ -602,6 +602,7 @@ public final class JsonKey {
public static final String OTP_CONTACT_UPDATE_TEMPLATE_SMS = "otpContactUpdateTemplateSms";
public static final String CONTACT_DETAILS_UPDATE_VERIFICATION_SUBJECT =
"OTP to edit Diksha Profile";
+ public static final String X_Source = "x-source";
private JsonKey() {}
}
diff --git a/core/platform-common/src/main/java/org/sunbird/logging/LoggerUtil.java b/core/platform-common/src/main/java/org/sunbird/logging/LoggerUtil.java
index 6bf9018d00c982ccbf00f85ae92efb104a942f27..aabfc6c52d44e9c1096eaab7ff2be0379c05513e 100644
--- a/core/platform-common/src/main/java/org/sunbird/logging/LoggerUtil.java
+++ b/core/platform-common/src/main/java/org/sunbird/logging/LoggerUtil.java
@@ -1,5 +1,6 @@
package org.sunbird.logging;
+import java.util.HashMap;
import java.util.Map;
import net.logstash.logback.marker.Markers;
import org.apache.commons.lang3.StringUtils;
@@ -34,10 +35,17 @@ public class LoggerUtil {
}
public void error(RequestContext requestContext, String message, Throwable e) {
- if (null != requestContext) {
- logger.error(Markers.appendEntries(requestContext.getContextMap()), message, e);
+ if (requestContext != null) {
+ Map<String, Object> context =
+ (Map<String, Object>) requestContext.getTelemetryContext().get(JsonKey.CONTEXT);
+ Map<String, Object> params = new HashMap<>();
+ params.put(JsonKey.ERR_TYPE, JsonKey.API_ACCESS);
+ Map<String, Object> telemetryInfo = new HashMap<>();
+ telemetryInfo.put(JsonKey.CONTEXT, context);
+ telemetryInfo.put(JsonKey.PARAMS, params);
+ error(requestContext, message, e, telemetryInfo);
} else {
- logger.error(message, e);
+ error(message, e);
}
}
@@ -50,12 +58,8 @@ public class LoggerUtil {
String message,
Throwable e,
Map<String, Object> telemetryInfo) {
- if (null != requestContext) {
- logger.error(Markers.appendEntries(requestContext.getContextMap()), message, e);
- } else {
- logger.error(message, e);
- }
- telemetryProcess(requestContext, telemetryInfo, e);
+
+ telemetryProcess(requestContext, telemetryInfo, e, message);
}
public void warn(RequestContext requestContext, String message, Throwable e) {
@@ -84,7 +88,10 @@ public class LoggerUtil {
}
private void telemetryProcess(
- RequestContext requestContext, Map<String, Object> telemetryInfo, Throwable e) {
+ RequestContext requestContext,
+ Map<String, Object> telemetryInfo,
+ Throwable e,
+ String message) {
ProjectCommonException projectCommonException = null;
if (e instanceof ProjectCommonException) {
projectCommonException = (ProjectCommonException) e;
@@ -101,13 +108,13 @@ public class LoggerUtil {
Map<String, Object> params = (Map<String, Object>) telemetryInfo.get(JsonKey.PARAMS);
params.put(JsonKey.ERROR, projectCommonException.getCode());
- params.put(JsonKey.STACKTRACE, generateStackTrace(e.getStackTrace()));
+ params.put(JsonKey.STACKTRACE, generateStackTrace(e.getStackTrace(), message));
request.setRequest(telemetryInfo);
TelemetryWriter.write(request);
}
- private String generateStackTrace(StackTraceElement[] elements) {
- StringBuilder builder = new StringBuilder("");
+ private String generateStackTrace(StackTraceElement[] elements, String errMsg) {
+ StringBuilder builder = new StringBuilder(errMsg + " ");
for (StackTraceElement element : elements) {
builder.append(element.toString());
}
diff --git a/core/platform-common/src/main/java/org/sunbird/request/HeaderParam.java b/core/platform-common/src/main/java/org/sunbird/request/HeaderParam.java
index 98ca285454f30d80f3270d1518cff45ca782f093..773fc3d8a21fe1dac1a71021d4023ca791c08398 100644
--- a/core/platform-common/src/main/java/org/sunbird/request/HeaderParam.java
+++ b/core/platform-common/src/main/java/org/sunbird/request/HeaderParam.java
@@ -34,6 +34,8 @@ public enum HeaderParam {
X_REQUEST_ID("x-request-id"),
X_TRACE_ENABLED("x-trace-enabled"),
X_APP_VERSION("x-app-ver"),
+ X_APP_VERSION_PORTAL("x-app-version"),
+ X_SOURCE("x-source"),
X_Response_Length("x-response-length");
/** name of the parameter */
private String name;
diff --git a/core/platform-common/src/main/java/org/sunbird/request/RequestContext.java b/core/platform-common/src/main/java/org/sunbird/request/RequestContext.java
index 553d136efb80d346a74bade1cc5e589e0317a153..d5f8a2fc99fd7a6e61ff9748a727dba47cba012a 100644
--- a/core/platform-common/src/main/java/org/sunbird/request/RequestContext.java
+++ b/core/platform-common/src/main/java/org/sunbird/request/RequestContext.java
@@ -12,7 +12,9 @@ public class RequestContext {
private String reqId;
private String debugEnabled;
private String op;
+ private String source;
private Map<String, Object> contextMap = new HashMap<>();
+ private Map<String, Object> telemetryContext = new HashMap<>();
public RequestContext() {}
@@ -23,6 +25,7 @@ public class RequestContext {
String appId,
String appVer,
String reqId,
+ String source,
String debugEnabled,
String op) {
super();
@@ -32,6 +35,7 @@ public class RequestContext {
this.appId = appId;
this.appVer = appVer;
this.reqId = reqId;
+ this.source = source;
this.debugEnabled = debugEnabled;
this.op = op;
@@ -41,6 +45,7 @@ public class RequestContext {
contextMap.put("appId", appId);
contextMap.put("appVer", appVer);
contextMap.put("reqId", reqId);
+ contextMap.put("source", source);
contextMap.put("op", op);
}
@@ -111,4 +116,12 @@ public class RequestContext {
public Map<String, Object> getContextMap() {
return contextMap;
}
+
+ public Map<String, Object> getTelemetryContext() {
+ return telemetryContext;
+ }
+
+ public void setTelemetryContext(Map<String, Object> telemetryContext) {
+ this.telemetryContext = telemetryContext;
+ }
}
diff --git a/core/platform-common/src/main/java/org/sunbird/telemetry/util/TelemetryGenerator.java b/core/platform-common/src/main/java/org/sunbird/telemetry/util/TelemetryGenerator.java
index 60d53c607422c0baeac95247e63c2ca79175ebb8..c3711c423fb42ff6bc08474c2ba4fd0dc85c058f 100644
--- a/core/platform-common/src/main/java/org/sunbird/telemetry/util/TelemetryGenerator.java
+++ b/core/platform-common/src/main/java/org/sunbird/telemetry/util/TelemetryGenerator.java
@@ -1,22 +1,13 @@
package org.sunbird.telemetry.util;
import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.sunbird.keys.JsonKey;
import org.sunbird.logging.LoggerUtil;
-import org.sunbird.telemetry.dto.Actor;
-import org.sunbird.telemetry.dto.Context;
-import org.sunbird.telemetry.dto.Producer;
-import org.sunbird.telemetry.dto.Target;
-import org.sunbird.telemetry.dto.Telemetry;
-import org.sunbird.telemetry.dto.TelemetryEnvKey;
+import org.sunbird.telemetry.dto.*;
import org.sunbird.util.ProjectUtil;
/**
@@ -336,21 +327,22 @@ public class TelemetryGenerator {
eventContext.getCdata().add(map);
}
- Map<String, Object> edata = generateErrorEdata(params);
+ Map<String, Object> edata = generateErrorEdata(params, reqId);
Telemetry telemetry =
new Telemetry(TelemetryEvents.ERROR.getName(), actor, eventContext, edata);
telemetry.setMid(reqId);
return getTelemetry(telemetry);
}
- private static Map<String, Object> generateErrorEdata(Map<String, Object> params) {
+ private static Map<String, Object> generateErrorEdata(Map<String, Object> params, String reqId) {
Map<String, Object> edata = new HashMap<>();
String error = (String) params.get(JsonKey.ERROR);
String errorType = (String) params.get(JsonKey.ERR_TYPE);
String stackTrace = (String) params.get(JsonKey.STACKTRACE);
edata.put(JsonKey.ERROR, error);
edata.put(JsonKey.ERR_TYPE, errorType);
- edata.put(JsonKey.STACKTRACE, ProjectUtil.getFirstNCharacterString(stackTrace, 100));
+ edata.put(JsonKey.REQUEST_ID, reqId);
+ edata.put(JsonKey.STACKTRACE, ProjectUtil.getFirstNCharacterString(stackTrace, 2048));
return edata;
}
diff --git a/service/src/main/java/org/sunbird/actor/feed/UserFeedActor.java b/service/src/main/java/org/sunbird/actor/feed/UserFeedActor.java
index 87516f4d3272c2389156a19138403ff548121cc2..b3de8dacde5d395d8d0b3f59295c881e2cc190a9 100644
--- a/service/src/main/java/org/sunbird/actor/feed/UserFeedActor.java
+++ b/service/src/main/java/org/sunbird/actor/feed/UserFeedActor.java
@@ -1,8 +1,7 @@
package org.sunbird.actor.feed;
-import java.util.*;
-
import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.*;
import org.sunbird.actor.core.BaseActor;
import org.sunbird.keys.JsonKey;
import org.sunbird.model.user.Feed;
@@ -20,6 +19,7 @@ public class UserFeedActor extends BaseActor {
private final IFeedService feedService = FeedFactory.getInstance();
ObjectMapper mapper = new ObjectMapper();
+
@Override
public void onReceive(Request request) throws Throwable {
Util.initializeContext(request, TelemetryEnvKey.USER);
@@ -70,7 +70,7 @@ public class UserFeedActor extends BaseActor {
feedList.sort(Comparator.comparing(Feed::getCreatedOn));
Feed delRecord = feedList.get(0);
feedService.delete(
- delRecord.getId(), delRecord.getUserId(), delRecord.getCategory(), context);
+ delRecord.getId(), delRecord.getUserId(), delRecord.getCategory(), context);
}
}
@@ -78,10 +78,10 @@ public class UserFeedActor extends BaseActor {
Response feedDeleteResponse = new Response();
Map<String, Object> deleteRequest = request.getRequest();
feedService.delete(
- (String) deleteRequest.get(JsonKey.FEED_ID),
- (String) deleteRequest.get(JsonKey.USER_ID),
- (String) deleteRequest.get(JsonKey.CATEGORY),
- context);
+ (String) deleteRequest.get(JsonKey.FEED_ID),
+ (String) deleteRequest.get(JsonKey.USER_ID),
+ (String) deleteRequest.get(JsonKey.CATEGORY),
+ context);
feedDeleteResponse.getResult().put(JsonKey.RESPONSE, JsonKey.SUCCESS);
sender().tell(feedDeleteResponse, self());
}
diff --git a/service/src/main/java/org/sunbird/actor/user/TenantMigrationActor.java b/service/src/main/java/org/sunbird/actor/user/TenantMigrationActor.java
index 1af078ed7fdaf85e71693181aebdf6ee7491e0bb..291502dc7fee0764b93a3dd331c465786c7d45b5 100644
--- a/service/src/main/java/org/sunbird/actor/user/TenantMigrationActor.java
+++ b/service/src/main/java/org/sunbird/actor/user/TenantMigrationActor.java
@@ -57,6 +57,7 @@ public class TenantMigrationActor extends BaseActor {
private final UserLookUpServiceImpl userLookUpService = new UserLookUpServiceImpl();
private final UserService userService = UserServiceImpl.getInstance();
private final UserConsentService userConsentService = UserConsentServiceImpl.getInstance();
+
@Inject
@Named("user_external_identity_management_actor")
private ActorRef userExternalIdManagementActor;
@@ -178,14 +179,15 @@ public class TenantMigrationActor extends BaseActor {
tenantServiceImpl.updateUserOrg(
request, (List<Map<String, Object>>) userDetails.get(JsonKey.ORGANISATIONS));
- //Revoke org consent
- Map<String,Object> consentReqMap = new HashMap<>();
+ // Revoke org consent
+ Map<String, Object> consentReqMap = new HashMap<>();
consentReqMap.put(JsonKey.USER_ID, (String) request.getRequest().get(JsonKey.USER_ID));
consentReqMap.put(JsonKey.CONSENT_CONSUMERID, orgId);
consentReqMap.put(JsonKey.CONSENT_OBJECTID, orgId);
consentReqMap.put(JsonKey.CONSENT_OBJECTTYPE, JsonKey.CONSENT_OBJECTTYPE_ORG);
consentReqMap.put(JsonKey.STATUS, JsonKey.CONSENT_STATUS_REVOKED);
- Response consentRes = userConsentService.updateConsent(consentReqMap, request.getRequestContext());
+ Response consentRes =
+ userConsentService.updateConsent(consentReqMap, request.getRequestContext());
// Collect all the error message
List<Map<String, Object>> userOrgErrMsgList = new ArrayList<>();
@@ -228,7 +230,7 @@ public class TenantMigrationActor extends BaseActor {
Request notificationRequest = createNotificationData(userData, context);
notificationRequest.setRequestContext(context);
try {
- emailServiceActor.tell(notificationRequest, self());
+ emailServiceActor.tell(notificationRequest, self());
} catch (Exception ex) {
logger.error(context, "Exception while sending user migrate notification", ex);
}
diff --git a/service/src/main/java/org/sunbird/actor/user/UserBaseActor.java b/service/src/main/java/org/sunbird/actor/user/UserBaseActor.java
index d061455cabacbb00c360e6a6c6d54ac4c62d3d0b..899acc5808d6a13e58dd5073a196c684e582952a 100644
--- a/service/src/main/java/org/sunbird/actor/user/UserBaseActor.java
+++ b/service/src/main/java/org/sunbird/actor/user/UserBaseActor.java
@@ -251,7 +251,7 @@ public abstract class UserBaseActor extends BaseActor {
try {
ObjectMapper mapper = new ObjectMapper();
- if(!userMap.containsKey(JsonKey.PROFILE_USERTYPES)){
+ if (!userMap.containsKey(JsonKey.PROFILE_USERTYPES)) {
List<Map<String, String>> userTypeAndSubTypes = new ArrayList<>();
userTypeAndSubTypes.add(userTypeAndSubType);
userMap.put(JsonKey.PROFILE_USERTYPES, mapper.writeValueAsString(userTypeAndSubTypes));
diff --git a/service/src/main/java/org/sunbird/actor/user/UserUpdateActor.java b/service/src/main/java/org/sunbird/actor/user/UserUpdateActor.java
index af712acab4862eae453ee429b395874034ab02ab..698edb879dd02c10bd5073dbff6c2f636c32080d 100644
--- a/service/src/main/java/org/sunbird/actor/user/UserUpdateActor.java
+++ b/service/src/main/java/org/sunbird/actor/user/UserUpdateActor.java
@@ -91,26 +91,24 @@ public class UserUpdateActor extends UserBaseActor {
UserUtil.updateExternalIdsProviderWithOrgId(userMap, actorMessage.getRequestContext());
Map<String, Object> userDbRecord =
UserUtil.validateExternalIdsAndReturnActiveUser(userMap, actorMessage.getRequestContext());
- if (actorMessage
- .getOperation()
- .equalsIgnoreCase(ActorOperations.UPDATE_USER.getValue())) {
+ if (actorMessage.getOperation().equalsIgnoreCase(ActorOperations.UPDATE_USER.getValue())) {
userMap.remove(JsonKey.PROFILE_LOCATION);
} else {
populateLocationCodesFromProfileLocation(userMap);
}
validateAndGetLocationCodes(actorMessage);
- if (actorMessage
- .getOperation()
- .equalsIgnoreCase(ActorOperations.UPDATE_USER.getValue())) {
+ if (actorMessage.getOperation().equalsIgnoreCase(ActorOperations.UPDATE_USER.getValue())) {
userMap.remove(JsonKey.PROFILE_USERTYPES);
userMap.remove(JsonKey.PROFILE_USERTYPE);
validateUserTypeAndSubType(
- actorMessage.getRequest(), userDbRecord, actorMessage.getRequestContext());
- } else if (actorMessage.getOperation().equalsIgnoreCase(ActorOperations.UPDATE_USER_V2.getValue())) {
+ actorMessage.getRequest(), userDbRecord, actorMessage.getRequestContext());
+ } else if (actorMessage
+ .getOperation()
+ .equalsIgnoreCase(ActorOperations.UPDATE_USER_V2.getValue())) {
userMap.remove(JsonKey.PROFILE_USERTYPES);
populateUserTypeAndSubType(userMap);
validateUserTypeAndSubType(
- actorMessage.getRequest(), userDbRecord, actorMessage.getRequestContext());
+ actorMessage.getRequest(), userDbRecord, actorMessage.getRequestContext());
} else if (actorMessage
.getOperation()
.equalsIgnoreCase(ActorOperations.UPDATE_USER_V3.getValue())) {
@@ -135,7 +133,7 @@ public class UserUpdateActor extends UserBaseActor {
userMap.put(JsonKey.USER_SUB_TYPE, userTypeAndSubType.get(JsonKey.SUB_TYPE));
}
validateUserTypeAndSubType(
- actorMessage.getRequest(), userDbRecord, actorMessage.getRequestContext());
+ actorMessage.getRequest(), userDbRecord, actorMessage.getRequestContext());
try {
userMap.put(
JsonKey.PROFILE_USERTYPES, mapper.writeValueAsString(distinctUserTypeAndSubTypes));
diff --git a/service/src/main/java/org/sunbird/actor/user/validator/UserRequestValidator.java b/service/src/main/java/org/sunbird/actor/user/validator/UserRequestValidator.java
index 8f55f88f4fa85a53e501821ed4e5d4098a04c741..0aaf7db8b57d4a258f42be23ad1f0914e4f00591 100644
--- a/service/src/main/java/org/sunbird/actor/user/validator/UserRequestValidator.java
+++ b/service/src/main/java/org/sunbird/actor/user/validator/UserRequestValidator.java
@@ -1,7 +1,10 @@
package org.sunbird.actor.user.validator;
import java.text.MessageFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.collections.CollectionUtils;
@@ -431,43 +434,46 @@ public class UserRequestValidator extends BaseRequestValidator {
ERROR_CODE);
}
}
- if (userRequest
- .getOperation()
- .equalsIgnoreCase(ActorOperations.UPDATE_USER.getValue()) || userRequest
- .getOperation()
- .equalsIgnoreCase(ActorOperations.UPDATE_USER_V2.getValue())) {
- if (userRequest.getRequest().containsKey(JsonKey.PROFILE_USERTYPES)){
- ProjectCommonException.throwClientErrorException(ResponseCode.invalidParameter,JsonKey.PROFILE_USERTYPES);
+ if (userRequest.getOperation().equalsIgnoreCase(ActorOperations.UPDATE_USER.getValue())
+ || userRequest.getOperation().equalsIgnoreCase(ActorOperations.UPDATE_USER_V2.getValue())) {
+ if (userRequest.getRequest().containsKey(JsonKey.PROFILE_USERTYPES)) {
+ ProjectCommonException.throwClientErrorException(
+ ResponseCode.invalidParameter, JsonKey.PROFILE_USERTYPES);
}
- }else{
- if (userRequest.getRequest().containsKey(JsonKey.PROFILE_USERTYPE)){
- ProjectCommonException.throwClientErrorException(ResponseCode.invalidParameter,JsonKey.PROFILE_USERTYPE);
+ } else {
+ if (userRequest.getRequest().containsKey(JsonKey.PROFILE_USERTYPE)) {
+ ProjectCommonException.throwClientErrorException(
+ ResponseCode.invalidParameter, JsonKey.PROFILE_USERTYPE);
}
}
if (userRequest.getRequest().containsKey(JsonKey.PROFILE_USERTYPES)
- && null != userRequest.getRequest().get(JsonKey.PROFILE_USERTYPES)) {
- if (userRequest.getRequest().get(JsonKey.PROFILE_USERTYPES) instanceof List){
+ && null != userRequest.getRequest().get(JsonKey.PROFILE_USERTYPES)) {
+ if (userRequest.getRequest().get(JsonKey.PROFILE_USERTYPES) instanceof List) {
List profileusertypes = (List) userRequest.getRequest().get(JsonKey.PROFILE_USERTYPES);
if (CollectionUtils.isEmpty(profileusertypes)) {
ProjectCommonException.throwClientErrorException(ResponseCode.profileUserTypesRequired);
- }else {
+ } else {
try {
List<Map<String, String>> profUserTypeList =
- (List<Map<String, String>>) userRequest.getRequest().get(JsonKey.PROFILE_USERTYPES);
- }catch (ClassCastException e) {
+ (List<Map<String, String>>) userRequest.getRequest().get(JsonKey.PROFILE_USERTYPES);
+ } catch (ClassCastException e) {
throw new ProjectCommonException(
- ResponseCode.dataTypeError.getErrorCode(),
- ProjectUtil.formatMessage(
- ResponseCode.dataTypeError.getErrorMessage(), JsonKey.PROFILE_USERTYPES, JsonKey.LIST),
- ERROR_CODE);
+ ResponseCode.dataTypeError.getErrorCode(),
+ ProjectUtil.formatMessage(
+ ResponseCode.dataTypeError.getErrorMessage(),
+ JsonKey.PROFILE_USERTYPES,
+ JsonKey.LIST),
+ ERROR_CODE);
}
}
} else if (!(userRequest.getRequest().get(JsonKey.PROFILE_USERTYPES) instanceof List)) {
throw new ProjectCommonException(
- ResponseCode.dataTypeError.getErrorCode(),
- ProjectUtil.formatMessage(
- ResponseCode.dataTypeError.getErrorMessage(), JsonKey.PROFILE_USERTYPES, JsonKey.LIST),
- ERROR_CODE);
+ ResponseCode.dataTypeError.getErrorCode(),
+ ProjectUtil.formatMessage(
+ ResponseCode.dataTypeError.getErrorMessage(),
+ JsonKey.PROFILE_USERTYPES,
+ JsonKey.LIST),
+ ERROR_CODE);
}
}
}
@@ -790,20 +796,20 @@ public class UserRequestValidator extends BaseRequestValidator {
String.format(
"Available User Type for stateCode:%s are %s", stateCode, userTypeMap.keySet()));
List<Map> profileUserTypes = (List<Map>) userRequestMap.get(JsonKey.PROFILE_USERTYPES);
- if(CollectionUtils.isNotEmpty(profileUserTypes) && MapUtils.isNotEmpty((Map)profileUserTypes.get(0))){
+ if (CollectionUtils.isNotEmpty(profileUserTypes)
+ && MapUtils.isNotEmpty((Map) profileUserTypes.get(0))) {
profileUserTypes.forEach(
- item -> {
- String userTypeItem = (String) item.get(JsonKey.TYPE);
- if (!userTypeMap.containsKey(userTypeItem)) {
- ProjectCommonException.throwClientErrorException(
- ResponseCode.invalidParameterValue,
- MessageFormat.format(
- ResponseCode.invalidParameterValue.getErrorMessage(),
- new String[] {userType, JsonKey.USER_TYPE}));
- }
- }
- );
- }else if (!userTypeMap.containsKey(userType)) {
+ item -> {
+ String userTypeItem = (String) item.get(JsonKey.TYPE);
+ if (!userTypeMap.containsKey(userTypeItem)) {
+ ProjectCommonException.throwClientErrorException(
+ ResponseCode.invalidParameterValue,
+ MessageFormat.format(
+ ResponseCode.invalidParameterValue.getErrorMessage(),
+ new String[] {userType, JsonKey.USER_TYPE}));
+ }
+ });
+ } else if (!userTypeMap.containsKey(userType)) {
ProjectCommonException.throwClientErrorException(
ResponseCode.invalidParameterValue,
MessageFormat.format(
@@ -822,23 +828,23 @@ public class UserRequestValidator extends BaseRequestValidator {
Map<String, List<String>> userTypeMap = userTypeConfigMap.get(stateCode);
List<Map> profileUserTypes = (List<Map>) userRequestMap.get(JsonKey.PROFILE_USERTYPES);
- if(CollectionUtils.isNotEmpty(profileUserTypes) && MapUtils.isNotEmpty(profileUserTypes.get(0))){
+ if (CollectionUtils.isNotEmpty(profileUserTypes)
+ && MapUtils.isNotEmpty(profileUserTypes.get(0))) {
profileUserTypes.forEach(
- item -> {
- String userTypeItem = (String) item.get(JsonKey.TYPE);
- String userSubTypeItem = (String) item.get(JsonKey.SUB_TYPE);
- if(StringUtils.isNotEmpty(userSubTypeItem)) {
- if (null == userTypeMap.get(userTypeItem) ||
- !userTypeMap.get(userTypeItem).contains(userSubTypeItem)) {
- ProjectCommonException.throwClientErrorException(
- ResponseCode.invalidParameterValue,
- MessageFormat.format(
- ResponseCode.invalidParameterValue.getErrorMessage(),
- new String[] {userSubTypeItem, JsonKey.USER_SUB_TYPE}));
- }
- }
+ item -> {
+ String userTypeItem = (String) item.get(JsonKey.TYPE);
+ String userSubTypeItem = (String) item.get(JsonKey.SUB_TYPE);
+ if (StringUtils.isNotEmpty(userSubTypeItem)) {
+ if (null == userTypeMap.get(userTypeItem)
+ || !userTypeMap.get(userTypeItem).contains(userSubTypeItem)) {
+ ProjectCommonException.throwClientErrorException(
+ ResponseCode.invalidParameterValue,
+ MessageFormat.format(
+ ResponseCode.invalidParameterValue.getErrorMessage(),
+ new String[] {userSubTypeItem, JsonKey.USER_SUB_TYPE}));
}
- );
+ }
+ });
} else if (null != userSubType
&& (null == userTypeMap.get(userType)
|| !userTypeMap.get(userType).contains(userSubType))) {
diff --git a/service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java b/service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java
index 35b011ac3db4dab65f2399562f69e2105ea2b32b..2fac5ed9e0aed8788af721ddd3a0e6e18e3ae05f 100644
--- a/service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java
+++ b/service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java
@@ -120,7 +120,9 @@ public class UserConsentActor extends BaseActor {
List<Map<String, Object>> consentResponseList =
consentDBList
.stream()
- .filter(consents->((String)consents.get(JsonKey.STATUS)).equalsIgnoreCase(JsonKey.ACTIVE))
+ .filter(
+ consents ->
+ ((String) consents.get(JsonKey.STATUS)).equalsIgnoreCase(JsonKey.ACTIVE))
.map(
consent -> {
Map<String, Object> consentRes = new HashMap<String, Object>();
diff --git a/service/src/main/java/org/sunbird/dao/userconsent/impl/UserConsentDaoImpl.java b/service/src/main/java/org/sunbird/dao/userconsent/impl/UserConsentDaoImpl.java
index be7023bd2115090686a4c00ffa911b81f6cdc5c3..a9fdbbc9d9d9d66b2f8f576638dd559a03c463bd 100644
--- a/service/src/main/java/org/sunbird/dao/userconsent/impl/UserConsentDaoImpl.java
+++ b/service/src/main/java/org/sunbird/dao/userconsent/impl/UserConsentDaoImpl.java
@@ -31,7 +31,8 @@ public class UserConsentDaoImpl implements UserConsentDao {
public List<Map<String, Object>> getConsent(
Map<String, Object> consentReq, RequestContext context) {
Response response =
- cassandraOperation.getRecordsByCompositeKey(JsonKey.SUNBIRD, TABLE_NAME, consentReq, context);
+ cassandraOperation.getRecordsByCompositeKey(
+ JsonKey.SUNBIRD, TABLE_NAME, consentReq, context);
return (List<Map<String, Object>>) response.get(JsonKey.RESPONSE);
}
}
diff --git a/service/src/main/java/org/sunbird/service/feed/impl/FeedServiceImpl.java b/service/src/main/java/org/sunbird/service/feed/impl/FeedServiceImpl.java
index 4f8e0a8783d9ec210198487faea92a10f7afa2d7..2e9054d65b1ad80ba6724b5748872b3c06a61232 100644
--- a/service/src/main/java/org/sunbird/service/feed/impl/FeedServiceImpl.java
+++ b/service/src/main/java/org/sunbird/service/feed/impl/FeedServiceImpl.java
@@ -2,10 +2,8 @@ package org.sunbird.service.feed.impl;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-
import java.sql.Timestamp;
import java.util.*;
-
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
@@ -16,7 +14,6 @@ import org.sunbird.exception.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.logging.LoggerUtil;
import org.sunbird.model.user.Feed;
-import org.sunbird.request.Request;
import org.sunbird.request.RequestContext;
import org.sunbird.response.Response;
import org.sunbird.service.feed.IFeedService;
@@ -73,23 +70,24 @@ public class FeedServiceImpl implements IFeedService {
responseList = (List<Map<String, Object>>) dbResponse.getResult().get(JsonKey.RESPONSE);
if (CollectionUtils.isNotEmpty(responseList)) {
responseList.forEach(
- s -> {
- try {
- String data = (String) s.get(JsonKey.FEED_DATA);
- if (StringUtils.isNotBlank(data)) {
- s.put(
- JsonKey.FEED_DATA,
- mapper.readValue(data, new TypeReference<Map<String, Object>>() {}));
- } else {
- s.put(JsonKey.FEED_DATA, Collections.emptyMap());
- }
- feedList.add(mapper.convertValue(s, Feed.class));
- } catch (Exception ex) {
- logger.error(
- context,
- "FeedServiceImpl:getRecordsByUserId :Exception occurred while mapping feed data.",
- ex);
- } });
+ s -> {
+ try {
+ String data = (String) s.get(JsonKey.FEED_DATA);
+ if (StringUtils.isNotBlank(data)) {
+ s.put(
+ JsonKey.FEED_DATA,
+ mapper.readValue(data, new TypeReference<Map<String, Object>>() {}));
+ } else {
+ s.put(JsonKey.FEED_DATA, Collections.emptyMap());
+ }
+ feedList.add(mapper.convertValue(s, Feed.class));
+ } catch (Exception ex) {
+ logger.error(
+ context,
+ "FeedServiceImpl:getRecordsByUserId :Exception occurred while mapping feed data.",
+ ex);
+ }
+ });
}
}
return feedList;
@@ -98,8 +96,8 @@ public class FeedServiceImpl implements IFeedService {
@Override
public void delete(String id, String userId, String category, RequestContext context) {
logger.debug(
- context, "FeedServiceImpl:delete method called for feedId : " + id + "user-id:" + userId);
- iFeedDao.delete(id, userId, category, context);
+ context, "FeedServiceImpl:delete method called for feedId : " + id + "user-id:" + userId);
+ iFeedDao.delete(id, userId, category, context);
}
private Map<String, String> getHeaders(RequestContext context) {
diff --git a/service/src/main/java/org/sunbird/service/user/UserProfileReadService.java b/service/src/main/java/org/sunbird/service/user/UserProfileReadService.java
index 5b45c469119639c6feb2b9fd2ac45d810e89d3bc..cd610ecd8be471154372a95676050716c4cdf32e 100644
--- a/service/src/main/java/org/sunbird/service/user/UserProfileReadService.java
+++ b/service/src/main/java/org/sunbird/service/user/UserProfileReadService.java
@@ -4,14 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.text.MessageFormat;
import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
@@ -30,11 +23,7 @@ import org.sunbird.service.location.LocationServiceImpl;
import org.sunbird.service.organisation.OrgService;
import org.sunbird.service.organisation.impl.OrgServiceImpl;
import org.sunbird.service.user.impl.*;
-import org.sunbird.util.DataCacheHandler;
-import org.sunbird.util.ProjectUtil;
-import org.sunbird.util.UserFlagUtil;
-import org.sunbird.util.UserUtility;
-import org.sunbird.util.Util;
+import org.sunbird.util.*;
import org.sunbird.util.user.UserUtil;
public class UserProfileReadService {
@@ -77,7 +66,7 @@ public class UserProfileReadService {
|| readVersion.equalsIgnoreCase(ActorOperations.GET_USER_PROFILE_V5.getValue()))) {
Util.getOrgDefaultValue().keySet().forEach(rootOrg::remove);
Util.getUserDefaultValue().keySet().forEach(result::remove);
- }else{
+ } else {
result.putAll(Util.getUserDefaultValue());
}
result.put(JsonKey.ROOT_ORG, rootOrg);
@@ -175,14 +164,14 @@ public class UserProfileReadService {
try {
if (StringUtils.isNotEmpty((String) result.get(JsonKey.PROFILE_USERTYPES))) {
userTypeDetailsList =
- mapper.readValue(
- (String) result.get(JsonKey.PROFILE_USERTYPES), new TypeReference<>() {});
+ mapper.readValue(
+ (String) result.get(JsonKey.PROFILE_USERTYPES), new TypeReference<>() {});
}
} catch (Exception e) {
logger.error(
- actorMessage.getRequestContext(),
- "Exception because of mapper read value" + result.get(JsonKey.PROFILE_USERTYPES),
- e);
+ actorMessage.getRequestContext(),
+ "Exception because of mapper read value" + result.get(JsonKey.PROFILE_USERTYPES),
+ e);
}
Map<String, Object> userTypeDetails = new HashMap<>();
try {
diff --git a/service/src/main/java/org/sunbird/service/user/impl/SSOUserServiceImpl.java b/service/src/main/java/org/sunbird/service/user/impl/SSOUserServiceImpl.java
index c13e79cf5cd8e2adaccc1fc3a3734693d259fa33..97ba702760878b1b6ef4ad509e1cebf1e62a0817 100644
--- a/service/src/main/java/org/sunbird/service/user/impl/SSOUserServiceImpl.java
+++ b/service/src/main/java/org/sunbird/service/user/impl/SSOUserServiceImpl.java
@@ -220,7 +220,7 @@ public class SSOUserServiceImpl implements SSOUserService {
}
try {
ObjectMapper mapper = new ObjectMapper();
- if(!userMap.containsKey(JsonKey.PROFILE_USERTYPES)){
+ if (!userMap.containsKey(JsonKey.PROFILE_USERTYPES)) {
List<Map<String, String>> userTypeAndSubTypes = new ArrayList<>();
userTypeAndSubTypes.add(userTypeAndSubType);
userMap.put(JsonKey.PROFILE_USERTYPES, mapper.writeValueAsString(userTypeAndSubTypes));
diff --git a/service/src/main/java/org/sunbird/service/user/impl/UserServiceImpl.java b/service/src/main/java/org/sunbird/service/user/impl/UserServiceImpl.java
index 5c46acfe715a696f30f423a03eef4c28228be930..ec32b0d9017510549a5b4baed0a0afba4d46e6a0 100644
--- a/service/src/main/java/org/sunbird/service/user/impl/UserServiceImpl.java
+++ b/service/src/main/java/org/sunbird/service/user/impl/UserServiceImpl.java
@@ -474,7 +474,9 @@ public class UserServiceImpl implements UserService {
userTypeDetails = mapper.readValue(profUserTypes, List.class);
} catch (Exception e) {
logger.error(
- context, "Exception while converting profileUserTypes to List<Map<String, Object>>.", e);
+ context,
+ "Exception while converting profileUserTypes to List<Map<String, Object>>.",
+ e);
}
}
userDetails.put(JsonKey.PROFILE_USERTYPES, userTypeDetails);
diff --git a/service/src/main/java/org/sunbird/service/userconsent/UserConsentService.java b/service/src/main/java/org/sunbird/service/userconsent/UserConsentService.java
index 60b64d4e241b0ecfbd57a47f5b50c390c81d5362..c45f6c3bc126def83a0044e799d411817299b9d6 100644
--- a/service/src/main/java/org/sunbird/service/userconsent/UserConsentService.java
+++ b/service/src/main/java/org/sunbird/service/userconsent/UserConsentService.java
@@ -9,6 +9,8 @@ import org.sunbird.response.Response;
public interface UserConsentService {
Response updateConsent(Map<String, Object> consent, RequestContext context);
+
void validateConsumerId(String consumerId, RequestContext context);
+
List<Map<String, Object>> getConsent(Request consentReq);
}
diff --git a/service/src/main/java/org/sunbird/util/feed/FeedUtil.java b/service/src/main/java/org/sunbird/util/feed/FeedUtil.java
index 250b852601895ff35311580da0ba75cdf538b413..51bda035383938f3c48109ff12133bbcf5d60c99 100644
--- a/service/src/main/java/org/sunbird/util/feed/FeedUtil.java
+++ b/service/src/main/java/org/sunbird/util/feed/FeedUtil.java
@@ -1,11 +1,6 @@
package org.sunbird.util.feed;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.IntStream;
import org.apache.commons.lang3.StringUtils;
@@ -15,7 +10,6 @@ import org.sunbird.model.ShadowUser;
import org.sunbird.model.user.Feed;
import org.sunbird.model.user.FeedAction;
import org.sunbird.model.user.FeedStatus;
-import org.sunbird.request.Request;
import org.sunbird.request.RequestContext;
import org.sunbird.response.Response;
import org.sunbird.service.feed.FeedFactory;
@@ -66,7 +60,7 @@ public class FeedUtil {
return response;
}
- private static Feed createFeedObj(ShadowUser shadowUser, String userId, RequestContext context){
+ private static Feed createFeedObj(ShadowUser shadowUser, String userId, RequestContext context) {
Feed feed = new Feed();
feed.setPriority(1);
feed.setCreatedBy(shadowUser.getAddedBy());
diff --git a/service/src/test/java/org/sunbird/actor/user/TenantMigrationActorTest.java b/service/src/test/java/org/sunbird/actor/user/TenantMigrationActorTest.java
index ee7c1b10acf9c973e48c30b4bd0091db871f6d54..9b1d034738e3d23bba98f7e633faf8bd99787020 100644
--- a/service/src/test/java/org/sunbird/actor/user/TenantMigrationActorTest.java
+++ b/service/src/test/java/org/sunbird/actor/user/TenantMigrationActorTest.java
@@ -94,7 +94,10 @@ public class TenantMigrationActorTest {
PowerMockito.when(ServiceFactory.getInstance()).thenReturn(cassandraOperation);
PowerMockito.when(
cassandraOperation.getRecordsByProperties(
- Mockito.anyString(), Mockito.anyString(), Mockito.anyMap(), Mockito.any(RequestContext.class)))
+ Mockito.anyString(),
+ Mockito.anyString(),
+ Mockito.anyMap(),
+ Mockito.any(RequestContext.class)))
.thenReturn(response);
Response upsertResponse = new Response();
@@ -151,8 +154,8 @@ public class TenantMigrationActorTest {
.thenReturn(response);
PowerMockito.when(
cassandraOperation.upsertRecord(
- Mockito.anyString(), Mockito.anyString(), Mockito.anyMap(), Mockito.any()))
- .thenReturn(response);
+ Mockito.anyString(), Mockito.anyString(), Mockito.anyMap(), Mockito.any()))
+ .thenReturn(response);
Response updateResponse = new Response();
updateResponse.getResult().put(JsonKey.RESPONSE, "FAILED");
PowerMockito.when(
@@ -242,22 +245,21 @@ public class TenantMigrationActorTest {
fMap.put(JsonKey.CATEGORY, "category");
return fMap;
}
+
@Test
public void testUserMigration() {
try {
- PowerMockito.mockStatic(DataCacheHandler.class);
- Map<String, String> dataCache = new HashMap<>();
- dataCache.put(JsonKey.CUSTODIAN_ORG_ID, "anyRootOrgId");
- when(DataCacheHandler.getConfigSettings()).thenReturn(dataCache);
- boolean result =
- testScenario(
- getMigrateReq(ActorOperations.USER_TENANT_MIGRATE),
- null,
- props);
- } catch (ProjectCommonException e) {
- assertEquals(ResponseCode.CLIENT_ERROR.getResponseCode(), e.getResponseCode());
- }
+ PowerMockito.mockStatic(DataCacheHandler.class);
+ Map<String, String> dataCache = new HashMap<>();
+ dataCache.put(JsonKey.CUSTODIAN_ORG_ID, "anyRootOrgId");
+ when(DataCacheHandler.getConfigSettings()).thenReturn(dataCache);
+ boolean result =
+ testScenario(getMigrateReq(ActorOperations.USER_TENANT_MIGRATE), null, props);
+ } catch (ProjectCommonException e) {
+ assertEquals(ResponseCode.CLIENT_ERROR.getResponseCode(), e.getResponseCode());
+ }
}
+
@Test
public void testUserSelfDeclarationMigrationWithValidatedStatus() {
PowerMockito.mockStatic(DataCacheHandler.class);
diff --git a/service/src/test/java/org/sunbird/actor/user/UserFeedActorTest.java b/service/src/test/java/org/sunbird/actor/user/UserFeedActorTest.java
index 7c0e7e322ae008e873e81635a4f83f764cb3a2ef..52a8e690ff0376ca201e298083318299532fdedb 100644
--- a/service/src/test/java/org/sunbird/actor/user/UserFeedActorTest.java
+++ b/service/src/test/java/org/sunbird/actor/user/UserFeedActorTest.java
@@ -28,7 +28,6 @@ import org.sunbird.common.Constants;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.helper.ServiceFactory;
-import org.sunbird.http.HttpClientUtil;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.request.Request;
@@ -77,12 +76,12 @@ public class UserFeedActorTest {
upsertResponse.getResult().putAll(responseMap2);
PowerMockito.when(
cassandraOperation.insertRecord(
- Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
- .thenReturn(upsertResponse);
+ Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()))
+ .thenReturn(upsertResponse);
PowerMockito.when(
cassandraOperation.updateRecord(
- Mockito.any(), Mockito.any(), Mockito.anyMap(), Mockito.anyMap(), Mockito.any()))
- .thenReturn(upsertResponse);
+ Mockito.any(), Mockito.any(), Mockito.anyMap(), Mockito.anyMap(), Mockito.any()))
+ .thenReturn(upsertResponse);
}
@Test
@@ -156,5 +155,4 @@ public class UserFeedActorTest {
|| res.getResponseCode() == errorCode.getResponseCode();
}
}
-
}
diff --git a/service/src/test/java/org/sunbird/actor/user/validator/UserRequestValidatorTest.java b/service/src/test/java/org/sunbird/actor/user/validator/UserRequestValidatorTest.java
index ac93d887fbf692ddb76a13dd0c0e0d4510a00916..5d09794e388adf6803b1512962132409c63e2c73 100644
--- a/service/src/test/java/org/sunbird/actor/user/validator/UserRequestValidatorTest.java
+++ b/service/src/test/java/org/sunbird/actor/user/validator/UserRequestValidatorTest.java
@@ -4,11 +4,7 @@ package org.sunbird.actor.user.validator;
import static org.junit.Assert.assertEquals;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -406,7 +402,7 @@ public class UserRequestValidatorTest {
List<Map<String, String>> usertypes = new ArrayList();
Map<String, String> typemap = new HashMap<>();
- typemap.put("type","administrator");
+ typemap.put("type", "administrator");
usertypes.add(typemap);
requestObj.put(JsonKey.PROFILE_USERTYPES, usertypes);
@@ -427,6 +423,7 @@ public class UserRequestValidatorTest {
}
assertEquals(true, response);
}
+
@Test
public void testUpdateUserfailurewithusertypes() {
Request request = initailizeRequest();
@@ -437,7 +434,7 @@ public class UserRequestValidatorTest {
List<Map<String, String>> usertypes = new ArrayList();
Map<String, String> typemap = new HashMap<>();
- typemap.put("type","teacher");
+ typemap.put("type", "teacher");
usertypes.add(typemap);
requestObj.put(JsonKey.PROFILE_USERTYPES, requestObj);
@@ -458,6 +455,7 @@ public class UserRequestValidatorTest {
}
assertEquals(false, response);
}
+
@Test
public void testUpdateUserfailurewithusertypesstring() {
Request request = initailizeRequest();
@@ -487,6 +485,7 @@ public class UserRequestValidatorTest {
}
assertEquals(false, response);
}
+
@Test
public void testValidateUploadUserSuccessWithOrgId() {
boolean response = false;
diff --git a/service/src/test/java/org/sunbird/service/feed/impl/FeedServiceImplTest.java b/service/src/test/java/org/sunbird/service/feed/impl/FeedServiceImplTest.java
index ca32dce113b200614ef59a152980c7eb3fdd8b83..81a84156fed2fb6a888458552bb89165ab112b39 100644
--- a/service/src/test/java/org/sunbird/service/feed/impl/FeedServiceImplTest.java
+++ b/service/src/test/java/org/sunbird/service/feed/impl/FeedServiceImplTest.java
@@ -1,10 +1,6 @@
package org.sunbird.service.feed.impl;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -28,10 +24,10 @@ import org.sunbird.service.feed.IFeedService;
@RunWith(PowerMockRunner.class)
@PrepareForTest({
- ServiceFactory.class,
- CassandraOperationImpl.class,
- FeedDaoImpl.class,
- IFeedDao.class
+ ServiceFactory.class,
+ CassandraOperationImpl.class,
+ FeedDaoImpl.class,
+ IFeedDao.class
})
@PowerMockIgnore({
"javax.management.*",
@@ -59,10 +55,10 @@ public class FeedServiceImplTest {
PowerMockito.when(iFeedDao.insert(Mockito.anyMap(), Mockito.any())).thenReturn(upsertResponse);
PowerMockito.when(iFeedDao.update(Mockito.anyMap(), Mockito.any())).thenReturn(upsertResponse);
PowerMockito.doNothing()
- .when(iFeedDao)
- .delete(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.any());
+ .when(iFeedDao)
+ .delete(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.any());
PowerMockito.when(iFeedDao.getFeedsByProperties(Mockito.anyMap(), Mockito.any()))
- .thenReturn(response);
+ .thenReturn(response);
feedService = FeedFactory.getInstance();
}
@@ -72,6 +68,7 @@ public class FeedServiceImplTest {
Assert.assertTrue(
((String) res.getResult().get(JsonKey.RESPONSE)).equalsIgnoreCase(JsonKey.SUCCESS));
}
+
@Test
public void testDelete() {
boolean response = false;
@@ -121,5 +118,4 @@ public class FeedServiceImplTest {
feed.setData(map);
return feed;
}
-
}