Commit 080bd306 authored by Harishkumar Gangula's avatar Harishkumar Gangula
Browse files

Issue #SB-3313 feat: added framework publish

parent 23b04429
master dependabot/npm_and_yarn/src/async-2.6.4 dependabot/npm_and_yarn/src/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/flat-and-mocha-5.0.2 dependabot/npm_and_yarn/src/handlebars-4.7.7 dependabot/npm_and_yarn/src/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/lodash-4.17.21 dependabot/npm_and_yarn/src/minimist-and-project-sunbird/telemetry-sdk-and-handlebars-and-mkdirp-1.2.8 release-3.6.0 release-4.3.0 release-4.8.0 release-5.2.0 release-5.3.0 release-5.6.0 release-6.0.0 v1.13.3 v1.13 v1.12 v1.11.1 v1.11 v1.10.1 v1.10 v1.9 v1.8.2 v1.8 v1.7.1 v1.7 v1.6 tmp-testPR tmp-sunbird-bootcamp tmp-rjshrjndrn-patch-1 tmp-revert-118-testPR tmp-revert-110-logs tmp-revert-99-revert-98-revert-97-revert-96-rjshrjndrn-patch-1 tmp-revert-98-revert-97-revert-96-rjshrjndrn-patch-1 tmp-revert-97-revert-96-rjshrjndrn-patch-1 tmp-revert-96-rjshrjndrn-patch-1 tmp-release-sonarcloud tmp-release-2.6.0 tmp-release-2.3.0 tmp-release-2.1.1 tmp-release-2.1.0 tmp-release-2.1.0_pluginSearch tmp-release-2.0.0 tmp-release-1.15 tmp-release-1.14.3 tmp-release-1.14 tmp-release-1.14-sp3 tmp-release-1.8.3 tmp-refactored-dev-deploy tmp-master tmp-loadtest tmp-load-testing tmp-jenkins-test tmp-jenkins-pipeline tmp-final-variable-refac tmp-dial-assemble-api tmp-content-update-read tmp-circleci release-5.6.0_RC1 release-5.2.0_RC1 release-4.8.5_RC1 release-4.8.0_RC2 release-4.8.0_RC1 release-4.3.0_RC1 release-3.8.0_RC3 release-3.8.0_RC2 release-3.8.0_RC1 release-3.7.0_RC2 release-3.7.0_RC1 release-3.6.0_RC1 release-3.2.0_RC2 release-3.2.0_RC1 release-3.1.0 release-3.1.0_RC2 release-3.1.0_RC1 release-3.0.1_RC1 release-3.0.0 release-3.0.0_RC1 release-2.10.0 release-2.10.0_RC2 release-2.10.0_RC1 release-2.9.0_RC3 release-2.9.0_RC2 release-2.9.0_RC1 release-2.8.0 release-2.8.0_RC4 release-2.8.0_RC3 release-2.8.0_RC2 release-2.8.0_RC1 release-2.7.0 release-2.7.0_RC2 release-2.7.0_RC1 release-2.6.0 release-2.6.0_RC4 release-2.6.0_RC3 release-2.6.0_RC2 release-2.6.0_RC1 release-2.3.0 release-2.3.0_RC2 release-2.3.0_RC1 release-2.1.1_RC1 release-2.1.0_RC2 release-2.1.0_RC1 release-2.0.0 release-2.0.0_RC5 release-2.0.0_RC4 release-2.0.0_RC3 release-2.0.0_RC2 release-2.0.0_RC1 release-1.15.0 release-1.15_RC7 release-1.15_RC6 release-1.15_RC5 release-1.15_RC4 release-1.15_RC3 release-1.15_RC2 release-1.15_RC1 release-1.14.0
No related merge requests found
Showing with 64 additions and 9 deletions
+64 -9
......@@ -19,7 +19,7 @@ const port = process.env.sunbird_content_service_port ? process.env.sunbird_cont
globalEkstepProxyBaseUrl = process.env.sunbird_content_plugin_base_url ? process.env.sunbird_content_plugin_base_url : 'https://qa.ekstep.in'
const contentProviderBaseUrl = process.env.sunbird_content_provider_api_base_url ? process.env.sunbird_content_provider_api_base_url : 'https://dev.ekstep.in/api'
const contentProviderBaseUrl = process.env.sunbird_content_provider_api_base_url ? process.env.sunbird_content_provider_api_base_url : 'https://qa.ekstep.in/api'
const contentProviderApiKey = process.env.sunbird_content_provider_api_key
const learnerServiceApiKey = process.env.sunbird_learner_service_api_key
......
......@@ -47,6 +47,7 @@
"FRAMEWORK_CREATE_URI": "/framework/v3/create",
"FRAMEWORK_UPDATE_URI": "/framework/v3/update",
"FRAMEWORK_COPY_URI": "/framework/v3/copy",
"FRAMEWORK_PUBLISH_URI":"/framework/v3/publish",
"FRAMEWORK_TERM_URI": "/framework/v3/term/read",
"FRAMEWORK_TERM_SEARCH_URI": "/framework/v3/term/search",
......
Subproject commit 203cecd3d5ded0b79bb536427e24295944950355
Subproject commit 14c58ffb7e009d51a155a5f3ff46dc0e7a925777
......@@ -7,21 +7,23 @@
var frameworkService = require('../service/frameworkService')
var requestMiddleware = require('../middlewares/request.middleware')
var BASE_URL_V1_Framework = '/v1/framework'
var baseUrl = '/v1/framework'
module.exports = function (app) {
app.route(BASE_URL_V1_Framework + '/read/:frameworkId')
app.route(baseUrl + '/read/:frameworkId')
.get(requestMiddleware.createAndValidateRequestBody, frameworkService.getFrameworkById)
app.route(BASE_URL_V1_Framework + '/list')
app.route(baseUrl + '/list')
.post(requestMiddleware.createAndValidateRequestBody, frameworkService.frameworklList)
app.route(BASE_URL_V1_Framework + '/create')
app.route(baseUrl + '/create')
.post(requestMiddleware.createAndValidateRequestBody, frameworkService.frameworkCreate)
app.route(BASE_URL_V1_Framework + '/update/:frameworkId')
app.route(baseUrl + '/update/:frameworkId')
.patch(requestMiddleware.createAndValidateRequestBody, frameworkService.frameworkUpdate)
app.route(BASE_URL_V1_Framework + '/copy/:frameworkId')
app.route(baseUrl + '/copy/:frameworkId')
.post(requestMiddleware.createAndValidateRequestBody, frameworkService.frameworkCopy)
app.route(baseUrl + '/publish/:frameworkId')
.post(requestMiddleware.createAndValidateRequestBody, frameworkService.frameworkPublish)
}
......@@ -264,8 +264,60 @@ function frameworkCopy (req, response) {
])
}
function frameworkPublish (req, response) {
var rspObj = req.rspObj
var data = req.body
data.frameworkId = req.params.frameworkId
// Adding telemetry object data
if (rspObj.telemetryData) {
rspObj.telemetryData.object = utilsService.getObjectData(data.frameworkId, 'framework', '', {})
}
if (!data) {
LOG.error(utilsService.getLoggerData(rspObj, 'ERROR', filename, 'frameworkServiceAPI',
'Error due to required params are missing', data))
rspObj.responseCode = responseCode.CLIENT_ERROR
return response.status(400).send(respUtil.errorResponse(rspObj))
}
var ekStepReqData = {
request: data.request
}
async.waterfall([
function (CBW) {
LOG.info(utilsService.getLoggerData(rspObj, 'INFO', filename, 'frameworkServiceAPI',
'Request to ekstep for search object type', {
body: data,
headers: req.headers,
frameworkId: data.frameworkId
}))
ekStepUtil.frameworkPublish(ekStepReqData, data.frameworkId, req.headers, function (err, res) {
if (err || res.responseCode !== responseCode.SUCCESS) {
LOG.error(utilsService.getLoggerData(rspObj, 'ERROR', filename, 'frameworkServiceAPI',
'Getting error from ekstep', res))
rspObj.responseCode = res && res.responseCode ? res.responseCode : responseCode.SERVER_ERROR
var httpStatus = res && res.statusCode >= 100 && res.statusCode < 600 ? res.statusCode : 500
rspObj = utilsService.getErrorResponse(rspObj, res)
return response.status(httpStatus).send(respUtil.errorResponse(rspObj))
} else {
CBW(null, res)
}
})
},
function (res) {
LOG.info(utilsService.getLoggerData(rspObj, 'INFO', filename, 'frameworkServiceAPI',
'Sending response back to user'))
rspObj.result = res.result
return response.status(200).send(respUtil.successResponse(rspObj))
}
])
}
module.exports.getFrameworkById = getFrameworkById
module.exports.frameworklList = frameworklList
module.exports.frameworkCreate = frameworkCreate
module.exports.frameworkUpdate = frameworkUpdate
module.exports.frameworkCopy = frameworkCopy
module.exports.frameworkPublish = frameworkPublish
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment