Commit 43cbbf16 authored by anuj's avatar anuj
Browse files

Issue #SB-1937 feat: Added channel data exhaust api

parent d5bba07e
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 v1.5.1 v1.5 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 56 additions and 6 deletions
+56 -6
......@@ -60,8 +60,9 @@
"TELEMETRY": "/data/v3/telemetry",
"SUBMIT_DATA_EXHAUST_URI": "/data/v3/dataset/request/submit",
"LIST_DATA_EXHAUST_URI": "/data/v3/dataset/request/list",
"READ_DATA_EXHAUST_URI": "/data/v3/dataset/request/read"
"SUBMIT_DATA_EXHAUST_URI": "/data/v2/dataset/request/submit",
"LIST_DATA_EXHAUST_URI": "/data/v2/dataset/request/list",
"READ_DATA_EXHAUST_URI": "/data/v2/dataset/request/read",
"CHANNEL_DATA_EXHAUST_URI": "/data/v2/dataset/request"
}
}
\ No newline at end of file
Subproject commit 3c2a6448d9e73b9ccc69f91b73bdde94eb32cbd7
Subproject commit 952b25e5b0e3c2201bc8e1720bbe1be817308294
......@@ -19,4 +19,7 @@ module.exports = function (app) {
app.route(BASE_URL + '/read/:clientKey/:requestId')
.get(requestMiddleware.createAndValidateRequestBody, dataExaustService.getDataSetDetailRequest)
app.route(BASE_URL + '/:dataSetId/:channelId')
.get(requestMiddleware.createAndValidateRequestBody, dataExaustService.getChannelDataSetRequest)
}
......@@ -68,7 +68,7 @@ function getListOfDataSetRequest (req, response) {
function (CBW) {
LOG.info(utilsService.getLoggerData(rspObj, 'INFO', filename, 'getListOfDataSetRequest',
'Request to content provider to get list of data get', {
'Request to content provider to get list of dataset', {
query: query,
clientKey: clientKey,
headers: req.headers
......@@ -107,7 +107,7 @@ function getDataSetDetailRequest (req, response) {
function (CBW) {
LOG.info(utilsService.getLoggerData(rspObj, 'INFO', filename, 'getDataSetDetailRequest',
'Request to content provider to get detail of data get', {
'Request to content provider to get detail of dataset', {
clientKey: clientKey,
requestId: requestId,
headers: req.headers
......@@ -132,6 +132,48 @@ function getDataSetDetailRequest (req, response) {
])
}
/**
* This constructor function helps to get channel data set.
* @param {object} req
* @param {object} response
*/
function getChannelDataSetRequest (req, response) {
var query = req.query
var rspObj = req.rspObj
var dataSetId = req.params.dataSetId
var channelId = req.params.channelId
async.waterfall([
function (CBW) {
LOG.info(utilsService.getLoggerData(rspObj, 'INFO', filename, 'getChannelDataSetRequest',
'Request to content provider to get channel dataset', {
query: query,
dataSetId: dataSetId,
channelId: channelId,
headers: req.headers
}))
contentProvider.getChannelDataSetRequest(query, dataSetId, channelId, req.headers, function (err, res) {
if (err || res.responseCode !== responseCode.SUCCESS) {
LOG.error(utilsService.getLoggerData(rspObj, 'ERROR', filename, 'getChannelDataSetRequest',
'Getting error from content provider', res))
rspObj = utilsService.getErrorResponse(rspObj, res, dataSetMessages.CHANNEL)
return response.status(utilsService.getHttpStatus(res)).send(respUtil.errorResponse(rspObj))
} else {
CBW(null, res)
}
})
},
function (res) {
rspObj.result = res.result
LOG.info(utilsService.getLoggerData(rspObj, 'INFO', filename, 'getChannelDataSetRequest',
'Sending response back to user'))
return response.status(200).send(respUtil.successResponse(rspObj))
}
])
}
module.exports.submitDataSetRequest = submitDataSetRequest
module.exports.getListOfDataSetRequest = getListOfDataSetRequest
module.exports.getDataSetDetailRequest = getDataSetDetailRequest
module.exports.getChannelDataSetRequest = getChannelDataSetRequest
......@@ -519,5 +519,9 @@ exports.DATASET = {
READ: {
FAILED_CODE: 'GET_DATASET_REQUEST_FAILED',
FAILED_MESSAGE: 'Get dataset request detail failed'
},
CHANNEL: {
FAILED_CODE: 'GET_CHANNEL_DATASET_REQUEST_FAILED',
FAILED_MESSAGE: 'Get channel dataset request failed'
}
}
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