A new post office redirection notice request has been submitted.
+A new post office redirection request for a deceased person has been + submitted.
+
-
+
+
+ Personal Information
+ Deceased Person Information
- Name:
- {{applicant.title}}
- {{applicant.firstName}}
- {{applicant.lastName}}
+ Title:
+ {{deceased.title}}
- Date of Birth:
- {{applicant.dateOfBirth}}
+ First Name:
+ {{deceased.firstName}}
-
- ID Number:
- {{applicant.idNumber}}
-
- {{#if applicant.passportNumber}}
+ {{#if deceased.middleName}}
- Passport Number:
- {{applicant.passportNumber}}
+ Middle Name:
+ {{deceased.middleName}}
{{/if}}
- {{#if applicant.email}}
+
+ Last Name:
+ {{deceased.lastName}}
+
+ {{#if deceased.dateOfDeath}}
- Email:
- {{applicant.email}}
+ Date of Death:
+ {{deceased.dateOfDeath}}
{{/if}}
- {{#if applicant.email}}
+
+
+
Old/Previous Address
+
+ Address Line 1:
+ {{oldAddress.addressLine1}}
+
+ {{#if oldAddress.addressLine2}}
- Email:
- {{applicant.email}}
+ Address Line 2:
+ {{oldAddress.addressLine2}}
{{/if}}
- {{#if applicant.telephoneNumber}}
+
+ Parish:
+ {{oldAddress.parish}}
+
+ {{#if oldAddress.postcode}}
- Phone Number:
- {{applicant.telephoneNumber}}
+ Postcode:
+ {{oldAddress.postcode}}
{{/if}}
-
diff --git a/src/validation/schema-builder.service.ts b/src/validation/schema-builder.service.ts
index f420541..6659dce 100644
--- a/src/validation/schema-builder.service.ts
+++ b/src/validation/schema-builder.service.ts
@@ -70,7 +70,13 @@ export class SchemaBuilderService {
// Build base schema based on field type
switch (field.type) {
case 'string':
- schema = z.coerce.string();
+ // For required strings, use z.string().min(1) to reject empty strings
+ // For optional strings, use z.coerce.string() but allow empty
+ if (field.required) {
+ schema = z.string().min(1, 'This field is required');
+ } else {
+ schema = z.coerce.string();
+ }
break;
case 'email':
schema = z.string().email('Invalid email format');
@@ -138,21 +144,15 @@ export class SchemaBuilderService {
) {
if (validations.min !== undefined) {
const minLength = validations.min;
- if (!required) {
- // For optional fields, allow empty strings or strings that meet min length
- schema = schema.refine(
- (val: string) => !val || val.length >= minLength,
- {
- message:
- validations.message || `Minimum length is ${minLength}`,
- },
- );
- } else {
- schema = schema.min(
- minLength,
- validations.message || `Minimum length is ${minLength}`,
- );
- }
+ // Always enforce minimum length (use max(1, minLength) for required fields)
+ const effectiveMin = required ? Math.max(1, minLength) : minLength;
+ schema = schema.min(
+ effectiveMin,
+ validations.message || `Minimum length is ${effectiveMin}`,
+ );
+ } else if (required) {
+ // If no min specified but field is required, enforce min length of 1
+ schema = schema.min(1, validations.message || 'This field is required');
}
if (validations.max !== undefined) {
schema = schema.max(
@@ -160,6 +160,9 @@ export class SchemaBuilderService {
validations.message || `Maximum length is ${validations.max}`,
);
}
+ } else if (fieldType === 'string' && required) {
+ // If no validations but field is required, enforce non-empty string
+ schema = schema.min(1, 'This field is required');
}
// Min/Max for numbers
Address Redirection Details
-
-
-
-
+ Old Address
-
- Address Line 1:
- {{oldaddress.addressLine1}}
-
- {{#if oldaddress.addressLine2}}
-
- Address Line 2:
- {{oldaddress.addressLine2}}
-
- {{/if}}
-
- Parish:
- {{oldaddress.parish}}
-
- {{#if oldaddress.postalCode}}
-
- Postal Code:
- {{oldaddress.postalCode}}
-
- {{/if}}
- Applicant Information
+
+ Title:
+ {{applicant.title}}
+
+
+ First Name:
+ {{applicant.firstName}}
+
+
+ Last Name:
+ {{applicant.lastName}}
+
+
+ Relationship to Deceased:
+ {{applicant.relationshipToDeceased}}
+
+
+ Email Address:
+ {{applicant.email}}
+
+
+ Telephone Number:
+ {{applicant.telephoneNumber}}
+
+
-
+
+ New Address
-
- Address Line 1:
- {{newAddress.addressLine1}}
-
- {{#if newAddress.addressLine2}}
-
- Address Line 2:
- {{newAddress.addressLine2}}
-
- {{/if}}
-
- Parish:
- {{newAddress.parish}}
-
- {{#if newAddress.postalCode}}
-
- Postal Code:
- {{newAddress.postalCode}}
-
- {{/if}}
-
+
+
Permission Details
+
+ Permission to Act on Estate:
+ {{permissionDetails}}
-
+
+ {{#if uploadDocumentUrls}}
+ House Member Information
+ New Address for Mail Redirection
+
+ Address Line 1:
+ {{newAddress.addressLine1}}
+
+ {{#if newAddress.addressLine2}}
+
+ Address Line 2:
+ {{newAddress.addressLine2}}
+
+ {{/if}}
- Member Name:
- {{houseMembers.firstName}}
- {{houseMembers.lastName}}
+ Parish:
+ {{newAddress.parish}}
+ {{#if newAddress.postcode}}
+
+ Postcode:
+ {{newAddress.postcode}}
+
+ {{/if}}
- Member ID Number:
- {{houseMembers.idNumber}}
+ Permanent Redirection:
+ {{newAddress.isRedirectPermanent}}
- {{#if houseMembers.addAnother}}
+ {{#if newAddress.redirectionStartDate}}
- Add Another Member:
- {{houseMembers.addAnother}}
+ Redirection Start Date:
+ {{newAddress.redirectionStartDate}}
+
+ {{/if}}
+ {{#if newAddress.redirectionEndDate}}
+
+ Redirection End Date:
+ {{newAddress.redirectionEndDate}}
{{/if}}
+
+ {{/if}}
+
Uploaded Documents
+ {{#if uploadDocumentUrls.length}}
+ -
+ {{#each uploadDocumentUrls}}
+
- {{this}} + {{/each}} +
No documents uploaded.
+ {{/if}} +