Sunbird-Lern · chethann007 · Jan 28, 2026 · Feb 2, 2026 · Feb 2, 2026 · Feb 2, 2026
diff --git a/activity-aggregator/pom.xml b/activity-aggregator/pom.xml
@@ -49,11 +49,6 @@
             <artifactId>actor-core</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.sunbird</groupId>
-            <artifactId>common-util</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.sunbird</groupId>
             <artifactId>cache-utils</artifactId>

diff --git a/activity-aggregator/src/main/scala/org/sunbird/activity/actor/ActivityAggregatorActor.scala b/activity-aggregator/src/main/scala/org/sunbird/activity/actor/ActivityAggregatorActor.scala
@@ -7,13 +7,15 @@ import org.sunbird.activity.domain.{CollectionProgress, ContentStatus, Telemetry
 import org.sunbird.activity.util.{ActivityAggregateUtil, CertificateUtil, ContentSearchUtil, DeDupUtil, RedisUtil}
 import org.sunbird.cache.util.RedisCacheUtil
 import org.sunbird.cassandra.CassandraOperation
-import org.sunbird.common.exception.ProjectCommonException
-import org.sunbird.common.models.util.{JsonKey, LoggerUtil, ProjectUtil}
-import org.sunbird.common.request.{Request, RequestContext}
-import org.sunbird.common.responsecode.ResponseCode
+import org.sunbird.exception.ProjectCommonException
+import org.sunbird.keys.JsonKey
+import org.sunbird.logging.LoggerUtil
+import org.sunbird.common.ProjectUtil
+import org.sunbird.request.{Request, RequestContext}
+import org.sunbird.response.ResponseCode
 import org.sunbird.enrolments.BaseEnrolmentActor
 import org.sunbird.helper.ServiceFactory
-import org.sunbird.kafka.client.KafkaClient
+import org.sunbird.kafka.KafkaClient
 import org.sunbird.learner.util.Util
 
 import java.util
@@ -223,7 +225,7 @@ class ActivityAggregatorActor @Inject()(implicit val cacheUtil: RedisCacheUtil)
       cassandraOperation.batchUpdate(consumptionDBInfo.getKeySpace, "user_content_consumption", queries, requestContext)
       logger.info(requestContext, s"updateContentConsumption: Batch update completed successfully")
     } else {
-      logger.warn(requestContext, s"updateContentConsumption: No queries to execute")
+      logger.warn(requestContext, s"updateContentConsumption: No queries to execute", null)
     }
   }
 
@@ -240,7 +242,7 @@ class ActivityAggregatorActor @Inject()(implicit val cacheUtil: RedisCacheUtil)
       logger.info(requestContext, s"computeCourseAggregations: Course aggregation computed successfully")
       List(courseAggOpt.get)
     } else {
-      logger.warn(requestContext, s"computeCourseAggregations: No course aggregation computed")
+      logger.warn(requestContext, s"computeCourseAggregations: No course aggregation computed", null)
       List()
     }
 
@@ -281,7 +283,7 @@ class ActivityAggregatorActor @Inject()(implicit val cacheUtil: RedisCacheUtil)
       cassandraOperation.batchUpdate(activityAggDBInfo.getKeySpace, activityAggDBInfo.getTableName, aggQueries, requestContext)
       logger.info(requestContext, s"updateActivityAggregates: Batch update completed successfully")
     } else {
-      logger.warn(requestContext, s"updateActivityAggregates: No queries to execute")
+      logger.warn(requestContext, s"updateActivityAggregates: No queries to execute", null)
     }
   }
 
@@ -393,7 +395,7 @@ class ActivityAggregatorActor @Inject()(implicit val cacheUtil: RedisCacheUtil)
         logger.info(requestContext, s"getEnrolmentStatus: No enrolment found, returning status 0")
       }
     } else {
-      logger.warn(requestContext, s"getEnrolmentStatus: Null response from Cassandra")
+      logger.warn(requestContext, s"getEnrolmentStatus: Null response from Cassandra", null)
     }
 
     0
