Issue #SB-9180 feat: Changing procy middleware

src/config/contentProviderApiConfig.json

@@ -36,6 +36,8 @@
         "GET_PUBLISHER_URI": "/dialcode/v3/publisher/read",
         "UPDATE_PUBLISHER_URI": "/dialcode/v3/publisher/update",
         "UPDATE_COLLABORATOR": "/content/v1/collaborator/update",
+        "RESERVE_DIALCODE": "/content/v3/dialcode/reserve",
+        "RELEASE_DIALCODE": "/content/v3/dialcode/release",
         
         "CHANNEL_URI": "/channel/v3/read",
         "CHANNEL_LIST_URI": "/channel/v3/list",

libs @ 7a6df7ae

-Subproject commit 2c2c0a2ac5e131eec1d470ac144cbd4643992644
+Subproject commit 7a6df7aee074c64ee2400bfb0b051063155e4658

src/middlewares/proxy.middleware.js

 var proxy = require('express-http-proxy')
 var contentService = require('../service/contentService')
 var collaboratorService = require('../service/collaboratorService')
+var dialCodeService = require('../service/dialCodeService')
 var lockService = require('../service/lockService')
 var requestMiddleware = require('../middlewares/request.middleware')
 var configUtil = require('sb-config-util')
@@ -303,6 +304,26 @@ module.exports = function (app) {
       collaboratorService.updateCollaborators
     )
 
+  app
+    .route(
+      '/action' + configUtil.getConfig('RESERVE_DIALCODE') + '/:contentId'
+    )
+    .post(
+      requestMiddleware.createAndValidateRequestBody,
+      requestMiddleware.validateToken,
+      dialCodeService.reserveDialCode
+    )
+
+  app
+    .route(
+      '/action' + configUtil.getConfig('RELEASE_DIALCODE') + '/:contentId'
+    )
+    .patch(
+      requestMiddleware.createAndValidateRequestBody,
+      requestMiddleware.validateToken,
+      dialCodeService.releaseDialCode
+    )
+
   app
     .route(
       '/action' + configUtil.getConfig('CREATE_LOCK')
@@ -341,4 +362,4 @@ module.exports = function (app) {
       requestMiddleware.createAndValidateRequestBody,
       lockService.listLock
     )
-}
+}
\ No newline at end of file

src/routes/dialCodeRoutes.js

@@ -52,4 +52,12 @@ module.exports = function (app) {
 
   app.route(BASE_URL + '/process/status/:processId')
     .get(requestMiddleware.createAndValidateRequestBody, dialCodeService.getProcessIdStatusAPI)
+
+  app.route(BASE_URL + '/reserve/:contentId')
+    .post(requestMiddleware.createAndValidateRequestBody, requestMiddleware.validateToken,
+      dialCodeService.reserveDialCode)
+
+  app.route(BASE_URL + '/release/:contentId')
+    .patch(requestMiddleware.createAndValidateRequestBody, requestMiddleware.validateToken,
+      dialCodeService.releaseDialCode)
 }

src/service/dialCodeService.js

@@ -754,6 +754,86 @@ function getPublisherAPI (req, response) {
   ])
 }
 
