feat: address bugs

Author: andrewsetterfield

src/functions/sendCandidateResults/application/service/__mocks__/personalisation-catb-mock.ts

@@ -32,7 +32,7 @@ const catBEnglishPassRenderedText = '\n' +
     '\n' +
     'Fuel-efficient driving is a style of safe driving that reduces your fuel use and helps the environment.\n' +
     '\n' +
-    'Your driving examiner saw that you could improve the control and planning of your driving. You should aim to drive in a fuel-efficient manner, considering your impact on the environment.\n' +
+    'Your driving examiner saw that you could improve the control and planning of your driving. You should aim to drive in a fuel-efficient manner, considering your effect on the environment.\n' +
     '\n' +
     '\n' +
     '    \n' +
@@ -152,7 +152,7 @@ const catBEnglishFailRenderedText = '\n' +
     '\n' +
     'Fuel-efficient driving is a style of safe driving that reduces your fuel use and helps the environment.\n' +
     '\n' +
-    'Your driving examiner saw that you could improve the control and planning of your driving. You should aim to drive in a fuel-efficient manner, considering your impact on the environment.\n' +
+    'Your driving examiner saw that you could improve the control and planning of your driving. You should aim to drive in a fuel-efficient manner, considering your effect on the environment.\n' +
     '\n' +
     '\n' +
     '    \n' +

src/functions/sendCandidateResults/application/service/template-selector.ts

@@ -13,7 +13,8 @@ import {
   testExperienceSurveyRidingWelshTemplate,
   testExperienceSurveyTemplate,
   testExperienceSurveyTemplate3b,
-  testExperienceSurveyWelshTemplate, testExperienceSurveyWelshTemplate3b,
+  testExperienceSurveyWelshTemplate,
+  testExperienceSurveyWelshTemplate3b,
 } from '../templates/test-experience-survey';
 import {dataPrivacyTemplate, dataPrivacyWelshTemplate} from '../templates/data-privacy';
 import {TestOutcome} from '../../domain/test-outcome';

src/functions/sendCandidateResults/application/templates/eco.ts

