Ntrnl 324 add validation to team request page

src/routes/team-request.ts

@@ -1,13 +1,14 @@
 import { Router } from 'express';
 
 import { authentication } from '../middleware/authentication.middleware';
-
+import { checkValidations } from '../middleware/validation.middleware';
+import { teamRequest } from '../validation/team-request.validation';
 import { get, post } from '../controller/team-request.controller';
 import * as config from '../config';
 
 const teamRequestRouter = Router();
 
 teamRequestRouter.get(config.TEAM_REQUEST_URL, authentication, get);
-teamRequestRouter.post(config.TEAM_REQUEST_URL, authentication, post);
+teamRequestRouter.post(config.TEAM_REQUEST_URL, authentication, ...teamRequest, checkValidations, post);
 
 export default teamRequestRouter;

src/validation/team-request.validation.ts

@@ -0,0 +1,9 @@
+import { body } from 'express-validator';
+
+import { ErrorMessages } from './error.messages';
+import { descriptionValidation } from './fields/description.validation';
+
+export const teamRequest = [
+    body('team_name').not().isEmpty({ ignore_whitespace: true }).withMessage(ErrorMessages.TEAM_NAME),
+    ...descriptionValidation
+];

src/views/team-request.html

@@ -1,10 +1,7 @@
 {% extends "layout.html" %}
 
 {% block beforeContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: "/landing-page"
-  }) }}
+  {% include "include/back-link.html" %}
 {% endblock %}
 
 {% block content %}
@@ -15,22 +12,26 @@ <h1 class="govuk-heading-l">Additional Team Request</h1>
       <p class="govuk-body">
         Use this page to request a more specific request that is not covered by the other options.
       </p>
-
+      {% include "include/error-list.html" %}
       <form method="post" novalidate>
 
         {{ govukInput({
+          errorMessage: errors.team_name if errors,
           label: {
             text: "Team Name",
             classes: "govuk-label--m"
           },
           classes: "govuk-input--width-10",
-          id: "team-name",
-          name: "team_name"
+          id: "team_name",
+          name: "team_name",
+          value: team_name
         }) }}
 
         {{ govukTextarea({
+          errorMessage: errors.description if errors,
           name: "description",
           id: "description",
+          value: description,
           label: {
             text: "Description - Permission changes",
             classes: "govuk-label--m",
@@ -41,9 +42,7 @@ <h1 class="govuk-heading-l">Additional Team Request</h1>
           }
         }) }}
 
-        {{ govukButton({
-          text: "Save"
-        }) }}
+        {% include "include/save-button.html" %}
 
       </form>
     </div>

test/integration/routes/team-request.spec.ts

@@ -14,6 +14,7 @@ import { authentication } from '../../../src/middleware/authentication.middlewar
 
 import { MOCK_REDIRECT_MESSAGE, MOCK_GET_TEAM_REQUEST_RESPONSE, MOCK_POST_TEAM_REQUEST_RESPONSE } from '../../mock/text.mock';
 import { MOCK_POST_TEAM_REQUEST } from '../../mock/data';
+import { ErrorMessages } from '../../../src/validation/error.messages';
 
 const mockedLogger = logger as jest.Mock<typeof logger>;
 mockedLogger.mockImplementation((req: Request, res: Response, next: NextFunction) => next());
@@ -44,6 +45,19 @@ describe('Team-request endpoint integration tests', () => {
             expect(mockedLogger).toHaveBeenCalledTimes(1);
             expect(mockedAuth).toHaveBeenCalledTimes(1);
         });
+        test('Should render the same page with error messages after POST request', async () => {
+            const res = await request(app).post(config.TEAM_REQUEST_URL).send({
+                team_name: '',
+                description: '1000chars.'.repeat(100) + ':)'
+            });
+
+            expect(res.status).toEqual(200);
+            expect(res.text).toContain(ErrorMessages.TEAM_NAME);
+            expect(res.text).toContain(ErrorMessages.DESCRIPTION_LENGTH);
+            expect(res.text).toContain(MOCK_GET_TEAM_REQUEST_RESPONSE);
+            expect(mockedLogger).toHaveBeenCalledTimes(1);
+            expect(mockedAuth).toHaveBeenCalledTimes(1);
+        });
         test('Should log the team name and description on POST request.', async () => {
             const res = await request(app).post(config.TEAM_REQUEST_URL).send(MOCK_POST_TEAM_REQUEST);