Adding some additional logging for service bus messages

server/plugins/logging.js

@@ -24,4 +24,4 @@ export default {
  '/public/fonts/bold-b542beb274-v2.woff2'
  ]
  }
-}
+}

server/routes/__tests__/feedback.spec.js

@@ -40,6 +40,9 @@ describe(url, () => {
  const response = await submitPostRequest(options, 302, session)
  expect(sendMessage).toHaveBeenCalledTimes(1)
  expect(sendMessage).toHaveBeenCalledWith(expect.objectContaining({
+ info: expect.any(Function)
+ }),
+ expect.objectContaining({
  givingFeedbackToAEnvironmentalProblemReport: expect.objectContaining({
  feedbackRating: 'vsatisfied',
  feedbackText: 'This is test feedback',

server/routes/__tests__/smell/other-information.spec.js

@@ -26,6 +26,9 @@ describe(url, () => {
  const response = await submitPostRequest(options, 302, session)
  expect(sendMessage).toHaveBeenCalledTimes(1)
  expect(sendMessage).toHaveBeenCalledWith(expect.objectContaining({
+ info: expect.any(Function)
+ }),
+ expect.objectContaining({
  reportingAnEnvironmentalProblem: expect.objectContaining({
  reportType: 200,
  reporterName: 'John Smith',

server/routes/__tests__/water-pollution/other-information.spec.js

@@ -26,6 +26,9 @@ describe(url, () => {
  const response = await submitPostRequest(options, 302, session)
  expect(sendMessage).toHaveBeenCalledTimes(1)
  expect(sendMessage).toHaveBeenCalledWith(expect.objectContaining({
+ info: expect.any(Function)
+ }),
+ expect.objectContaining({
  reportingAnEnvironmentalProblem: expect.objectContaining({
  reportType: 100,
  reporterName: 'John Smith',

server/routes/feedback.js

@@ -31,7 +31,7 @@ const handlers = {
  throw new Error('Invalid payload')
  }
 
- await sendMessage(payload, '-feedback')
+ await sendMessage(request.logger, payload, '-feedback')
 
  return h.redirect(constants.routes.FEEDBACK_SUCCESS)
  }

server/routes/smell/other-information.js

@@ -19,7 +19,7 @@ const handlers = {
  throw new Error('Invalid payload')
  }
 
- await sendMessage(payload)
+ await sendMessage(request.logger, payload)
 
  return h.redirect(constants.routes.REPORT_SENT)
  }

server/routes/water-pollution/other-information.js

@@ -19,7 +19,7 @@ const handlers = {
  throw new Error('Invalid payload')
  }
 
- await sendMessage(payload)
+ await sendMessage(request.logger, payload)
 
  return h.redirect(constants.routes.REPORT_SENT)
  }

server/services/__tests__/service-bus.spec.js

@@ -19,16 +19,20 @@ const senderMock = {
  sendMessages: mockSendMessages,
  close: mockClose
 }
+const loggerMock = {
+ info: jest.fn()
+}
 
 describe('service-bus', () => {
  it('Send a message to the service bus', async () => {
  jest.spyOn(ServiceBusClient.prototype, 'createSender').mockImplementation(() => {
  return senderMock
  })
- await sendMessage(payload)
+ await sendMessage(loggerMock, payload)
  expect(mockSendMessages).toHaveBeenCalledTimes(1)
  expect(mockClose).toHaveBeenCalledTimes(1)
  expect(mockTryAddMessage).toHaveBeenCalledTimes(1)
  expect(mockTryAddMessage).toHaveBeenCalledWith({ body: payload })
+ expect(loggerMock.info).toHaveBeenCalledTimes(1)
  })
 })

server/services/service-bus.js

@@ -6,7 +6,8 @@ import config from '../utils/config.js'
 const connectionString = config.serviceBusConnectionString
 const queueName = config.serviceBusQueueName
 
-const sendMessage = async (message, queueSuffix = '') => {
+const sendMessage = async (logger, message, queueSuffix = '') => {
+ logger.info(`service-bus.js:sendMessage ${JSON.stringify(message)} to service bus ${queueName}${queueSuffix}`)
  const sbClient = new ServiceBusClient(connectionString)
  const sender = sbClient.createSender(`${queueName}${queueSuffix}`)
  const batch = await sender.createMessageBatch()