@@ -41,7 +41,7 @@ export const ecoTemplate = (riding?: boolean): string => {
 Fuel-efficient ${riding ? 'riding' : 'driving'} is a style of safe driving that reduces your fuel use and helps the environment.
 {{/if}}
 
-${riding ? 'The motorcycle' : 'Your driving'} examiner saw that you could improve the control and planning of your driving. You should aim to ${riding ? 'ride' : 'drive'} in a fuel-efficient manner, considering your impact on the environment.
+${riding ? 'The motorcycle' : 'Your driving'} examiner saw that you could improve the control and planning of your driving. You should aim to ${riding ? 'ride' : 'drive'} in a fuel-efficient manner, considering your effect on the environment.
 {{/if}}
 
 `;

src/functions/sendCandidateResults/application/templates/next-steps.ts

@@ -8,7 +8,7 @@ import {Correspondence} from '../../domain/template-id.model';
  */
 Handlebars.registerHelper('displayUrlNextSteps', function (communicationMethod: string, urlDescriptor: string, url: string, caretFlag: boolean = true) {
   if (communicationMethod === Correspondence.EMAIL) {
-    return `${caretFlag ? '^' : ''}[${urlDescriptor}](${url}).`;
+    return `${caretFlag ? '^' : ''}[${urlDescriptor}](${url})`;
   } else return `${caretFlag ? '^' : ''}${urlDescriptor}: ${url}`;
 });
 
@@ -499,16 +499,16 @@ export const nextStepsMod1PassTemplate = `
 
 You now need to pass your motorcycle module 2 (on-road) test.
 
-"If you’re upgrading your licence through {{displayUrlNextSteps communicationMethod "progressive access" "https://www.gov.uk/ride-motorcycle-moped/bike-categories-ages-and-licence-requirements?utm_source=dvsa&utm_medium=email&utm_campaign=motorcycle-module-1-test&utm_content=pass"}}, you must pass module 2 within 6 months. You have to pass module 1 again if you do not
+"If you’re upgrading your licence through {{displayUrlNextSteps communicationMethod "progressive access" "https://www.gov.uk/ride-motorcycle-moped/bike-categories-ages-and-licence-requirements?utm_source=dvsa&utm_medium=email&utm_campaign=motorcycle-module-1-test&utm_content=pass" false}}, you must pass module 2 within 6 months. You have to pass module 1 again if you do not.
 
-You or your motorcycle instructor need to book your motorcycle module 2 test if it’s not already been booked. If you do it yourself, book at {{displayUrlNextSteps communicationMethod "www.gov.uk/book-driving-test" "https://www.gov.uk/book-driving-test?utm_source=dvsa&utm_medium=email&utm_campaign=motorcycle-module-1-test&utm_content=pass" false}}
+You or your motorcycle instructor need to book your motorcycle module 2 test if it’s not already been booked. If you do it yourself, book at {{displayUrlNextSteps communicationMethod "www.gov.uk/book-driving-test" "https://www.gov.uk/book-driving-test?utm_source=dvsa&utm_medium=email&utm_campaign=motorcycle-module-1-test&utm_content=pass" false}}.
 
 When you take the off-road test, you must use:
 
 - the same subcategory as the licence you’re applying for
 - a vehicle with the same type of transmission (manual, automatic or semi-automatic) that you used this time
  
-{{displayUrlNextSteps communicationMethod "Find out more about the vehicles you can use for the tests" "https://www.gov.uk/motorcycle-test/motorcycles-mopeds-you-can-use?utm_source=dvsa&utm_medium=email&utm_campaign=motorcycle-module-1-test&utm_content=pass"}}
+{{displayUrlNextSteps communicationMethod "Find out more about the vehicles you can use for the tests" "https://www.gov.uk/motorcycle-test/motorcycles-mopeds-you-can-use?utm_source=dvsa&utm_medium=email&utm_campaign=motorcycle-module-1-test&utm_content=pass"}}.
 
 ---
 `;
@@ -518,9 +518,9 @@ export const nextStepsMod1PassWelshTemplate = `
 
 Nawr mae angen basio y prawf gyrru beic modur modiwl 2 (ar y ffordd).
 
-Os ydych chi’n uwchraddio’ch trwydded trwy ‘[mynediad cynyddol]( https://www.gov.uk/ride-motorcycle-moped/bike-categories-ages-and-licence-requirements?utm_source=dvsa&utm_medium=email&utm_campaign=motorcycle-module-1-test&utm_content=pass)’, mae rhaid pasio modiwl 2 o fewn 6 mis. Bydd rhaid pasio modiwl 1 eto os ydych yn aflwyddiannus.
+Os ydych chi’n uwchraddio’ch trwydded trwy {{displayUrlNextSteps communicationMethod "mynediad cynyddol" "https://www.gov.uk/ride-motorcycle-moped/bike-categories-ages-and-licence-requirements?utm_source=dvsa&utm_medium=email&utm_campaign=motorcycle-module-1-test&utm_content=pass" false}}, mae rhaid pasio modiwl 2 o fewn 6 mis. Bydd rhaid pasio modiwl 1 eto os ydych yn aflwyddiannus.
 
-Mae angen i chi neu’ch hyfforddwr beic modur archebu prawf modiwl 2 eich beic modur os nad yw eisoes wedi’i archebu. Os ydych yn trefnu eich hun, ewch i {{displayUrlNextSteps communicationMethod "www.gov.uk/book-driving-test" "https://www.gov.uk/book-driving-test?utm_source=dvsa&utm_medium=email&utm_campaign=motorcycle-module-1-test&utm_content=pass" false}}
+Mae angen i chi neu’ch hyfforddwr beic modur archebu prawf modiwl 2 eich beic modur os nad yw eisoes wedi’i archebu. Os ydych yn trefnu eich hun, ewch i {{displayUrlNextSteps communicationMethod "www.gov.uk/book-driving-test" "https://www.gov.uk/book-driving-test?utm_source=dvsa&utm_medium=email&utm_campaign=motorcycle-module-1-test&utm_content=pass" false}}.
 
 Pan fyddwch yn cymryd y prawf oddi ar y ffordd, bydd rhaid i chi ddefnyddio:
 

src/functions/sendCandidateResults/application/templates/result-summary.ts

@@ -326,7 +326,7 @@ export const failResultWelshTemplate = (testType: string, categorySwitch: TestCa
 ^##Methiant Rheoli Risg
 {{/if}}
 
-^sgôr cyffredinol: {{totalScore}} allan o 51
+^Sgôr cyffredinol: {{totalScore}} allan o 51
 
 ^Cynllunio gwersi: {{lessonPlanningScore}} allan o 12
 ^Rheoli risg: {{riskManagementScore}} allan o 15
@@ -360,7 +360,7 @@ Mae'n ddrwg gennym ${thirdAttempt ? `${categorySwitch === TestCategory.ADI3 ? 'n
 ## 
 Mae'n ddrwg gennym nad oeddech yn llwyddiannus y tro hwn ac nad ydych wedi cymhwyso fel ADI.
  
-Os ydych yn bwriadu ailgychwyn y broses gymhwyso, mae'n bwysig deall mwy am y cymwyseddau y cawsoch eich asesu arnynt. 
+I paratoi ar gyfer eich prawf nesaf, mae'n bwysig deall mwy am y rhesymau nad ydych wedi bod yn llwyddiannus y tro hwn.
 `;
     break;
   default:
@@ -373,7 +373,7 @@ Os ydych yn bwriadu ailgychwyn y broses gymhwyso, mae'n bwysig deall mwy am y cy
 ## 
 Mae'n ddrwg gennym nad oeddech yn llwyddiannus y tro hwn ac nad ydych wedi cymhwyso fel ADI.
  
-Os ydych yn bwriadu ailgychwyn y broses gymhwyso, mae'n bwysig deall mwy am y cymwyseddau y cawsoch eich asesu arnynt.
+I paratoi ar gyfer eich prawf nesaf, mae'n bwysig deall mwy am y rhesymau nad ydych wedi bod yn llwyddiannus y tro hwn.
 `;
   }
   return template;