diff --git a/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala b/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala
index ba12a22e5a75633564c23b27437ffa4a559edb26..2dd9080f7f7c38d40d599dc2a64af9e88a840768 100644
--- a/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala
+++ b/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala
@@ -38,7 +38,6 @@ class QuestionActor @Inject()(implicit oec: OntologyEngineContext) extends BaseA
case "rejectQuestion" => reject(request)
case "copyQuestion" => copy(request)
case "bulkUploadQuestion" => bulkUpload(request)
- case "bulkUploadFrameworkMapping" => AssessmentManager.createMapping(request, "ERR_QUESTION_CREATE")
case _ => ERROR(request.getOperation)
}
diff --git a/assessment-api/assessment-actors/src/main/scala/org/sunbird/managers/AssessmentManager.scala b/assessment-api/assessment-actors/src/main/scala/org/sunbird/managers/AssessmentManager.scala
index 342fad076ab5146909a4fd2edc8bb22414926a96..d5a9e0204af942de2031c764c10b3fe4ee02b556 100644
--- a/assessment-api/assessment-actors/src/main/scala/org/sunbird/managers/AssessmentManager.scala
+++ b/assessment-api/assessment-actors/src/main/scala/org/sunbird/managers/AssessmentManager.scala
@@ -221,8 +221,4 @@ object AssessmentManager {
}}
(actor, context, objData, eData)
}
-
- def createMapping(request: Request, str: String)(implicit oec: OntologyEngineContext, ec: ExecutionContext): Future[Response] = {
- oec.graphService.saveExternalProps(request)
- }
}
diff --git a/assessment-api/assessment-service/app/controllers/BaseController.scala b/assessment-api/assessment-service/app/controllers/BaseController.scala
index dcb5ea6c1a277811d9ef50be62b0b81ea7817bb6..0682efea3f82705f8e29ccebb1db425252c0ad87 100644
--- a/assessment-api/assessment-service/app/controllers/BaseController.scala
+++ b/assessment-api/assessment-service/app/controllers/BaseController.scala
@@ -13,7 +13,6 @@ import collection.JavaConverters._
import scala.concurrent.{ExecutionContext, Future}
import org.slf4j.{Logger, LoggerFactory}
import org.sunbird.cache.impl.RedisCache
-import play.api.libs.Files
abstract class BaseController(protected val cc: ControllerComponents)(implicit exec: ExecutionContext) extends AbstractController(cc) {
@@ -23,11 +22,6 @@ abstract class BaseController(protected val cc: ControllerComponents)(implicit e
JavaJsonUtils.deserialize[java.util.Map[String, Object]](body).getOrDefault("request", new java.util.HashMap()).asInstanceOf[java.util.Map[String, Object]]
}
- def competencyRequestBody()(implicit request: Request[MultipartFormData[Files.TemporaryFile]]) = {
- val body = request.body.file(Files.TemporaryFile.toString).getOrElse("{}").toString
- JavaJsonUtils.deserialize[java.util.Map[String, Object]](body).getOrDefault("request", new java.util.HashMap()).asInstanceOf[java.util.Map[String, Object]]
- }
-
def commonHeaders()(implicit request: Request[AnyContent]): java.util.Map[String, Object] = {
val customHeaders = Map("x-channel-id" -> "channel", "X-Consumer-ID" -> "consumerId", "X-App-Id" -> "appId")
customHeaders.map(ch => {
diff --git a/assessment-api/assessment-service/app/controllers/v4/QuestionController.scala b/assessment-api/assessment-service/app/controllers/v4/QuestionController.scala
index 66961a8001c5fcf0797b5ae7ce92d471dc73ba2e..2691878633c391c0feb3835141900419d0980b1e 100644
--- a/assessment-api/assessment-service/app/controllers/v4/QuestionController.scala
+++ b/assessment-api/assessment-service/app/controllers/v4/QuestionController.scala
@@ -2,7 +2,7 @@ package controllers.v4
import akka.actor.{ActorRef, ActorSystem}
import controllers.BaseController
-import handlers.{CompetencyExcelParser, QuestionExcelParser}
+import handlers.QuestionExcelParser
import org.slf4j.{Logger, LoggerFactory}
import org.sunbird.cache.impl.RedisCache
import org.sunbird.common.dto.Response
@@ -184,46 +184,4 @@ class QuestionController @Inject()(@Named(ActorNames.QUESTION_ACTOR) questionAct
logger.info("in Future sequence")
Await.result(f, Duration.apply("300s"))
}
-
- def createFrameworkMappingData() = Action(parse.multipartFormData) { implicit request =>
- val competency = request.body
- .file("file")
- .map { filePart =>
- val absolutePath = filePart.ref.path.toAbsolutePath
- println("createFrameworkMappingData:= " + absolutePath)
- CompetencyExcelParser.getCompetency(absolutePath.toFile)
- }
- val futures = competency.get.map(competncy => {
- val headers = commonHeaders(request.headers)
- logger.info("put headers " + headers)
- val questionRequest = getRequest(competncy, headers, QuestionOperations.createQuestion.toString)
- logger.info("After the questionRequest")
- setRequestContext(questionRequest, version, objectType, schemaName)
- logger.info("After the setRequestContext")
- getResponse(ApiId.CREATE_QUESTION, questionActor, questionRequest)
- }
- )
- val futures1 = competency.get.map(competncy => {
- val headers = commonHeaders(request.headers)
- System.out.println("Headers is " + headers)
- val body = competencyRequestBody()
- System.out.println("body is " + body)
- val question = body.getOrDefault("competency", new java.util.HashMap()).asInstanceOf[java.util.Map[String, AnyRef]]
- competncy.putAll(headers)
- val questionRequest = getRequest(competncy, headers, QuestionOperations.bulkUploadFrameworkMapping.toString)
- setRequestContext(questionRequest, version, "competency", "competency")
- getResult(ApiId.FRAMEWORK_COMPETENCY_QUESTION, questionActor, questionRequest)
- })
-
- logger.info("After the getResponse")
- val f = Future.sequence(futures1).map(results => results.map(_.asInstanceOf[Response]).groupBy(_.getResponseCode.toString).mapValues(listResult => {
- listResult.map(result => {
- setResponseEnvelope(result)
- JavaJsonUtils.serialize(result.getResult)
- })
- })).map(f => Ok(Json.stringify(Json.toJson(f))).as("application/json"))
- logger.info("in Future sequence")
- Await.result(f, Duration.apply("30s"))
- }
-
}
diff --git a/assessment-api/assessment-service/app/handlers/CompetencyExcelParser.scala b/assessment-api/assessment-service/app/handlers/CompetencyExcelParser.scala
deleted file mode 100644
index c4d6d6e78bc7ff4360f1b5f58793244ddcbd50ab..0000000000000000000000000000000000000000
--- a/assessment-api/assessment-service/app/handlers/CompetencyExcelParser.scala
+++ /dev/null
@@ -1,113 +0,0 @@
-package handlers
-
-import org.apache.poi.ss.usermodel.DataFormatter
-import org.apache.poi.xssf.usermodel.{XSSFRow, XSSFSheet, XSSFWorkbook}
-import org.slf4j.{Logger, LoggerFactory}
-
-import java.io.{File, FileInputStream}
-import java.util
-import scala.collection.JavaConverters.{asScalaIteratorConverter, iterableAsScalaIterableConverter, mapAsScalaMapConverter}
-import scala.collection.mutable
-import scala.collection.mutable.ListBuffer
-
-case class Activity(code: String, label: String)
-
-object CompetencyExcelParser {
-
- private val logger: Logger = LoggerFactory.getLogger(getClass.getName)
-
- private var getData: List[util.Map[String, AnyRef]] = List.empty
-
- def parseCompetencyData(xssFRow: XSSFRow) = {
- val data = new java.util.HashMap().asInstanceOf[java.util.Map[String, AnyRef]]
- val listData = new util.ArrayList[AnyRef]()
-
- val rowContent = (0 until xssFRow.getPhysicalNumberOfCells)
- .map(colId => Option(xssFRow.getCell(colId)).getOrElse("").toString).toList
-
- val function = rowContent.apply(0).trim
- val year = rowContent.apply(1).trim
- val roleId = rowContent.apply(2).trim
- val roleLabel = rowContent.apply(3).trim
- val competencyMapping = rowContent.apply(4).trim
- val activityId = rowContent.apply(5).trim
- val activityLabel = rowContent.apply(6).trim
- val competencyId = rowContent.apply(7).trim
- val competency = rowContent.apply(8).trim
- val competencyLevelId = rowContent.apply(9).trim
- listData.add(function)
- listData.add(year)
- listData.add(roleId)
- listData.add(roleLabel)
- listData.add(activityId)
- listData.add(activityLabel)
- listData.add(competencyId)
- listData.add(competency)
- listData.add(competencyLevelId)
- data.put(competencyMapping, listData)
- data
- }
-
- def getCompetency(file: File): List[java.util.Map[String, AnyRef]] = {
- logger.info("enter into the getCompetency method")
- val finalData: mutable.Map[String, List[Map[String, AnyRef]]] = mutable.Map.empty
- try {
- val workbook = new XSSFWorkbook(new FileInputStream(file))
- (0 until workbook.getNumberOfSheets)
- .foreach(index => {
- getData = getCompetenciesData(workbook.getSheetAt(index))
- val convertedData = getData.map(_.asScala.toMap)
- finalData += (workbook.getSheetName(index) -> convertedData)
- getData = finalData.toList.flatMap { case (_, maps) => maps.map(convertMap) }
- })
- getData
-
- } catch {
- case e: Exception => throw new Exception("Invalid File")
- }
- }
-
- def convertMap(map: Map[String, AnyRef]): util.Map[String, AnyRef] = {
- val javaMap = new util.HashMap[String, AnyRef]()
- map.foreach { case (k, v) => javaMap.put(k, v) }
- javaMap
- }
-
- def getCompetenciesData(sheet: XSSFSheet): List[util.Map[String, AnyRef]] = {
- val rows = sheet.asScala.drop(1)
- getData = rows.flatMap(row => {
- val rowValue = {
- if (sheet.getWorkbook.getSheetIndex(sheet) == 1) {
- if (!row.getCell(4).getStringCellValue.isEmpty) {
- row.getCell(4)
- }
- } else if (!row.getCell(5).getStringCellValue.isEmpty) {
- row.getCell(5)
- }
- }
- if (sheet.getWorkbook.getSheetIndex(sheet) == 1 && rowValue != null && !rowValue.toString.equals("()"))
- Option(sheet.getRow(row.getRowNum)).map(parseCompetencyData)
- else if (sheet.getWorkbook.getSheetIndex(sheet) == 2 && rowValue != null && !rowValue.toString.equals("()"))
- Option(sheet.getRow(row.getRowNum)).map(parseCompetencyData)
- else if (sheet.getWorkbook.getSheetIndex(sheet) == 3 && rowValue != null && !rowValue.toString.equals("()"))
- Option(sheet.getRow(row.getRowNum)).map(parseCompetencyData)
- else if (sheet.getWorkbook.getSheetIndex(sheet) == 4 && rowValue != null && !rowValue.toString.equals("()"))
- Option(sheet.getRow(row.getRowNum)).map(parseCompetencyData)
- else if (sheet.getWorkbook.getSheetIndex(sheet) == 5 && rowValue != null && !rowValue.toString.equals("()"))
- Option(sheet.getRow(row.getRowNum)).map(parseCompetencyData)
- else if (sheet.getWorkbook.getSheetIndex(sheet) == 6 && rowValue != null && !rowValue.toString.equals("()"))
- Option(sheet.getRow(row.getRowNum)).map(parseCompetencyData)
- else if (sheet.getWorkbook.getSheetIndex(sheet) == 7 && rowValue != null && !rowValue.toString.equals("()"))
- Option(sheet.getRow(row.getRowNum)).map(parseCompetencyData)
- else if (sheet.getWorkbook.getSheetIndex(sheet) == 8 && rowValue != null && !rowValue.toString.equals("()"))
- Option(sheet.getRow(row.getRowNum)).map(parseCompetencyData)
- else if (sheet.getWorkbook.getSheetIndex(sheet) == 9 && rowValue != null && !rowValue.toString.equals("()"))
- Option(sheet.getRow(row.getRowNum)).map(parseCompetencyData)
- else {
- None
- }
- }).toList
- getData
- }
-
-}
diff --git a/assessment-api/assessment-service/app/utils/ApiId.scala b/assessment-api/assessment-service/app/utils/ApiId.scala
index 7323204370ea827d548ee256d2079c5be6bf9ebd..daf20fc4819bf3c72e9e5e0318df15c1d25fbd31 100644
--- a/assessment-api/assessment-service/app/utils/ApiId.scala
+++ b/assessment-api/assessment-service/app/utils/ApiId.scala
@@ -26,7 +26,6 @@ object ApiId {
val REJECT_QUESTION = "api.question.reject"
val COPY_QUESTION = "api.question.copy"
val BULK_UPLOAD_QUESTION = "api.question.bulk.upload"
- val FRAMEWORK_COMPETENCY_QUESTION = "api.question.mapping"
//QuestionSet APIs
val CREATE_QUESTION_SET = "api.questionset.create"
val READ_QUESTION_SET = "api.questionset.read"
diff --git a/assessment-api/assessment-service/app/utils/QuestionOperations.scala b/assessment-api/assessment-service/app/utils/QuestionOperations.scala
index ec1665a9527f38581bcc218a445f26fb35372be8..8d71d88e12b69be1db77e28e986bf4fab1bc628c 100644
--- a/assessment-api/assessment-service/app/utils/QuestionOperations.scala
+++ b/assessment-api/assessment-service/app/utils/QuestionOperations.scala
@@ -1,5 +1,5 @@
package utils
object QuestionOperations extends Enumeration {
- val createQuestion, readQuestion, readPrivateQuestion, updateQuestion, reviewQuestion, publishQuestion, retireQuestion, importQuestion, systemUpdateQuestion, listQuestions, rejectQuestion, copyQuestion, bulkUploadFrameworkMapping = Value
+ val createQuestion, readQuestion, readPrivateQuestion, updateQuestion, reviewQuestion, publishQuestion, retireQuestion, importQuestion, systemUpdateQuestion, listQuestions, rejectQuestion, copyQuestion = Value
}
diff --git a/assessment-api/assessment-service/conf/application.conf b/assessment-api/assessment-service/conf/application.conf
index 1fcb121c8bbf09fa0c5d86f90ede10d0dad6491d..5e82dfa279fa89ccd4f98fed9fe787a7c816b7b8 100644
--- a/assessment-api/assessment-service/conf/application.conf
+++ b/assessment-api/assessment-service/conf/application.conf
@@ -395,10 +395,6 @@ question {
keyspace = "question_store"
list.limit=20
}
-competency {
- keyspace = "taxonomy"
- list.limit=20
-}
questionset.keyspace="hierarchy_store"
cassandra {
diff --git a/assessment-api/assessment-service/conf/routes b/assessment-api/assessment-service/conf/routes
index f9c36b0699f041c8cc036b7defeff6bcc1aa6130..3202b944d1918678badc758a56f85593ac968781 100644
--- a/assessment-api/assessment-service/conf/routes
+++ b/assessment-api/assessment-service/conf/routes
@@ -25,7 +25,6 @@ POST /question/v4/list controllers.v4.QuestionControl
POST /question/v4/reject/:identifier controllers.v4.QuestionController.reject(identifier:String)
POST /question/v4/copy/:identifier controllers.v4.QuestionController.copy(identifier:String, mode:Option[String])
POST /question/v4/bulk/upload controllers.v4.QuestionController.uploadExcel
-POST /question/v4/bulk/upload/mapping controllers.v4.QuestionController.createFrameworkMappingData
# QuestionSet API's
POST /questionset/v4/create controllers.v4.QuestionSetController.create
diff --git a/schemas/competency/1.0/config.json b/schemas/competency/1.0/config.json
deleted file mode 100644
index 44e3a2e7f9d48978a52cc378d2c3031217a65840..0000000000000000000000000000000000000000
--- a/schemas/competency/1.0/config.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "objectType": "competency",
- "version": "enable",
- "versionCheckMode": "ON",
- "cacheEnabled": false,
- "schema_restrict_api": true,
- "external": {
- "tableName": "competency",
- "properties": {
- "function": {
- "type": "string"
- },
- "competency_code": {
- "type": "string"
- },
- "subject": {
- "type": "string"
- },
- "competency_label": {
- "type": "string"
- },
- "competency_description": {
- "type": "string"
- },
- "competency_level_code": {
- "type": "string"
- },
- "competency_level_label": {
- "type": "string"
- },
- "competency_level_description": {
- "type": "string"
- },
- "activity_code": {
- "type": "string"
- },
- "activity_label": {
- "type": "string"
- },
- "question_code": {
- "type": "string"
- }
- },
- "primaryKey": ["identifier"]
- }
-}
\ No newline at end of file
diff --git a/schemas/competency/1.0/schema.json b/schemas/competency/1.0/schema.json
deleted file mode 100644
index c3117fff5318845bd68308ac8cbed0b2845f3f27..0000000000000000000000000000000000000000
--- a/schemas/competency/1.0/schema.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "$id": "competency-schema.json",
- "$schema": "http://json-schema.org/draft-07/schema#",
- "title": "Competency",
- "type": "object",
- "properties": {
- "function": {
- "type": "string"
- },
- "competency_code": {
- "type": "string"
- },
- "subject": {
- "type": "string"
- },
- "competency_label": {
- "type": "string"
- },
- "competency_description": {
- "type": "string"
- },
- "competency_level_code": {
- "type": "string"
- },
- "competency_level_label": {
- "type": "string"
- },
- "competency_level_description": {
- "type": "string"
- },
- "activity_code": {
- "type": "string"
- },
- "activity_label": {
- "type": "string"
- },
- "question_code": {
- "type": "string"
- }
- },
- "additionalProperties": false
-}