@@ -432,7 +434,7 @@ class ActivityAggregatorActor @Inject()(implicit val cacheUtil: RedisCacheUtil)
 
             Some(contentId -> ContentStatus(contentId, status, completedCount, viewCount, progress, lastAccessTime, lastCompletedTime, lastUpdatedTime, fromInput = false))
           } else {
-            logger.warn(requestContext, s"getContentStatusFromDB: Skipping row with missing contentId. Keys: ${row.keySet()}")
+            logger.warn(requestContext, s"getContentStatusFromDB: Skipping row with missing contentId. Keys: ${row.keySet()}", null)
             None
           }
         }).toMap

diff --git a/activity-aggregator/src/main/scala/org/sunbird/activity/util/ActivityAggregateUtil.scala b/activity-aggregator/src/main/scala/org/sunbird/activity/util/ActivityAggregateUtil.scala
@@ -3,8 +3,10 @@ package org.sunbird.activity.util
 import org.apache.commons.collections4.CollectionUtils
 import org.apache.commons.lang3.StringUtils
 import org.sunbird.activity.domain._
-import org.sunbird.common.models.util.{JsonKey, LoggerUtil, ProjectUtil}
-import org.sunbird.common.request.RequestContext
+import org.sunbird.keys.JsonKey
+import org.sunbird.logging.LoggerUtil
+import org.sunbird.common.ProjectUtil
+import org.sunbird.request.RequestContext
 
 import java.util
 import java.util.Date
