Skip to content

Removed the unwanted changes from the branch #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rahulbowade wants to merge 1 commit into
base: Gcloud_fix
Choose a base branch
from
Open

Removed the unwanted changes from the branch #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
4 changes: 0 additions & 4 deletions assessment-api/assessment-actors/src/main/scala/org/sunbird/managers/AssessmentManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
6 changes: 0 additions & 6 deletions assessment-api/assessment-service/app/controllers/BaseController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand All @@ -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 => {
Expand Down
44 changes: 1 addition & 43 deletions assessment-api/assessment-service/app/controllers/v4/QuestionController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"))
}

}
113 changes: 0 additions & 113 deletions assessment-api/assessment-service/app/handlers/CompetencyExcelParser.scala
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion assessment-api/assessment-service/app/utils/ApiId.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion assessment-api/assessment-service/app/utils/QuestionOperations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
4 changes: 0 additions & 4 deletions assessment-api/assessment-service/conf/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,6 @@ question {
keyspace = "question_store"
list.limit=20
}
competency {
keyspace = "taxonomy"
list.limit=20
}
questionset.keyspace="hierarchy_store"

cassandra {
Expand Down
1 change: 0 additions & 1 deletion assessment-api/assessment-service/conf/routes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
46 changes: 0 additions & 46 deletions schemas/competency/1.0/config.json
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions schemas/competency/1.0/schema.json
View file
Open in desktop

This file was deleted.