From 79bb7d0232b0a3edf5f42ab482bb68f90e8939f0 Mon Sep 17 00:00:00 2001 From: Juhi Date: Thu, 22 Jun 2023 12:09:01 +0530 Subject: [PATCH 1/2] changes for telemetry --- .../src/main/java/org/sunbird/keys/SunbirdKey.java | 2 +- .../org/sunbird/enrolments/ContentConsumptionActor.scala | 9 +++++---- service/app/controllers/LearnerController.java | 7 +++++-- service/app/util/Attrs.java | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/course-mw/course-actors-common/src/main/java/org/sunbird/keys/SunbirdKey.java b/course-mw/course-actors-common/src/main/java/org/sunbird/keys/SunbirdKey.java index a5f0e2199..251f386ce 100644 --- a/course-mw/course-actors-common/src/main/java/org/sunbird/keys/SunbirdKey.java +++ b/course-mw/course-actors-common/src/main/java/org/sunbird/keys/SunbirdKey.java @@ -57,6 +57,6 @@ public final class SunbirdKey { public static final String COLLECTION = "collection"; public static final String EVENT_SET = "eventSet"; public static final String OBJECT_TYPE = "objectType"; - + public static final String ROOT_ORG_ID = "rootOrgId"; private SunbirdKey() {} } diff --git a/course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ContentConsumptionActor.scala b/course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ContentConsumptionActor.scala index 30e4586a3..2e611bb33 100644 --- a/course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ContentConsumptionActor.scala +++ b/course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ContentConsumptionActor.scala @@ -423,6 +423,7 @@ class ContentConsumptionActor @Inject() extends BaseEnrolmentActor { val courseId: String = request.getOrDefault(JsonKey.COURSE_ID, "").asInstanceOf[String] val batchId: String = request.getOrDefault(JsonKey.BATCH_ID, "").asInstanceOf[String] val filters = Map[String, AnyRef]("userid"-> userId, "courseid"-> courseId, "batchid"-> batchId).asJava + val rootOrgId: String = request.getOrDefault(JsonKey.ROOT_ORG_ID, "").asInstanceOf[String] val result = cassandraOperation .getRecords(request.getRequestContext, enrolmentDBInfo.getKeySpace, enrolmentDBInfo.getTableName, filters, null) @@ -431,7 +432,7 @@ class ContentConsumptionActor @Inject() extends BaseEnrolmentActor { .asInstanceOf[java.util.List[java.util.Map[String, AnyRef]]] val response = { if (CollectionUtils.isNotEmpty(resp)) { - pushEnrolmentSyncEvent(userId, courseId, batchId) + pushEnrolmentSyncEvent(userId, courseId, batchId, rootOrgId) successResponse() } else { new ProjectCommonException(ResponseCode.invalidRequestData.getErrorCode, @@ -441,13 +442,13 @@ class ContentConsumptionActor @Inject() extends BaseEnrolmentActor { sender().tell(response, self) } - def pushEnrolmentSyncEvent(userId: String, courseId: String, batchId: String) = { + def pushEnrolmentSyncEvent(userId: String, courseId: String, batchId: String, rootOrgId: String) = { val now = System.currentTimeMillis() val event = - s"""{"eid":"BE_JOB_REQUEST","ets":$now,"mid":"LP.$now.${UUID.randomUUID()}" + s"""{"eid":"AUDIT","ets":$now,"mid":"AUDIT.$now.${UUID.randomUUID()}" |,"actor":{"type":"System","id":"Course Batch Updater"},"context":{"pdata":{"ver":"1.0","id":"org.sunbird.platform"}} |,"object":{"type":"CourseBatchEnrolment","id":"${batchId}_${userId}"},"edata":{"action":"user-enrolment-sync" - |,"iteration":1,"batchId":"$batchId","userId":"$userId","courseId":"$courseId"}}""".stripMargin + |,"iteration":1,"batchId":"$batchId","userId":"$userId","courseId":"$courseId","rootOrgId":"$rootOrgId"}}""".stripMargin .replaceAll("\n", "") if(pushTokafkaEnabled){ val topic = ProjectUtil.getConfigValue("kafka_enrolment_sync_topic") diff --git a/service/app/controllers/LearnerController.java b/service/app/controllers/LearnerController.java index 16ac85376..594cf715c 100644 --- a/service/app/controllers/LearnerController.java +++ b/service/app/controllers/LearnerController.java @@ -88,7 +88,8 @@ public CompletionStage updateContentState(Http.Request httpRequest) { String loggingHeaders = httpRequest.attrs().getOptional(Attrs.X_LOGGING_HEADERS).orElse(null); String requestedBy = httpRequest.attrs().getOptional(Attrs.USER_ID).orElse(null); String requestedFor = httpRequest.attrs().getOptional(Attrs.REQUESTED_FOR).orElse(null); - String apiDebugLog = "UpdateContentState Request: " + requestData.toString() + " RequestedBy: " + requestedBy + " RequestedFor: " + requestedFor + " "; + String rootOrgId = httpRequest.attrs().getOptional(Attrs.X_AUTH_USER_ORG_ID).orElse(null); + String apiDebugLog = "UpdateContentState Request: " + requestData.toString() + " RequestedBy: " + requestedBy + " RequestedFor: " + requestedFor + " " + " Root Org Id: " + rootOrgId + " "; try { Request reqObj = (Request) mapper.RequestMapper.mapRequest(requestData, Request.class); RequestValidator.validateUpdateContent(reqObj); @@ -107,7 +108,9 @@ public CompletionStage updateContentState(Http.Request httpRequest) { innerMap.put(JsonKey.CONTENTS, reqObj.get(JsonKey.CONTENTS)); innerMap.put(JsonKey.ASSESSMENT_EVENTS, reqObj.getRequest().get(JsonKey.ASSESSMENT_EVENTS)); } - innerMap.put(JsonKey.USER_ID, reqObj.getRequest().get(JsonKey.USER_ID)); + innerMap.put(JsonKey.USER_ID, reqObj.getRequest().get(JsonKey.USER_ID)); + if (StringUtils.isNotBlank(rootOrgId)) + innerMap.put(SunbirdKey.ROOT_ORG_ID, rootOrgId); reqObj.setRequest(innerMap); CompletionStage result = actorResponseHandler(contentConsumptionActor, reqObj, timeout, null, httpRequest); return result.thenApplyAsync(r -> { diff --git a/service/app/util/Attrs.java b/service/app/util/Attrs.java index e63775602..7146e09c0 100644 --- a/service/app/util/Attrs.java +++ b/service/app/util/Attrs.java @@ -19,4 +19,5 @@ public class Attrs { public static final TypedKey ACTOR_TYPE = TypedKey.create(JsonKey.ACTOR_TYPE); public static final TypedKey X_AUTH_TOKEN = TypedKey.create(JsonKey.X_AUTH_TOKEN); public static final TypedKey X_LOGGING_HEADERS = TypedKey.create(JsonKey.X_LOGGING_HEADERS); + public static final TypedKey X_AUTH_USER_ORG_ID = TypedKey.create(JsonKey.X_AUTH_USER_ORG_ID); } From 28aba0dc170af6eec3a6f7057d0895afe4d511fc Mon Sep 17 00:00:00 2001 From: Juhi Date: Thu, 22 Jun 2023 12:13:27 +0530 Subject: [PATCH 2/2] changes for telemetry --- .../java/org/sunbird/common/responsecode/ResponseMessage.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/responsecode/ResponseMessage.java b/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/responsecode/ResponseMessage.java index a1358c414..49ea0f6a5 100644 --- a/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/responsecode/ResponseMessage.java +++ b/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/responsecode/ResponseMessage.java @@ -850,10 +850,6 @@ interface Key { String MISSING_FIXED_BATCH_ID = "MISSING_FIXED_BATCH_ID"; String CANNOT_UPDATE_EVENT_SET_HAVING_ENROLLMENTS = "CANNOT_UPDATE_EVENT_SET_HAVING_ENROLLMENTS"; String USER_DOES_NOT_HAVE_ACCESS = "USER_DOES_NOT_HAVE_ACCESS"; -<<<<<<< HEAD String CURRENT_BATCH_SIZE_INVALID = "INVALID_FIELD_CURRENT_BATCH_SIZE"; -======= - String CURRENT_BATCH_SIZE_MISSING = "MISSING_FIELD_CURRENT_BATCH_SIZE"; ->>>>>>> 1f8d98364bb3468ba9785e2cc8838dae78923a4c } }