@@ -138,7 +140,7 @@ class ActivityAggregateUtil {
     logger.info(requestContext, s"computeCourseActivityAgg: courseId: $courseId, userId: $userId, leafNodes: ${leafNodes.size}, optionalNodes: ${optionalNodes.size}")
 
     if (leafNodes.isEmpty) {
-      logger.warn(requestContext, s"computeCourseActivityAgg: Leaf nodes are not available for courseId: $courseId")
+      logger.warn(requestContext, s"computeCourseActivityAgg: Leaf nodes are not available for courseId: $courseId", null)
       None
     } else {
       val updatedLeafNodes = leafNodes.diff(optionalNodes)

diff --git a/activity-aggregator/src/main/scala/org/sunbird/activity/util/CertificateUtil.scala b/activity-aggregator/src/main/scala/org/sunbird/activity/util/CertificateUtil.scala
@@ -1,9 +1,9 @@
 package org.sunbird.activity.util
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import org.sunbird.common.models.util.ProjectUtil
-import org.sunbird.common.request.RequestContext
-import org.sunbird.kafka.client.KafkaClient
+import org.sunbird.common.ProjectUtil
+import org.sunbird.request.RequestContext
+import org.sunbird.kafka.KafkaClient
 
 import java.util.UUID
 

diff --git a/activity-aggregator/src/main/scala/org/sunbird/activity/util/ContentSearchUtil.scala b/activity-aggregator/src/main/scala/org/sunbird/activity/util/ContentSearchUtil.scala
@@ -1,8 +1,9 @@
 package org.sunbird.activity.util
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import org.sunbird.common.models.util.{HttpUtil, ProjectUtil}
-import org.sunbird.common.request.RequestContext
+import org.sunbird.http.HttpUtil
+import org.sunbird.common.ProjectUtil
+import org.sunbird.request.RequestContext
 
 import java.util
 import scala.collection.JavaConverters._

diff --git a/activity-aggregator/src/main/scala/org/sunbird/activity/util/DeDupUtil.scala b/activity-aggregator/src/main/scala/org/sunbird/activity/util/DeDupUtil.scala
@@ -1,8 +1,8 @@
 package org.sunbird.activity.util
 
 import org.sunbird.cache.util.RedisCacheUtil
-import org.sunbird.common.models.util.ProjectUtil
-import org.sunbird.common.request.RequestContext
+import org.sunbird.common.ProjectUtil
+import org.sunbird.request.RequestContext
 
 import java.security.MessageDigest
 

diff --git a/activity-aggregator/src/main/scala/org/sunbird/activity/util/RedisUtil.scala b/activity-aggregator/src/main/scala/org/sunbird/activity/util/RedisUtil.scala
@@ -2,8 +2,9 @@ package org.sunbird.activity.util
 
 import org.apache.commons.collections.CollectionUtils
 import org.sunbird.cache.util.RedisCacheUtil
-import org.sunbird.common.models.util.{LoggerUtil, ProjectUtil}
-import org.sunbird.common.request.RequestContext
+import org.sunbird.logging.LoggerUtil
+import org.sunbird.common.ProjectUtil
+import org.sunbird.request.RequestContext
 
 import scala.collection.JavaConverters._
 

diff --git a/...ty-aggregator/src/test/scala/org/sunbird/activity/actor/ActivityAggregatorActorTest.scala b/...ty-aggregator/src/test/scala/org/sunbird/activity/actor/ActivityAggregatorActorTest.scala
@@ -10,9 +10,9 @@ import org.sunbird.activity.util.{CertificateUtil, ContentSearchUtil, DeDupUtil,
 import org.sunbird.activity.domain.{CollectionProgress, TelemetryEvent}
 import org.sunbird.cache.util.RedisCacheUtil
 import org.sunbird.cassandra.CassandraOperation
-import org.sunbird.common.models.response.Response
-import org.sunbird.common.models.util.JsonKey
-import org.sunbird.common.request.{Request, RequestContext}
+import org.sunbird.response.Response
+import org.sunbird.keys.JsonKey
+import org.sunbird.request.{Request, RequestContext}
 
 import java.util
 import scala.concurrent.duration._

diff --git a/activity-aggregator/src/test/scala/org/sunbird/activity/util/ActivityAggregateUtilTest.scala b/activity-aggregator/src/test/scala/org/sunbird/activity/util/ActivityAggregateUtilTest.scala
@@ -3,7 +3,7 @@ package org.sunbird.activity.util
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import org.sunbird.activity.domain.{ContentStatus, UserContentConsumption}
-import org.sunbird.common.request.RequestContext
+import org.sunbird.request.RequestContext
 
 import java.util
 import java.util.Date

diff --git a/...nt-aggregator/src/main/scala/org/sunbird/assessment/actor/AssessmentAggregatorActor.scala b/...nt-aggregator/src/main/scala/org/sunbird/assessment/actor/AssessmentAggregatorActor.scala
@@ -2,18 +2,21 @@ package org.sunbird.assessment.actor
 import org.sunbird.actor.core.BaseActor
 import javax.inject.Inject
 import org.apache.pekko.actor.Props
-import org.sunbird.common.exception.ProjectCommonException
-import org.sunbird.common.request.{Request, RequestContext}
-import org.sunbird.common.responsecode.ResponseCode
+import org.sunbird.exception.ProjectCommonException
+import org.sunbird.request.{Request, RequestContext}
+import org.sunbird.response.ResponseCode
 import org.sunbird.assessment.models._
 import org.sunbird.assessment.service._
 import org.sunbird.assessment.util.AssessmentParser
-import org.sunbird.common.models.util.{JsonKey, LoggerUtil, ProjectUtil}
+import org.sunbird.keys.JsonKey
+import org.sunbird.logging.LoggerUtil
+import org.sunbird.common.ProjectUtil
 import scala.collection.JavaConverters._
 import org.apache.commons.lang3.StringUtils
 
-class AssessmentAggregatorActor @Inject()(_redisService: Option[RedisService],_contentService: Option[ContentService],_cassandraService: Option[CassandraService],_kafkaService: Option[KafkaService]) extends BaseActor {
+class AssessmentAggregatorActor(_redisService: Option[RedisService],_contentService: Option[ContentService],_cassandraService: Option[CassandraService],_kafkaService: Option[KafkaService]) extends BaseActor {
 
+  @Inject()
   def this() = this(None, None, None, None)
 
   private lazy val redisService = _redisService.getOrElse(new RedisService())
@@ -86,7 +89,7 @@ class AssessmentAggregatorActor @Inject()(_redisService: Option[RedisService],_c
     if (request.events.nonEmpty) return List(request)
     val existing = fetchStoredAssessments(request, context)
     if (existing.isEmpty) {
-      logger.warn(context, s"Sync Flow: No stored events found for userId=${request.userId}, contentId=${request.contentId}, attemptId=${request.attemptId}")
+      logger.warn(context, s"Sync Flow: No stored events found for userId=${request.userId}, contentId=${request.contentId}, attemptId=${request.attemptId}", null)
       return List(request)
     }
     logger.info(context, s"Sync Flow: Recovered ${existing.size} attempt(s) for userId=${request.userId}, contentId=${request.contentId}")
@@ -125,7 +128,7 @@ class AssessmentAggregatorActor @Inject()(_redisService: Option[RedisService],_c
     if (skipMissing) {
       val totalQuestions = metadata.totalQuestions
       if (totalQuestions > 0 && uniqueEvents.size > totalQuestions) {
-        logger.warn(context, s"Skipping assessment ${req.attemptId}: unique events (${uniqueEvents.size}) exceed total questions ($totalQuestions)")
+        logger.warn(context, s"Skipping assessment ${req.attemptId}: unique events (${uniqueEvents.size}) exceed total questions ($totalQuestions)", null)
         return
       }
     }
@@ -220,7 +223,7 @@ class AssessmentAggregatorActor @Inject()(_redisService: Option[RedisService],_c
 
   private def getD(m: java.util.Map[String, AnyRef], k: String): Double = Option(m.get(k)).map(_.asInstanceOf[Number].doubleValue()).getOrElse(0.0)
 
-  private def createSuccess(aid: String) = { val r = new org.sunbird.common.models.response.Response(); r.put("response", "SUCCESS"); r.put("attemptId", aid); r }
+  private def createSuccess(aid: String) = { val r = new org.sunbird.response.Response(); r.put("response", "SUCCESS"); r.put("attemptId", aid); r }
   private def createErrorResponse(code: String, msg: String, responseCode: Int): ProjectCommonException = new ProjectCommonException(code, msg, responseCode)
 }
 

diff --git a/assessment-aggregator/src/main/scala/org/sunbird/assessment/service/AssessmentService.scala b/assessment-aggregator/src/main/scala/org/sunbird/assessment/service/AssessmentService.scala
@@ -1,12 +1,12 @@
 package org.sunbird.assessment.service
 import org.sunbird.assessment.models._
-import org.sunbird.common.models.util.ProjectUtil
+import org.sunbird.common.ProjectUtil
 import java.text.DecimalFormat
 
 class AssessmentService(redisService: RedisService, contentService: ContentService) {
 
   private val decimalFormat = new DecimalFormat("0.0#")
-  private val aggType = Option(org.sunbird.common.models.util.ProjectUtil.getConfigValue("user_activity_agg_type")).getOrElse("assessment")
+  private val aggType = Option(org.sunbird.common.ProjectUtil.getConfigValue("user_activity_agg_type")).getOrElse("assessment")
 
   def getUniqueQuestions(events: List[AssessmentEvent]): List[AssessmentEvent] = {
     events.sortBy(_.timestamp)(Ordering[Long].reverse).groupBy(_.questionId).values.map(_.head).toList
@@ -24,7 +24,7 @@ class AssessmentService(redisService: RedisService, contentService: ContentServi
   /**
    * Fetches content metadata once by combining Redis and Content API checks.
    */
-  def getMetadata(courseId: String, contentId: String, context: org.sunbird.common.request.RequestContext): ContentMetadata = {
+  def getMetadata(courseId: String, contentId: String, context: org.sunbird.request.RequestContext): ContentMetadata = {
     val isValidInCache = redisService.isValidContent(courseId, contentId)
     val cachedCount = redisService.getTotalQuestionsCount(contentId)
     if (isValidInCache && cachedCount.isDefined) {

diff --git a/assessment-aggregator/src/main/scala/org/sunbird/assessment/service/CassandraService.scala b/assessment-aggregator/src/main/scala/org/sunbird/assessment/service/CassandraService.scala
@@ -1,9 +1,9 @@
 package org.sunbird.assessment.service
 import org.sunbird.cassandra.CassandraOperation
 import org.sunbird.helper.ServiceFactory
-import org.sunbird.common.request.RequestContext
+import org.sunbird.request.RequestContext
 import org.sunbird.assessment.models._
-import org.sunbird.common.models.util.ProjectUtil
+import org.sunbird.common.ProjectUtil
 import scala.collection.JavaConverters._
 import com.datastax.driver.core.{UserType, UDTValue}
 import org.slf4j.LoggerFactory

diff --git a/assessment-aggregator/src/main/scala/org/sunbird/assessment/service/ContentService.scala b/assessment-aggregator/src/main/scala/org/sunbird/assessment/service/ContentService.scala
@@ -1,7 +1,10 @@
 package org.sunbird.assessment.service
 
-import org.sunbird.common.models.util.{HttpUtil, ProjectUtil, JsonKey, LoggerUtil}
-import org.sunbird.common.request.RequestContext
+import org.sunbird.http.HttpUtil
+import org.sunbird.common.ProjectUtil
+import org.sunbird.keys.JsonKey
+import org.sunbird.logging.LoggerUtil
+import org.sunbird.request.RequestContext
 import org.apache.commons.lang3.StringUtils
 import scala.collection.JavaConverters._
 
@@ -19,7 +22,7 @@ class ContentService(http: Option[HttpUtilWrapper] = None) {
   private val logger = new LoggerUtil(classOf[ContentService])
   private val httpUtil = http.getOrElse(DefaultHttpUtilWrapper)
   private val baseUrl = Option(ProjectUtil.getConfigValue("sunbird_api_base_url")).filter(StringUtils.isNotBlank).getOrElse("http://localhost:9000")
-  private val contentReadPath = Option(ProjectUtil.getConfigValue("sunbird_content_read_api_path")).filter(StringUtils.isNotBlank).getOrElse("/content/v1/read/")
+  private val contentReadPath = Option(ProjectUtil.getConfigValue("sunbird_content_read_api_path")).filter(StringUtils.isNotBlank).getOrElse("/v1/content/read/")
 
   def fetchMetadata(contentId: String, context: RequestContext): ContentMetadata = {
     val url = s"$baseUrl$contentReadPath$contentId"

diff --git a/assessment-aggregator/src/main/scala/org/sunbird/assessment/service/KafkaClientWrapper.scala b/assessment-aggregator/src/main/scala/org/sunbird/assessment/service/KafkaClientWrapper.scala
@@ -1,6 +1,6 @@
 package org.sunbird.assessment.service
 
-import org.sunbird.kafka.client.KafkaClient
+import org.sunbird.kafka.KafkaClient
 
 trait KafkaClientWrapper {
   def send(event: String, topic: String): Unit

diff --git a/assessment-aggregator/src/main/scala/org/sunbird/assessment/service/KafkaService.scala b/assessment-aggregator/src/main/scala/org/sunbird/assessment/service/KafkaService.scala
@@ -1,7 +1,7 @@
 package org.sunbird.assessment.service
 
-import org.sunbird.kafka.client.KafkaClient
-import org.sunbird.common.models.util.ProjectUtil
+import org.sunbird.kafka.KafkaClient
+import org.sunbird.common.ProjectUtil
 import org.sunbird.assessment.models.AssessmentRequest
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.slf4j.LoggerFactory

diff --git a/assessment-aggregator/src/main/scala/org/sunbird/assessment/util/AssessmentParser.scala b/assessment-aggregator/src/main/scala/org/sunbird/assessment/util/AssessmentParser.scala
@@ -3,6 +3,7 @@ package org.sunbird.assessment.util
 import org.sunbird.assessment.models.AssessmentEvent
 import scala.collection.JavaConverters._
 import com.google.gson.Gson
+import org.sunbird.keys.JsonKey
 
 object AssessmentParser {
   private val gson = new Gson()
@@ -29,7 +30,7 @@ object AssessmentParser {
       val resvalues = getListValues(m.getOrDefault("resvalues", new java.util.ArrayList()).asInstanceOf[java.util.List[java.util.Map[String, AnyRef]]])
       val params = getListValues(m.getOrDefault("params", new java.util.ArrayList()).asInstanceOf[java.util.List[java.util.Map[String, AnyRef]]])
       AssessmentEvent(
-        Option(m.get("questionId")).getOrElse(m.getOrDefault(org.sunbird.common.models.util.JsonKey.IDENTIFIER, "")).toString,
+        Option(m.get("questionId")).getOrElse(m.getOrDefault(JsonKey.IDENTIFIER, "")).toString,
         getD(m, "score"),
         getD(m, "maxScore"),
         getD(m, "duration"),

diff --git a/...ggregator/src/test/scala/org/sunbird/assessment/actor/AssessmentAggregatorActorSpec.scala b/...ggregator/src/test/scala/org/sunbird/assessment/actor/AssessmentAggregatorActorSpec.scala
@@ -7,16 +7,17 @@ import org.mockito.MockitoSugar
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpecLike
 import org.scalatest.matchers.should.Matchers
-import org.sunbird.common.request.{Request, RequestContext}
+import org.sunbird.request.{Request, RequestContext}
 import org.sunbird.assessment.models._
-import org.sunbird.common.models.util.{JsonKey, PropertiesCache}
-import org.sunbird.common.exception.ProjectCommonException
-import org.sunbird.common.models.response.Response
+import org.sunbird.keys.JsonKey
+import org.sunbird.common.PropertiesCache
+import org.sunbird.exception.ProjectCommonException
+import org.sunbird.response.Response
 import java.util.HashMap
 import scala.collection.JavaConverters._
 import scala.concurrent.duration._
 import org.sunbird.assessment.service.{CassandraService, ContentMetadata, ContentService, KafkaService, RedisService}
-import org.sunbird.common.responsecode.ResponseCode
+import org.sunbird.response.ResponseCode
 
 class AssessmentAggregatorActorSpec extends TestKit(ActorSystem("AssessmentAggregatorActorSpec"))
   with ImplicitSender with AnyFlatSpecLike with Matchers with BeforeAndAfterAll with MockitoSugar {

diff --git a/...ment-aggregator/src/test/scala/org/sunbird/assessment/service/AssessmentServiceSpec.scala b/...ment-aggregator/src/test/scala/org/sunbird/assessment/service/AssessmentServiceSpec.scala
@@ -5,8 +5,8 @@ import org.mockito.MockitoSugar
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import org.sunbird.assessment.models._
-import org.sunbird.common.models.util.PropertiesCache
-import org.sunbird.common.request.RequestContext
+import org.sunbird.common.PropertiesCache
+import org.sunbird.request.RequestContext
 
 class AssessmentServiceSpec extends AnyFlatSpec with Matchers with MockitoSugar {
 

diff --git a/...sment-aggregator/src/test/scala/org/sunbird/assessment/service/CassandraServiceSpec.scala b/...sment-aggregator/src/test/scala/org/sunbird/assessment/service/CassandraServiceSpec.scala
@@ -5,8 +5,8 @@ import org.mockito.MockitoSugar
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import org.sunbird.cassandra.CassandraOperation
-import org.sunbird.common.models.response.Response
-import org.sunbird.common.request.RequestContext
+import org.sunbird.response.Response
+import org.sunbird.request.RequestContext
 import org.sunbird.assessment.models._
 import java.util.{ArrayList, HashMap, Map}
 import scala.collection.JavaConverters._

diff --git a/assessment-aggregator/src/test/scala/org/sunbird/assessment/service/ContentServiceSpec.scala b/assessment-aggregator/src/test/scala/org/sunbird/assessment/service/ContentServiceSpec.scala
@@ -4,7 +4,7 @@ import org.mockito.ArgumentMatchers._
 import org.mockito.MockitoSugar
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
-import org.sunbird.common.request.RequestContext
+import org.sunbird.request.RequestContext
 
 class ContentServiceSpec extends AnyFlatSpec with Matchers with MockitoSugar {