Merge branch 'main' into feature-notifications-download-link-presenter

Author: jonathangoulding

app/validators/return-logs/setup/single-volume.validator.js

@@ -30,7 +30,7 @@ function go(payload) {
         'any.only': singleVolumeError,
         'string.empty': singleVolumeError
       }),
-    singleVolumeQuantity: Joi.number().min(0).when('singleVolume', { is: 'yes', then: Joi.required() }).messages({
+    singleVolumeQuantity: Joi.number().min(1).when('singleVolume', { is: 'yes', then: Joi.required() }).messages({
       'any.required': singleVolumeQuantityError,
       'number.base': singleVolumeQuantityError,
       'number.min': singleVolumeQuantityError,

test/validators/return-logs/setup/single-volume.validator.test.js

@@ -80,7 +80,7 @@ describe('Return Logs Setup - Single Volume validator', () => {
         })
       })
 
-      describe('but entered a volume too small', () => {
+      describe('but entered a negative volume', () => {
         beforeEach(() => {
           payload.singeVolumeQuantity = '-0.1'
         })
@@ -93,6 +93,19 @@ describe('Return Logs Setup - Single Volume validator', () => {
         })
       })
 
+      describe('but entered a volume too small', () => {
+        beforeEach(() => {
+          payload.singeVolumeQuantity = '0'
+        })
+
+        it('fails validation with the message "Enter a total figure"', () => {
+          const result = SingleVolumeValidator.go(payload)
+
+          expect(result.error).to.exist()
+          expect(result.error.details[0].message).to.equal('Enter a total figure')
+        })
+      })
+
       describe('but entered a volume too big', () => {
         beforeEach(() => {
           payload.singeVolumeQuantity = '9007199254740992'