rephrase validation messages

Author: eisbilir

docs/Topcoder-bookings-api.postman_collection.json

@@ -12675,7 +12675,7 @@
 									"pm.test('Status code is 400', function () {\r",
 									"    pm.response.to.have.status(400);\r",
 									"    const response = pm.response.json()\r",
-									"    pm.expect(response.message).to.eq(\"Cannot set \\\"isFirstWeek\\\" without \\\"startDate\\\"\")\r",
+									"    pm.expect(response.message).to.eq(\"Cannot filter by \\\"isLastWeek\\\" without \\\"startDate\\\"\")\r",
 									"});"
 								],
 								"type": "text/javascript"
@@ -12727,7 +12727,59 @@
 									"pm.test('Status code is 400', function () {\r",
 									"    pm.response.to.have.status(400);\r",
 									"    const response = pm.response.json()\r",
-									"    pm.expect(response.message).to.eq(\"Cannot set both \\\"isFirstWeek\\\" and \\\"isLastWeek\\\" to \\\"true\\\"\")\r",
+									"    pm.expect(response.message).to.eq(\"Cannot filter by \\\"isFirstWeek\\\" without \\\"startDate\\\"\")\r",
+									"});"
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"type": "text",
+								"value": "Bearer {{token_bookingManager}}"
+							}
+						],
+						"url": {
+							"raw": "{{URL}}/resourceBookings?fields=id,startDate,endDate,billingAccountId,workPeriods&billingAccountId=80000071&workPeriods.isFirstWeek=true",
+							"host": [
+								"{{URL}}"
+							],
+							"path": [
+								"resourceBookings"
+							],
+							"query": [
+								{
+									"key": "fields",
+									"value": "id,startDate,endDate,billingAccountId,workPeriods"
+								},
+								{
+									"key": "billingAccountId",
+									"value": "80000071"
+								},
+								{
+									"key": "workPeriods.isFirstWeek",
+									"value": "true"
+								}
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "search resource bookings with parameters 17",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 400', function () {\r",
+									"    pm.response.to.have.status(400);\r",
+									"    const response = pm.response.json()\r",
+									"    pm.expect(response.message).to.eq(\"Cannot filter by both \\\"isFirstWeek\\\" and \\\"isLastWeek\\\" set to \\\"true\\\"\")\r",
 									"});"
 								],
 								"type": "text/javascript"

src/services/ResourceBookingService.js

@@ -893,7 +893,7 @@ searchResourceBookings.schema = Joi.object().keys({
       is: Joi.exist(),
       then: Joi.boolean().default(false),
       otherwise: Joi.boolean().valid(false).messages({
-        'any.only': 'Cannot set "isFirstWeek" without "startDate"'
+        'any.only': 'Cannot filter by "isFirstWeek" without "startDate"'
       })
     }),
     'workPeriods.isLastWeek': Joi.boolean().when(Joi.ref('workPeriods.startDate', { separator: false }), {
@@ -902,11 +902,11 @@ searchResourceBookings.schema = Joi.object().keys({
         is: false,
         then: Joi.boolean().default(false),
         otherwise: Joi.boolean().valid(false).messages({
-          'any.only': 'Cannot set both "isFirstWeek" and "isLastWeek" to "true"'
+          'any.only': 'Cannot filter by both "isFirstWeek" and "isLastWeek" set to "true"'
         })
       }),
       otherwise: Joi.boolean().valid(false).messages({
-        'any.only': 'Cannot set "isFirstWeek" without "startDate"'
+        'any.only': 'Cannot filter by "isLastWeek" without "startDate"'
       })
     }),
     'workPeriods.payments.status': Joi.workPeriodPaymentStatus(),