+function reserveDialCode (req, response) {
+  var data = req.body
+  var rspObj = req.rspObj
+
+  async.waterfall([
+
+    function (CBW) {
+      contentProvider.reserveDialcode(req.params.contentId, data, req.headers, function (err, res) {
+        if (err || res.responseCode !== responseCode.SUCCESS) {
+          rspObj.errCode = res && res.params ? res.params.err : dialCodeMessage.RELEASE.FAILED_CODE
+          rspObj.errMsg = res && res.params ? res.params.errmsg : dialCodeMessage.RELEASE.FAILED_MESSAGE
+          rspObj.responseCode = res && res.responseCode ? res.responseCode : responseCode.CLIENT_ERROR
+          var httpStatus = res && res.statusCode >= 100 && res.statusCode < 600 ? res.statusCode : 500
+          return response.status(httpStatus).send(respUtil.errorResponse(rspObj))
+        } else {
+          CBW(null, res)
+        }
+      })
+    }, function (res, CBW) {
+      var requestObj = data && data.request && data.request.dialcodes ? data.request.dialcodes : {}
+      if (requestObj.qrCodeSpec && !_.isEmpty(requestObj.qrCodeSpec) && res.result.reservedDialcodes &&
+        res.result.reservedDialcodes.length) {
+        var batchImageService = new BatchImageService({
+          width: requestObj.qrCodeSpec.width,
+          height: requestObj.qrCodeSpec.height,
+          border: requestObj.qrCodeSpec.border,
+          text: requestObj.qrCodeSpec.text,
+          errCorrectionLevel: requestObj.qrCodeSpec.errCorrectionLevel,
+          color: requestObj.qrCodeSpec.color
+        })
+        var channel = _.clone(req.headers['x-channel-id'])
+        batchImageService.createRequest(res.result.reservedDialcodes, channel, requestObj.publisher, rspObj,
+          function (err, processId) {
+            if (err) {
+              LOG.error(utilsService.getLoggerData(rspObj, 'ERROR', filename, 'generateDialCodeAPI',
+                'Error while creating request to child process for images creation', err))
+              res.responseCode = responseCode.PARTIAL_SUCCESS
+              return response.status(207).send(respUtil.successResponse(res))
+            } else {
+              res.result.processId = processId
+              CBW(null, res)
+            }
+          })
+      } else {
+        CBW(null, res)
+      }
+    },
+    function (res) {
+      rspObj.result = res.result
+      return response.status(200).send(respUtil.successResponse(rspObj))
+    }
+  ])
+}
+
+function releaseDialCode (req, response) {
+  var data = req.body
+  var rspObj = req.rspObj
+
+  async.waterfall([
+
+    function (CBW) {
+      contentProvider.releaseDialcode(req.params.contentId, data, req.headers, function (err, res) {
+        if (err || res.responseCode !== responseCode.SUCCESS) {
+          rspObj.errCode = res && res.params ? res.params.err : dialCodeMessage.RELEASE.FAILED_CODE
+          rspObj.errMsg = res && res.params ? res.params.errmsg : dialCodeMessage.RELEASE.FAILED_MESSAGE
+          rspObj.responseCode = res && res.responseCode ? res.responseCode : responseCode.CLIENT_ERROR
+          var httpStatus = res && res.statusCode >= 100 && res.statusCode < 600 ? res.statusCode : 500
+          return response.status(httpStatus).send(respUtil.errorResponse(rspObj))
+        } else {
+          CBW(null, res)
+        }
+      })
+    },
+    function (res) {
+      rspObj.result = res.result
+      return response.status(200).send(respUtil.successResponse(rspObj))
+    }
+  ])
+}
+
 module.exports.generateDialCodeAPI = generateDialCodeAPI
 module.exports.dialCodeListAPI = dialCodeListAPI
 module.exports.updateDialCodeAPI = updateDialCodeAPI
@@ -766,3 +846,5 @@ module.exports.createPublisherAPI = createPublisherAPI
 module.exports.createPublisherAPI = createPublisherAPI
 module.exports.getPublisherAPI = getPublisherAPI
 module.exports.updatePublisherAPI = updatePublisherAPI
+module.exports.reserveDialCode = reserveDialCode
+module.exports.releaseDialCode = releaseDialCode

src/service/messageUtil.js

@@ -590,6 +590,11 @@ exports.DIALCODE = {
     MISSING_MESSAGE: 'Required fields for get publisher are missing',
     FAILED_CODE: 'ERR_GET_PUBLISHER_DIALCODE_FAILED',
     FAILED_MESSAGE: 'GET publisher failed'
+  },
+
+  RELEASE: {
+    FAILED_CODE: 'ERR_RELEASING_DIALCODE_FAILED',
+    FAILED_MESSAGE: 'Unable to release the dial code'
   }
 }