From 8c100c89df0c4e20f5c7f93b6ecce205067961c5 Mon Sep 17 00:00:00 2001
From: weskubo-cgi <wes.kubo@cgi.com>
Date: Thu, 19 May 2022 16:08:21 -0700
Subject: [PATCH 1/9] Initial UI implementaiton.

---
 .../hlth/hnweb/security/SecurityConfig.java   |   3 +-
 .../src/components/template/TheNavBar.vue     |   5 +-
 frontend/src/router/index.js                  |  15 ++
 frontend/src/services/BaseService.js          |   2 +
 frontend/src/services/GroupMemberService.js   |   3 +
 .../maintenance/CoverageMaintenanceHome.vue   |  32 ++--
 .../maintenance/ReinstateOverAgeDependent.vue | 179 ++++++++++++++++++
 7 files changed, 226 insertions(+), 13 deletions(-)
 create mode 100644 frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue

diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/security/SecurityConfig.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/security/SecurityConfig.java
index cfee2b10..3469fe49 100644
--- a/backend/src/main/java/ca/bc/gov/hlth/hnweb/security/SecurityConfig.java
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/security/SecurityConfig.java
@@ -69,7 +69,8 @@ protected void configure(HttpSecurity http) throws Exception {
             .mvcMatchers(HttpMethod.POST, "/group-member/add-group-member").hasRole("AddGroupMember")
             .mvcMatchers(HttpMethod.POST, "/group-member/cancel-dependent").hasRole("CancelDependent")
             .mvcMatchers(HttpMethod.POST, "/group-member/cancel-group-member").hasRole("CancelGroupMember")
-            .mvcMatchers(HttpMethod.POST, "/group-member/update-number-and-dept").hasRole("UpdateNumberAndDept")            
+            .mvcMatchers(HttpMethod.POST, "/group-member/update-number-and-dept").hasRole("UpdateNumberAndDept")
+            .mvcMatchers(HttpMethod.POST, "/group-member/reinstate-over-age-dependent").hasRole("ReinstateOverAgeDependent")
             .mvcMatchers(HttpMethod.POST, "/msp-contracts/get-contract-periods").hasRole("GetContractPeriods")
             .mvcMatchers(HttpMethod.POST, "/msp-contracts/update-contract-address").hasRole("UpdateContractAddress")
             .mvcMatchers(HttpMethod.POST, "/msp-contracts/inquire-contract").hasAnyRole("ContractInquiry", "GetGroupMembersContractAddress")  //inquire-contract endpoint will require this multi role as it is used by both R40 and R37 transactions
diff --git a/frontend/src/components/template/TheNavBar.vue b/frontend/src/components/template/TheNavBar.vue
index c5f8ddc1..d9e46364 100644
--- a/frontend/src/components/template/TheNavBar.vue
+++ b/frontend/src/components/template/TheNavBar.vue
@@ -22,6 +22,9 @@
         <li id="coverage-maintenance-link" :class="tabClass($route, 'CoverageMaintenance')" v-if="hasMaintenancePermission()">
           <div class="dropdown">
             <span>Coverage Maintenance</span>
+            <div class="dropdown-content">
+              <router-link @click="resetAlert" :class="menuClass($route, 'ReinstateOverAgeDependent')" :to="{ name: 'ReinstateOverAgeDependent' }" v-if="hasPermission('ReinstateOverAgeDependent')">Reinstate Over Age Dependent</router-link>
+            </div>
           </div>
         </li>
         <li id="coverage-enrollment-link" :class="menuTabClass($route, '/coverage/enrollment')" v-if="hasEnrollmentPermission()">
@@ -109,7 +112,7 @@ export default {
       return this.hasPermission('AddGroupMember') || this.hasPermission('AddDependent') || this.hasPermission('UpdateNumberAndDept') || this.hasPermission('CancelGroupMember') || this.hasPermission('CancelDependent')
     },
     hasMaintenancePermission() {
-      return false
+      return this.hasPermission('ReinstateOverAgeDependent')
     },
     hasMSPContractsPermission() {
       return this.hasPermission('GetContractPeriods') || this.hasPermission('ContractInquiry') || this.hasPermission('UpdateContractAddress')
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 30d7755a..aaf9146b 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -13,6 +13,7 @@ import AddVisaResidentWithPHN from '../views/coverage/enrollment/AddVisaResident
 import AddVisaResidentWithoutPHN from '../views/coverage/enrollment/AddVisaResidentWithoutPHN.vue'
 import CoverageEnrollmentHome from '../views/coverage/enrollment/CoverageEnrollmentHome.vue'
 import CoverageMaintenanceHome from '../views/coverage/maintenance/CoverageMaintenanceHome.vue'
+import ReinstateOverAgeDependent from '../views/coverage/maintenance/ReinstateOverAgeDependent.vue'
 import EligibilityHome from '../views/eligibility/EligibilityHome.vue'
 import PhnInquiry from '../views/eligibility/PhnInquiry.vue'
 import PhnLookup from '../views/eligibility/PhnLookup.vue'
@@ -66,6 +67,20 @@ const createRoutes = (app) => [
     path: '/coverage/maintenance',
     name: 'CoverageMaintenance',
     component: CoverageMaintenanceHome,
+    redirect: {
+      name: 'ReinstateOverAgeDependent',
+    },
+    children: [
+      {
+        path: 'reinstateOverAgeDependent',
+        name: 'ReinstateOverAgeDependent',
+        component: ReinstateOverAgeDependent,
+        meta: {
+          permission: 'ReinstateOverAgeDependent',
+          requiresAuth: true,
+        },
+      },
+    ],
   },
   {
     path: '/coverage/enrollment',
diff --git a/frontend/src/services/BaseService.js b/frontend/src/services/BaseService.js
index 7955f7d1..ec7c5b94 100644
--- a/frontend/src/services/BaseService.js
+++ b/frontend/src/services/BaseService.js
@@ -1,4 +1,5 @@
 import axios from 'axios'
+
 import keycloak from '../keycloak'
 
 export const resources = {
@@ -20,6 +21,7 @@ export const resources = {
     updateNumberAndDept: '/group-member/update-number-and-dept',
     cancelGroupMember: '/group-member/cancel-group-member',
     cancelDependent: '/group-member/cancel-dependent',
+    reinstateOverAgeDependent: '/group-member/reinstate-over-age-dependent',
   },
   mspContracts: {
     getContractPeriods: '/msp-contracts/get-contract-periods',
diff --git a/frontend/src/services/GroupMemberService.js b/frontend/src/services/GroupMemberService.js
index a269c07f..b9a8e493 100644
--- a/frontend/src/services/GroupMemberService.js
+++ b/frontend/src/services/GroupMemberService.js
@@ -16,4 +16,7 @@ export default {
   cancelDependent(request) {
     return apiRequest().then((axiosInstance) => axiosInstance.post(resources.groupMember.cancelDependent, request))
   },
+  reinstateOverAgeDependent(request) {
+    return apiRequest().then((axiosInstance) => axiosInstance.post(resources.groupMember.cancelDependent, request))
+  },
 }
diff --git a/frontend/src/views/coverage/maintenance/CoverageMaintenanceHome.vue b/frontend/src/views/coverage/maintenance/CoverageMaintenanceHome.vue
index be72cf4b..a21df915 100644
--- a/frontend/src/views/coverage/maintenance/CoverageMaintenanceHome.vue
+++ b/frontend/src/views/coverage/maintenance/CoverageMaintenanceHome.vue
@@ -1,15 +1,25 @@
-<script setup>
-  import TheSubNav from '../../../components/template/TheSubNav.vue'
-</script>
 <template>
-   <TheSubNav>
-   </TheSubNav>
-   <router-view/>
-    <h1>Coverage Maintenance</h1>
+  <TheSubNav>
+    <SubNavTab routeName="ReinstateOverAgeDependent" title="Reinstate OverAge Dependent" v-if="hasPermission('ReinstateOverAgeDependent')" />
+  </TheSubNav>
+  <router-view />
 </template>
 
 <script>
-  export default {
-    name: 'Coverage Maintenance',
-  }
-</script>
\ No newline at end of file
+import TheSubNav from '../../../components/template/TheSubNav.vue'
+import SubNavTab from '../../../components/template/SubNavTab.vue'
+import { useAuthStore } from '../../../stores/auth'
+
+export default {
+  name: 'Coverage Maintenance',
+  components: { SubNavTab, TheSubNav },
+  setup() {
+    return { authStore: useAuthStore() }
+  },
+  methods: {
+    hasPermission(permission) {
+      return this.authStore.hasPermission(permission)
+    },
+  },
+}
+</script>
diff --git a/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue b/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
new file mode 100644
index 00000000..5fcce927
--- /dev/null
+++ b/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
@@ -0,0 +1,179 @@
+<template>
+  <div id="reinstateOverAgeDependent" v-if="inputFormActive">
+    <form @submit.prevent="submitForm">
+      <AppRow>
+        <AppCol class="col4">
+          <AppInput :e-model="v$.groupNumber" id="groupNumber" label="Group Number" type="text" v-model.trim="groupNumber" />
+        </AppCol>
+        <AppRow>
+          <AppCol class="col4">
+            <AppInput :e-model="v$.phn" id="phn" label="PHN" type="text" v-model="phn" />
+          </AppCol>
+        </AppRow>
+        <AppRow>
+          <AppCol class="col4">
+            <AppInput :e-model="v$.dependentPhn" id="dependentPhn" label="Dependent's PHN" type="text" v-model.trim="dependentPhn" />
+          </AppCol>
+        </AppRow>
+      </AppRow>
+      <AppRow>
+        <AppCol class="col4">
+          <AppDateInput :e-model="v$.dependentBirthDate" id="dependentBirthDate" label="Dependent's Birth Date" v-model="dependentBirthDate" />
+        </AppCol>
+      </AppRow>
+      <AppRow>
+        <AppCol class="col6">
+          <YesNoRadioButtonGroup :e-model="v$.isStudent" id="isStudent" label="Is this Dependent attending a Canadian Educational Institution?" v-model="isStudent">
+            <template v-slot:tooltip>Click either Yes or No </template>
+          </YesNoRadioButtonGroup>
+        </AppCol>
+      </AppRow>
+      <AppRow>
+        <AppCol class="col6">
+          <AppOutput label="If Yes, enter the expected date studies in Canada will be completed" />
+        </AppCol>
+      </AppRow>
+      <AppRow>
+        <AppCol class="col4">
+          <AppDateInput :e-model="v$.studentEndDate" id="studentEndDate" label="Student End Date" v-model="studentEndDate" />
+        </AppCol>
+      </AppRow>
+      <AppRow>
+        <AppButton :submitting="submitting" mode="primary" type="submit">Submit</AppButton>
+        <AppButton @click="resetForm" mode="secondary" type="button">Clear</AppButton>
+      </AppRow>
+    </form>
+  </div>
+  <div id="confirmation" v-if="!inputFormActive">
+    <br />
+    <p>PHN: {{ result?.phn }}</p>
+    <AppButton @click="resetForm" mode="primary" type="button">Add Another Group Member's Dependent</AppButton>
+  </div>
+</template>
+
+<script>
+import YesNoRadioButtonGroup from '../../../components/ui/YesNoRadioButtonGroup.vue'
+import useVuelidate from '@vuelidate/core'
+import { helpers, required, requiredIf } from '@vuelidate/validators'
+import dayjs from 'dayjs'
+import { VALIDATE_GROUP_NUMBER_MESSAGE, VALIDATE_PHN_MESSAGE, validateGroupNumber, validatePHN } from '../../../util/validators'
+import { API_DATE_FORMAT, RELATIONSHIPS } from '../../../util/constants'
+import GroupMemberService from '../../../services/GroupMemberService'
+import { useAlertStore } from '../../../stores/alert'
+import AppCol from '../../../components/grid/AppCol.vue'
+
+export default {
+  name: 'AddDependent',
+  components: { YesNoRadioButtonGroup, AppCol },
+  setup() {
+    const currentMonth = {
+      month: new Date().getMonth(),
+      year: new Date().getFullYear(),
+    }
+
+    return {
+      alertStore: useAlertStore(),
+      v$: useVuelidate(),
+      currentMonth,
+    }
+  },
+  data() {
+    return {
+      inputFormActive: true,
+      submitting: false,
+      groupNumber: '',
+      phn: '',
+      dependentPhn: '',
+      dependentBirthDate: null,
+      relationship: '',
+      isStudent: '',
+      studentEndDate: null,
+      result: {
+        phn: '',
+        status: '',
+        message: '',
+      },
+    }
+  },
+  methods: {
+    async submitForm() {
+      this.submitting = true
+      this.alertStore.dismissAlert()
+      try {
+        const isValid = await this.v$.$validate()
+        if (!isValid) {
+          this.showError()
+          return
+        }
+
+        this.result = (
+          await GroupMemberService.addDependent({
+            groupNumber: this.groupNumber,
+            phn: this.phn,
+            dependentPhn: this.dependentPhn,
+            relationship: this.relationship,
+            isStudent: this.isStudent,
+            studentEndDate: this.studentEndDate ? dayjs(this.studentEndDate).format(API_DATE_FORMAT) : null,
+          })
+        ).data
+
+        if (this.result.status === 'error') {
+          this.alertStore.setErrorAlert(this.result.message)
+          return
+        }
+
+        if (this.result?.status === 'success') {
+          this.inputFormActive = false
+          this.alertStore.setSuccessAlert(this.result.message)
+        }
+      } catch (err) {
+        this.alertStore.setErrorAlert(err)
+      } finally {
+        this.submitting = false
+      }
+    },
+    showError(error) {
+      this.alertStore.setErrorAlert(error)
+      this.result = {}
+    },
+    resetForm() {
+      this.groupNumber = ''
+      this.phn = ''
+      this.dependentPhn = ''
+      this.relationship = ''
+      this.isStudent = ''
+      this.studentEndDate = null
+      this.result = null
+      this.inputFormActive = true
+      this.v$.$reset()
+      this.alertStore.dismissAlert()
+    },
+  },
+  validations() {
+    return {
+      groupNumber: {
+        required,
+        validateGroupNumber: helpers.withMessage(VALIDATE_GROUP_NUMBER_MESSAGE, validateGroupNumber),
+      },
+      phn: {
+        required,
+        validatePHN: helpers.withMessage(VALIDATE_PHN_MESSAGE, validatePHN),
+      },
+      dependentPhn: {
+        required,
+        validatePHN: helpers.withMessage(VALIDATE_PHN_MESSAGE, validatePHN),
+      },
+      dependentBirthDate: { required },
+      relationship: {
+        required,
+      },
+      isStudent: { required },
+      studentEndDate: {
+        requiredIfIsStudent: requiredIf(() => {
+          return this.isStudent === 'Y'
+        }),
+      },
+    }
+  },
+}
+</script>

From 0bf35a85dcdf7e44deeee720658a4c4bfc36d358 Mon Sep 17 00:00:00 2001
From: weskubo-cgi <wes.kubo@cgi.com>
Date: Tue, 24 May 2022 13:43:03 -0700
Subject: [PATCH 2/9] Updated slot.

---
 .../views/coverage/maintenance/ReinstateOverAgeDependent.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue b/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
index 5fcce927..3f228d3d 100644
--- a/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
+++ b/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
@@ -24,7 +24,7 @@
       <AppRow>
         <AppCol class="col6">
           <YesNoRadioButtonGroup :e-model="v$.isStudent" id="isStudent" label="Is this Dependent attending a Canadian Educational Institution?" v-model="isStudent">
-            <template v-slot:tooltip>Click either Yes or No </template>
+            <template #tooltip>Click either Yes or No </template>
           </YesNoRadioButtonGroup>
         </AppCol>
       </AppRow>

From cf6aa8e35736d2b21f3697f6bf3c67008963ac5a Mon Sep 17 00:00:00 2001
From: weskubo-cgi <wes.kubo@cgi.com>
Date: Fri, 27 May 2022 15:22:37 -0700
Subject: [PATCH 3/9] UI updates. Initial API implementation.

---
 .../controller/MaintenanceController.java     | 85 ++++++++++++++++
 .../converter/rapid/RPBSPRE0Converter.java    | 57 +++++++++++
 .../ca/bc/gov/hlth/hnweb/model/rapid/RE0.java | 97 +++++++++++++++++++
 .../gov/hlth/hnweb/model/rapid/RPBSPRE0.java  | 42 ++++++++
 .../ReinstateOverAgeDependentRequest.java     | 70 +++++++++++++
 .../ReinstateOverAgeDependentResponse.java    | 17 ++++
 .../hnweb/service/MaintenanceService.java     | 72 ++++++++++++++
 frontend/src/services/BaseService.js          |  4 +-
 frontend/src/services/MaintenanceService.js   |  7 ++
 .../maintenance/ReinstateOverAgeDependent.vue | 18 ++--
 10 files changed, 458 insertions(+), 11 deletions(-)
 create mode 100644 backend/src/main/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceController.java
 create mode 100644 backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
 create mode 100644 backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RE0.java
 create mode 100644 backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RPBSPRE0.java
 create mode 100644 backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rest/maintenance/ReinstateOverAgeDependentRequest.java
 create mode 100644 backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rest/maintenance/ReinstateOverAgeDependentResponse.java
 create mode 100644 backend/src/main/java/ca/bc/gov/hlth/hnweb/service/MaintenanceService.java
 create mode 100644 frontend/src/services/MaintenanceService.js

diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceController.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceController.java
new file mode 100644
index 00000000..f202e15c
--- /dev/null
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceController.java
@@ -0,0 +1,85 @@
+package ca.bc.gov.hlth.hnweb.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import ca.bc.gov.hlth.hnweb.converter.rapid.RPBSPRE0Converter;
+import ca.bc.gov.hlth.hnweb.model.rapid.RPBSPRE0;
+import ca.bc.gov.hlth.hnweb.model.rest.enrollment.EnrollSubscriberResponse;
+import ca.bc.gov.hlth.hnweb.model.rest.enrollment.GetPersonDetailsResponse;
+import ca.bc.gov.hlth.hnweb.model.rest.enrollment.NameSearchResponse;
+import ca.bc.gov.hlth.hnweb.model.rest.maintenance.ReinstateOverAgeDependentRequest;
+import ca.bc.gov.hlth.hnweb.model.rest.maintenance.ReinstateOverAgeDependentResponse;
+import ca.bc.gov.hlth.hnweb.persistence.entity.AffectedPartyDirection;
+import ca.bc.gov.hlth.hnweb.persistence.entity.IdentifierType;
+import ca.bc.gov.hlth.hnweb.persistence.entity.Transaction;
+import ca.bc.gov.hlth.hnweb.security.TransactionType;
+import ca.bc.gov.hlth.hnweb.service.MaintenanceService;
+
+/**
+ * Handles request related to Coverage Maintenance.
+ */
+@RequestMapping("/maintenance")
+@RestController
+public class MaintenanceController extends BaseController {
+
+	private static final Logger logger = LoggerFactory.getLogger(MaintenanceController.class);
+
+	@Autowired
+	private MaintenanceService maintenanceService;
+
+	@PostMapping("/reinstate-over-age-dependent")
+	public ResponseEntity<ReinstateOverAgeDependentResponse> reinstateOverAgeDependent(@Valid @RequestBody ReinstateOverAgeDependentRequest reinstateRequest, HttpServletRequest request) {
+
+		logger.info("Reinstate over age dependent request: {} ", reinstateRequest.getPhn());
+		
+		Transaction transaction = auditReinstateOverAgeDependentStart(reinstateRequest, request);
+
+		try {
+			RPBSPRE0Converter converter = new RPBSPRE0Converter();
+			RPBSPRE0 pre0Request = converter.convertRequest(reinstateRequest);
+		
+			RPBSPRE0 pre0Response = maintenanceService.reinstateOverAgeDependent(pre0Request, transaction);	
+			
+			ReinstateOverAgeDependentResponse reinstateResponse = converter.convertResponse(pre0Response);
+					
+			ResponseEntity<ReinstateOverAgeDependentResponse> response = ResponseEntity.ok(reinstateResponse);
+			logger.info("reinstateOverAgeDependent response: {} ", reinstateResponse);
+	
+			transactionComplete(transaction);
+			//inquirePhnResponse.getBeneficiaries().forEach(beneficiary -> addAffectedParty(transaction, IdentifierType.PHN, beneficiary.getPhn(), AffectedPartyDirection.OUTBOUND));
+	
+			return response;	
+		} catch (Exception e) {
+			handleException(transaction, e);
+			return null;
+		}
+	}
+	
+	private Transaction auditReinstateOverAgeDependentStart(ReinstateOverAgeDependentRequest reinstateRequest, HttpServletRequest request) {
+		Transaction transaction = transactionStart(request, TransactionType.ADD_DEPENDENT);
+		addAffectedParty(transaction, IdentifierType.GROUP_NUMBER, reinstateRequest.getGroupNumber(), AffectedPartyDirection.INBOUND);
+		addAffectedParty(transaction, IdentifierType.PHN, reinstateRequest.getPhn(), AffectedPartyDirection.INBOUND);
+		addAffectedParty(transaction, IdentifierType.PHN, reinstateRequest.getDependentPhn(), AffectedPartyDirection.INBOUND);
+		return transaction;
+	}
+
+
+	private void auditGetNameSearchComplete(Transaction transaction, NameSearchResponse nameSearchResponse) {
+		transactionComplete(transaction);
+		if (nameSearchResponse.getCandidates() != null) {
+			nameSearchResponse.getCandidates().forEach(candidate -> addAffectedParty(transaction, IdentifierType.PHN, candidate.getPhn(), AffectedPartyDirection.OUTBOUND));
+		}
+	}
+
+}
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
new file mode 100644
index 00000000..c5207084
--- /dev/null
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
@@ -0,0 +1,57 @@
+package ca.bc.gov.hlth.hnweb.converter.rapid;
+
+import org.apache.commons.lang3.StringUtils;
+
+import ca.bc.gov.hlth.hnweb.model.rapid.RE0;
+import ca.bc.gov.hlth.hnweb.model.rapid.RPBSHeader;
+import ca.bc.gov.hlth.hnweb.model.rapid.RPBSPRE0;
+import ca.bc.gov.hlth.hnweb.model.rest.maintenance.ReinstateOverAgeDependentRequest;
+import ca.bc.gov.hlth.hnweb.model.rest.maintenance.ReinstateOverAgeDependentResponse;
+
+public class RPBSPRE0Converter extends BaseRapidConverter {
+	private static final String TRAN_CODE = "RPBSPRE0";
+
+	public RPBSPRE0Converter() {
+		super();
+	}
+	
+	public RPBSPRE0 convertRequest(ReinstateOverAgeDependentRequest request) {
+		RPBSHeader rpbsHeader = new RPBSHeader();
+		rpbsHeader.setOrganization(userInfo.getOrganization());
+		rpbsHeader.setTranCode(getTranCode());
+
+		RE0 re0 = new RE0();
+		re0.setSubscriberPHN(request.getPhn());
+		re0.setGroupNumber(request.getGroupNumber());
+		re0.setDependentPHN(request.getDependentPhn());
+		re0.setDependentDOB(formatDate(request.getDependentDateOfBirth()));
+		re0.setCanadianStudent(request.getIsStudent());
+		if (StringUtils.equals("Y", request.getIsStudent())) {
+			re0.setStudentEndDate(formatDate(request.getStudentEndDate()));
+		} else {
+			re0.setStudentEndDate("");
+		}
+
+		RPBSPRE0 rpbspre0 = new RPBSPRE0();
+		rpbspre0.setRpbsHeader(rpbsHeader);
+		rpbspre0.setRe0(re0);
+
+		return rpbspre0;
+	}
+	
+	public ReinstateOverAgeDependentResponse convertResponse(RPBSPRE0 rpbspre0) {
+		ReinstateOverAgeDependentResponse response = new ReinstateOverAgeDependentResponse();
+		RPBSHeader header = rpbspre0.getRpbsHeader();
+		
+		handleStatus(header, response);
+		
+		
+		return response;
+	}
+
+	@Override
+	public String getTranCode() {
+		return TRAN_CODE;
+	}
+
+}
\ No newline at end of file
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RE0.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RE0.java
new file mode 100644
index 00000000..fc277916
--- /dev/null
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RE0.java
@@ -0,0 +1,97 @@
+package ca.bc.gov.hlth.hnweb.model.rapid;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class RE0 {
+
+	/** 1 SubscriberPHN String No 0...10 .. */
+	private String subscriberPHN;
+	/** 2 GroupNumber String No 0...7 .. */
+	private String groupNumber;
+	/** 3 DependentPHN String No 0...10 .. */
+	private String dependentPHN;
+	/** 4 DependentDOB	RPBSDate	No	0...10	.. */
+	private String dependentDOB;	
+	/** 5 CanadianStudent String No 0...1 .. (Valid values are 'Y', 'N') **/
+	private String canadianStudent;
+	/** 6 StudentEndDate String No 0...10 .. */
+	private String studentEndDate;
+
+	public RE0() {
+		super();
+	}
+
+	public RE0(String message) {
+		super();
+		subscriberPHN = StringUtils.substring(message, 0, 10);
+		groupNumber = StringUtils.substring(message, 10, 17);
+		dependentPHN = StringUtils.substring(message, 17, 27);
+		dependentDOB = StringUtils.substring(message, 27, 34);
+		canadianStudent = StringUtils.substring(message, 34, 35);
+		studentEndDate = StringUtils.substring(message, 35, 45);
+	}
+
+	public String serialize() {
+		// Serialize is only used in when creating the request
+		StringBuilder sb = new StringBuilder();
+		sb.append(StringUtils.rightPad(subscriberPHN, 10));
+		sb.append(StringUtils.rightPad(groupNumber, 7));
+		sb.append(StringUtils.rightPad(dependentPHN, 10));
+		sb.append(StringUtils.rightPad(dependentDOB, 10));
+		sb.append(StringUtils.rightPad(canadianStudent, 1));
+		sb.append(StringUtils.rightPad(studentEndDate, 10));
+
+		return sb.toString();
+	}
+
+	public String getSubscriberPHN() {
+		return subscriberPHN;
+	}
+
+	public void setSubscriberPHN(String subscriberPHN) {
+		this.subscriberPHN = subscriberPHN;
+	}
+
+	public String getGroupNumber() {
+		return groupNumber;
+	}
+
+	public void setGroupNumber(String groupNumber) {
+		this.groupNumber = groupNumber;
+	}
+
+	public String getDependentPHN() {
+		return dependentPHN;
+	}
+
+	public void setDependentPHN(String dependentPHN) {
+		this.dependentPHN = dependentPHN;
+	}
+
+	public String getDependentDOB() {
+		return dependentDOB;
+	}
+
+	public void setDependentDOB(String dependentDOB) {
+		this.dependentDOB = dependentDOB;
+	}
+
+	public String getCanadianStudent() {
+		return canadianStudent;
+	}
+
+	public void setCanadianStudent(String canadianStudent) {
+		this.canadianStudent = canadianStudent;
+	}
+
+	public String getStudentEndDate() {
+		return studentEndDate;
+	}
+
+	public void setStudentEndDate(String studentEndDate) {
+		this.studentEndDate = studentEndDate;
+	}
+	
+	
+
+}
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RPBSPRE0.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RPBSPRE0.java
new file mode 100644
index 00000000..6fba23a5
--- /dev/null
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RPBSPRE0.java
@@ -0,0 +1,42 @@
+package ca.bc.gov.hlth.hnweb.model.rapid;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class RPBSPRE0 {
+	private RPBSHeader rpbsHeader = new RPBSHeader();
+	private RE0 re0 = new RE0();
+
+	public RPBSPRE0() {
+		super();
+	}
+
+	public RPBSPRE0(String message) {
+		String headerText = StringUtils.substring(message, 0, RPBSHeader.SEGMENT_LENGTH);
+		String bodyText = StringUtils.substring(message, RPBSHeader.SEGMENT_LENGTH);
+
+		rpbsHeader = new RPBSHeader(headerText);
+
+		re0 = new RE0(bodyText);
+	}
+
+	public RPBSHeader getRpbsHeader() {
+		return rpbsHeader;
+	}
+
+	public void setRpbsHeader(RPBSHeader rpbsHeader) {
+		this.rpbsHeader = rpbsHeader;
+	}
+
+	public String serialize() {
+		return rpbsHeader.serialize() + re0.serialize();
+	}
+
+	public RE0 getRe0() {
+		return re0;
+	}
+
+	public void setRe0(RE0 re0) {
+		this.re0 = re0;
+	}
+
+}
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rest/maintenance/ReinstateOverAgeDependentRequest.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rest/maintenance/ReinstateOverAgeDependentRequest.java
new file mode 100644
index 00000000..b338a8db
--- /dev/null
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rest/maintenance/ReinstateOverAgeDependentRequest.java
@@ -0,0 +1,70 @@
+package ca.bc.gov.hlth.hnweb.model.rest.maintenance;
+
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class ReinstateOverAgeDependentRequest {
+
+	private String phn;
+
+	private String groupNumber;
+
+	private String dependentPhn;
+
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private LocalDate dependentDateOfBirth;
+
+	private String isStudent;
+
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private LocalDate studentEndDate;
+
+	public String getPhn() {
+		return phn;
+	}
+
+	public void setPhn(String phn) {
+		this.phn = phn;
+	}
+
+	public String getGroupNumber() {
+		return groupNumber;
+	}
+
+	public void setGroupNumber(String groupNumber) {
+		this.groupNumber = groupNumber;
+	}
+
+	public String getDependentPhn() {
+		return dependentPhn;
+	}
+
+	public void setDependentPhn(String dependentPhn) {
+		this.dependentPhn = dependentPhn;
+	}
+
+	public LocalDate getDependentDateOfBirth() {
+		return dependentDateOfBirth;
+	}
+
+	public void setDependentDateOfBirth(LocalDate dependentDateOfBirth) {
+		this.dependentDateOfBirth = dependentDateOfBirth;
+	}
+
+	public String getIsStudent() {
+		return isStudent;
+	}
+
+	public void setIsStudent(String isStudent) {
+		this.isStudent = isStudent;
+	}
+
+	public LocalDate getStudentEndDate() {
+		return studentEndDate;
+	}
+
+	public void setStudentEndDate(LocalDate studentEndDate) {
+		this.studentEndDate = studentEndDate;
+	}
+}
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rest/maintenance/ReinstateOverAgeDependentResponse.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rest/maintenance/ReinstateOverAgeDependentResponse.java
new file mode 100644
index 00000000..6e2f11fc
--- /dev/null
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rest/maintenance/ReinstateOverAgeDependentResponse.java
@@ -0,0 +1,17 @@
+package ca.bc.gov.hlth.hnweb.model.rest.maintenance;
+
+import ca.bc.gov.hlth.hnweb.model.rest.BaseResponse;
+
+public class ReinstateOverAgeDependentResponse extends BaseResponse {
+
+	private String phn;
+
+	public String getPhn() {
+		return phn;
+	}
+
+	public void setPhn(String pid) {
+		this.phn = pid;
+	}
+
+}
\ No newline at end of file
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/service/MaintenanceService.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/service/MaintenanceService.java
new file mode 100644
index 00000000..cb91a674
--- /dev/null
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/service/MaintenanceService.java
@@ -0,0 +1,72 @@
+package ca.bc.gov.hlth.hnweb.service;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import ca.bc.gov.hlth.hnweb.exception.ExceptionType;
+import ca.bc.gov.hlth.hnweb.exception.HNWebException;
+import ca.bc.gov.hlth.hnweb.model.rapid.RPBSPRE0;
+import ca.bc.gov.hlth.hnweb.persistence.entity.Transaction;
+
+
+/**
+ * Service for processing Coverage Maintenance requests. 
+ *
+ */
+@Service
+public class MaintenanceService extends BaseService {
+
+	private static final Logger logger = LoggerFactory.getLogger(MaintenanceService.class);
+
+	@Value("${rapid.r43Path}")
+	private String r43Path;
+
+	@Autowired
+	private WebClient rapidWebClient;
+	
+	/**
+	 * Reinstate an Over Age Dependent based on the R43/RPBSPRE0 request.
+	 * 
+	 * @param rpbspre0
+	 * @return The RPBSPRE0 response.
+	 * @throws HNWebException
+	 */
+	public RPBSPRE0 reinstateOverAgeDependent(RPBSPRE0 rpbspre0, Transaction transaction) throws HNWebException {
+		String rpbspre0Str = rpbspre0.serialize();
+
+		logger.info("Request {}", rpbspre0Str);
+
+		messageSent(transaction);
+		ResponseEntity<String> response = postRapidRequest(r43Path, rpbspre0Str, transaction.getTransactionId().toString());
+		
+		logger.debug("Response Status: {} ; Message:\n{}", response.getStatusCode(), response.getBody());
+		
+		if (response.getStatusCode() != HttpStatus.OK) {
+			logger.error("Could not connect to downstream service. Service returned {}", response.getStatusCode());
+			throw new HNWebException(ExceptionType.DOWNSTREAM_FAILURE);
+		}
+
+		messageReceived(transaction);
+		return new RPBSPRE0(response.getBody());
+	}
+	
+	private ResponseEntity<String> postRapidRequest(String path, String body, String transactionId) {
+		return rapidWebClient
+				.post()
+				.uri(path)
+				.contentType(MediaType.TEXT_PLAIN)
+				.header(TRANSACTION_ID, transactionId)
+				.bodyValue(body)
+				.retrieve()
+				.toEntity(String.class)
+				.block();
+	}
+	
+}
diff --git a/frontend/src/services/BaseService.js b/frontend/src/services/BaseService.js
index ec7c5b94..19c081f9 100644
--- a/frontend/src/services/BaseService.js
+++ b/frontend/src/services/BaseService.js
@@ -21,7 +21,9 @@ export const resources = {
     updateNumberAndDept: '/group-member/update-number-and-dept',
     cancelGroupMember: '/group-member/cancel-group-member',
     cancelDependent: '/group-member/cancel-dependent',
-    reinstateOverAgeDependent: '/group-member/reinstate-over-age-dependent',
+  },
+  maintenance: {
+    reinstateOverAgeDependent: '/maintenance/reinstate-over-age-dependent',
   },
   mspContracts: {
     getContractPeriods: '/msp-contracts/get-contract-periods',
diff --git a/frontend/src/services/MaintenanceService.js b/frontend/src/services/MaintenanceService.js
new file mode 100644
index 00000000..7e60ce19
--- /dev/null
+++ b/frontend/src/services/MaintenanceService.js
@@ -0,0 +1,7 @@
+import { apiRequest, resources } from './BaseService'
+
+export default {
+  reinstateOverAgeDependent(request) {
+    return apiRequest().then((axiosInstance) => axiosInstance.post(resources.maintenance.reinstateOverAgeDependent, request))
+  },
+}
diff --git a/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue b/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
index 3f228d3d..4d08a876 100644
--- a/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
+++ b/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
@@ -18,7 +18,7 @@
       </AppRow>
       <AppRow>
         <AppCol class="col4">
-          <AppDateInput :e-model="v$.dependentBirthDate" id="dependentBirthDate" label="Dependent's Birth Date" v-model="dependentBirthDate" />
+          <AppDateInput :e-model="v$.dependentDateOfBirth" id="dependentDateOfBirth" label="Dependent's Birth Date" v-model="dependentDateOfBirth" />
         </AppCol>
       </AppRow>
       <AppRow>
@@ -58,7 +58,7 @@ import { helpers, required, requiredIf } from '@vuelidate/validators'
 import dayjs from 'dayjs'
 import { VALIDATE_GROUP_NUMBER_MESSAGE, VALIDATE_PHN_MESSAGE, validateGroupNumber, validatePHN } from '../../../util/validators'
 import { API_DATE_FORMAT, RELATIONSHIPS } from '../../../util/constants'
-import GroupMemberService from '../../../services/GroupMemberService'
+import MaintenanceService from '../../../services/MaintenanceService'
 import { useAlertStore } from '../../../stores/alert'
 import AppCol from '../../../components/grid/AppCol.vue'
 
@@ -84,7 +84,7 @@ export default {
       groupNumber: '',
       phn: '',
       dependentPhn: '',
-      dependentBirthDate: null,
+      dependentDateOfBirth: null,
       relationship: '',
       isStudent: '',
       studentEndDate: null,
@@ -102,16 +102,17 @@ export default {
       try {
         const isValid = await this.v$.$validate()
         if (!isValid) {
+          console.log('isValid ' + isValid)
           this.showError()
           return
         }
 
         this.result = (
-          await GroupMemberService.addDependent({
+          await MaintenanceService.reinstateOverAgeDependent({
             groupNumber: this.groupNumber,
             phn: this.phn,
             dependentPhn: this.dependentPhn,
-            relationship: this.relationship,
+            dependentDateOfBirth: dayjs(this.dependentDateOfBirth).format(API_DATE_FORMAT),
             isStudent: this.isStudent,
             studentEndDate: this.studentEndDate ? dayjs(this.studentEndDate).format(API_DATE_FORMAT) : null,
           })
@@ -140,7 +141,7 @@ export default {
       this.groupNumber = ''
       this.phn = ''
       this.dependentPhn = ''
-      this.relationship = ''
+      this.dependentDateOfBirth = ''
       this.isStudent = ''
       this.studentEndDate = null
       this.result = null
@@ -163,10 +164,7 @@ export default {
         required,
         validatePHN: helpers.withMessage(VALIDATE_PHN_MESSAGE, validatePHN),
       },
-      dependentBirthDate: { required },
-      relationship: {
-        required,
-      },
+      dependentDateOfBirth: { required },
       isStudent: { required },
       studentEndDate: {
         requiredIfIsStudent: requiredIf(() => {

From 4604d9a3b8ad1d35aeffc40f96ceaa56709852d0 Mon Sep 17 00:00:00 2001
From: weskubo-cgi <wes.kubo@cgi.com>
Date: Thu, 2 Jun 2022 11:23:24 -0700
Subject: [PATCH 4/9] UI updates. API updates. Added unit tests. Fixed method
 naming.

---
 .../controller/MaintenanceController.java     |  16 +-
 .../converter/rapid/BaseRapidConverter.java   |   2 +
 .../converter/rapid/RPBSPRE0Converter.java    |  19 ++-
 .../ca/bc/gov/hlth/hnweb/model/rapid/RE0.java |   4 +-
 .../hlth/hnweb/security/TransactionType.java  |   7 +-
 .../hnweb/service/MaintenanceService.java     |   2 +
 .../bc/gov/hlth/hnweb/BaseControllerTest.java |   2 +-
 .../controller/EligibilityControllerTest.java |  60 ++++----
 .../controller/EnrollmentControllerTest.java  |  44 +++---
 .../controller/GroupMemberControllerTest.java |  84 +++++-----
 .../controller/MaintenanceControllerTest.java | 144 ++++++++++++++++++
 .../MspContractsControllerTest.java           |  44 +++---
 .../src/test/resources/application-dev.yaml   |   3 +-
 .../maintenance/ReinstateOverAgeDependent.vue |  13 +-
 14 files changed, 297 insertions(+), 147 deletions(-)
 create mode 100644 backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java

diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceController.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceController.java
index f202e15c..79e7c1a8 100644
--- a/backend/src/main/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceController.java
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceController.java
@@ -3,7 +3,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +14,6 @@
 
 import ca.bc.gov.hlth.hnweb.converter.rapid.RPBSPRE0Converter;
 import ca.bc.gov.hlth.hnweb.model.rapid.RPBSPRE0;
-import ca.bc.gov.hlth.hnweb.model.rest.enrollment.EnrollSubscriberResponse;
-import ca.bc.gov.hlth.hnweb.model.rest.enrollment.GetPersonDetailsResponse;
-import ca.bc.gov.hlth.hnweb.model.rest.enrollment.NameSearchResponse;
 import ca.bc.gov.hlth.hnweb.model.rest.maintenance.ReinstateOverAgeDependentRequest;
 import ca.bc.gov.hlth.hnweb.model.rest.maintenance.ReinstateOverAgeDependentResponse;
 import ca.bc.gov.hlth.hnweb.persistence.entity.AffectedPartyDirection;
@@ -57,7 +53,7 @@ public ResponseEntity<ReinstateOverAgeDependentResponse> reinstateOverAgeDepende
 			logger.info("reinstateOverAgeDependent response: {} ", reinstateResponse);
 	
 			transactionComplete(transaction);
-			//inquirePhnResponse.getBeneficiaries().forEach(beneficiary -> addAffectedParty(transaction, IdentifierType.PHN, beneficiary.getPhn(), AffectedPartyDirection.OUTBOUND));
+			addAffectedParty(transaction, IdentifierType.PHN, reinstateResponse.getPhn(), AffectedPartyDirection.OUTBOUND);
 	
 			return response;	
 		} catch (Exception e) {
@@ -67,19 +63,11 @@ public ResponseEntity<ReinstateOverAgeDependentResponse> reinstateOverAgeDepende
 	}
 	
 	private Transaction auditReinstateOverAgeDependentStart(ReinstateOverAgeDependentRequest reinstateRequest, HttpServletRequest request) {
-		Transaction transaction = transactionStart(request, TransactionType.ADD_DEPENDENT);
+		Transaction transaction = transactionStart(request, TransactionType.REINSTATE_OVER_AGE_DEPENDENT);
 		addAffectedParty(transaction, IdentifierType.GROUP_NUMBER, reinstateRequest.getGroupNumber(), AffectedPartyDirection.INBOUND);
 		addAffectedParty(transaction, IdentifierType.PHN, reinstateRequest.getPhn(), AffectedPartyDirection.INBOUND);
 		addAffectedParty(transaction, IdentifierType.PHN, reinstateRequest.getDependentPhn(), AffectedPartyDirection.INBOUND);
 		return transaction;
 	}
 
-
-	private void auditGetNameSearchComplete(Transaction transaction, NameSearchResponse nameSearchResponse) {
-		transactionComplete(transaction);
-		if (nameSearchResponse.getCandidates() != null) {
-			nameSearchResponse.getCandidates().forEach(candidate -> addAffectedParty(transaction, IdentifierType.PHN, candidate.getPhn(), AffectedPartyDirection.OUTBOUND));
-		}
-	}
-
 }
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/BaseRapidConverter.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/BaseRapidConverter.java
index 595844ef..368072d5 100644
--- a/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/BaseRapidConverter.java
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/BaseRapidConverter.java
@@ -18,6 +18,8 @@ public abstract class BaseRapidConverter {
 
 	protected static final String RAPID_DATE_FORMAT = "yyyy-MM-dd";
 	
+	protected static final String RAPID_YYYY_MM_FORMAT = "yyyy-MM";
+	
 	protected static final String STATUS_CODE_SUCCESS = "RPBS9014";
 	
 	protected static final String STATUS_TEXT_SUCCESS = "TRANSACTION SUCCESSFUL";
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
index c5207084..22060b1d 100644
--- a/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
@@ -1,6 +1,7 @@
 package ca.bc.gov.hlth.hnweb.converter.rapid;
 
-import org.apache.commons.lang3.StringUtils;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 import ca.bc.gov.hlth.hnweb.model.rapid.RE0;
 import ca.bc.gov.hlth.hnweb.model.rapid.RPBSHeader;
@@ -25,12 +26,9 @@ public RPBSPRE0 convertRequest(ReinstateOverAgeDependentRequest request) {
 		re0.setGroupNumber(request.getGroupNumber());
 		re0.setDependentPHN(request.getDependentPhn());
 		re0.setDependentDOB(formatDate(request.getDependentDateOfBirth()));
-		re0.setCanadianStudent(request.getIsStudent());
-		if (StringUtils.equals("Y", request.getIsStudent())) {
-			re0.setStudentEndDate(formatDate(request.getStudentEndDate()));
-		} else {
-			re0.setStudentEndDate("");
-		}
+		re0.setCanadianStudent(request.getIsStudent()); 
+		LocalDate studentEndDate = request.getStudentEndDate() != null ? request.getStudentEndDate() : calculateStudentEndDate(request.getDependentDateOfBirth());
+		re0.setStudentEndDate(studentEndDate.format(DateTimeFormatter.ofPattern(RAPID_YYYY_MM_FORMAT)));
 
 		RPBSPRE0 rpbspre0 = new RPBSPRE0();
 		rpbspre0.setRpbsHeader(rpbsHeader);
@@ -45,6 +43,7 @@ public ReinstateOverAgeDependentResponse convertResponse(RPBSPRE0 rpbspre0) {
 		
 		handleStatus(header, response);
 		
+		response.setPhn(rpbspre0.getRe0().getSubscriberPHN());
 		
 		return response;
 	}
@@ -53,5 +52,11 @@ public ReinstateOverAgeDependentResponse convertResponse(RPBSPRE0 rpbspre0) {
 	public String getTranCode() {
 		return TRAN_CODE;
 	}
+	
+	private LocalDate calculateStudentEndDate(LocalDate birthDate) {
+		// The end date is to be stripped of the dd portion. If the end date is empty then a new end date
+		// is to be made up from the dependents birth date and the current year plus one
+		return LocalDate.of(LocalDate.now().getYear(), birthDate.getMonth(), birthDate.getDayOfYear()).plusYears(1);
+	}
 
 }
\ No newline at end of file
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RE0.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RE0.java
index fc277916..7b667ece 100644
--- a/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RE0.java
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/model/rapid/RE0.java
@@ -28,7 +28,7 @@ public RE0(String message) {
 		dependentPHN = StringUtils.substring(message, 17, 27);
 		dependentDOB = StringUtils.substring(message, 27, 34);
 		canadianStudent = StringUtils.substring(message, 34, 35);
-		studentEndDate = StringUtils.substring(message, 35, 45);
+		studentEndDate = StringUtils.substring(message, 35, 42);
 	}
 
 	public String serialize() {
@@ -39,7 +39,7 @@ public String serialize() {
 		sb.append(StringUtils.rightPad(dependentPHN, 10));
 		sb.append(StringUtils.rightPad(dependentDOB, 10));
 		sb.append(StringUtils.rightPad(canadianStudent, 1));
-		sb.append(StringUtils.rightPad(studentEndDate, 10));
+		sb.append(StringUtils.rightPad(studentEndDate, 7));
 
 		return sb.toString();
 	}
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/security/TransactionType.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/security/TransactionType.java
index 571bbb82..0ed01511 100644
--- a/backend/src/main/java/ca/bc/gov/hlth/hnweb/security/TransactionType.java
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/security/TransactionType.java
@@ -17,9 +17,10 @@ public enum TransactionType {
 	CANCEL_GROUP_MEMBER("CancelGroupMember"),
 	CANCEL_DEPENDENT("CancelDependent"),
 	GET_CONTRACT_PERIODS("GetContractPeriods"),
-	CONTRACT_INQUIRY("ContractInquiry"),	//R40
-	GET_CONTRACT_ADDRESS("GetContractAddress"), //R37
-	UPDATE_CONTRACT_ADDRESS("UpdateContractAddress"), //R38
+	CONTRACT_INQUIRY("ContractInquiry"),	// R40
+	GET_CONTRACT_ADDRESS("GetContractAddress"), // R37
+	UPDATE_CONTRACT_ADDRESS("UpdateContractAddress"), // R38
+	REINSTATE_OVER_AGE_DEPENDENT("ReinstateOverAgeDependent"), // R43
 	
 	UNKNOWN("Unknown");
 
diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/service/MaintenanceService.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/service/MaintenanceService.java
index cb91a674..c122768e 100644
--- a/backend/src/main/java/ca/bc/gov/hlth/hnweb/service/MaintenanceService.java
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/service/MaintenanceService.java
@@ -48,6 +48,8 @@ public RPBSPRE0 reinstateOverAgeDependent(RPBSPRE0 rpbspre0, Transaction transac
 		
 		logger.debug("Response Status: {} ; Message:\n{}", response.getStatusCode(), response.getBody());
 		
+		logger.info("Response {}", response.getBody());
+		
 		if (response.getStatusCode() != HttpStatus.OK) {
 			logger.error("Could not connect to downstream service. Service returned {}", response.getStatusCode());
 			throw new HNWebException(ExceptionType.DOWNSTREAM_FAILURE);
diff --git a/backend/src/test/java/ca/bc/gov/hlth/hnweb/BaseControllerTest.java b/backend/src/test/java/ca/bc/gov/hlth/hnweb/BaseControllerTest.java
index 9986b178..150c324c 100644
--- a/backend/src/test/java/ca/bc/gov/hlth/hnweb/BaseControllerTest.java
+++ b/backend/src/test/java/ca/bc/gov/hlth/hnweb/BaseControllerTest.java
@@ -91,7 +91,7 @@ protected Transaction assertTransactionCreated(TransactionType type) {
 	 * 
 	 * @return The number of AffectedPartys found for the specified direction.
 	 */
-	protected int assertAffectedParyCount(AffectedPartyDirection direction, int count) {
+	protected int assertAffectedPartyCount(AffectedPartyDirection direction, int count) {
 		AffectedParty example = new AffectedParty();
 		example.setAffectedPartyId(0);
 		example.setDirection(direction.getValue());
diff --git a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/EligibilityControllerTest.java b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/EligibilityControllerTest.java
index 8e6ea057..471319b2 100644
--- a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/EligibilityControllerTest.java
+++ b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/EligibilityControllerTest.java
@@ -160,8 +160,8 @@ public void testCheckEligibility_success_eligible() throws Exception {
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.CHECK_ELIGIBILITY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -193,8 +193,8 @@ public void testCheckEligibility_success_ineligible() throws Exception {
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
       
         assertTransactionCreated(TransactionType.CHECK_ELIGIBILITY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 
 	@Test
@@ -226,8 +226,8 @@ public void testCheckEligibility_error_phnInvalid() throws Exception {
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.CHECK_ELIGIBILITY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 
 	@Test
@@ -267,8 +267,8 @@ public void testCheckMspCoverageStatus_success_ineligible() throws InterruptedEx
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));		
         
         assertTransactionCreated(TransactionType.MSP_COVERAGE_STATUS_CHECK);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -309,8 +309,8 @@ public void testCheckMspCoverageStatus_success_eligible() throws InterruptedExce
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.MSP_COVERAGE_STATUS_CHECK);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -349,8 +349,8 @@ public void testCheckMspCoverageStatus_error_phnInvalid() throws InterruptedExce
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.MSP_COVERAGE_STATUS_CHECK);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -389,8 +389,8 @@ public void testCheckMspCoverageStatus_error_dateOfBirthMismatch() throws Interr
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));	
         
         assertTransactionCreated(TransactionType.MSP_COVERAGE_STATUS_CHECK);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -429,8 +429,8 @@ public void testInquirePhn_success() throws InterruptedException {
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.PHN_INQUIRY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -459,8 +459,8 @@ public void testInquirePhn_error_noEligibilityDate() throws InterruptedException
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.PHN_INQUIRY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
 	}
 	
 	@Test
@@ -489,8 +489,8 @@ public void testInquirePhn_warning_invalidPHN() throws InterruptedException {
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.PHN_INQUIRY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
 	}
 	
 	@Test
@@ -531,8 +531,8 @@ public void testInquirePhn_warning_phnNotFound() throws InterruptedException {
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.PHN_INQUIRY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	
@@ -577,8 +577,8 @@ public void testLookupPhn_success() {
 		// - 1 x Response AffectedParty
 
         Transaction transaction = assertTransactionCreated(TransactionType.PHN_LOOKUP);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
         
 		assertEquals("00000010", transaction.getOrganization());
 		assertNotNull(transaction.getServer());
@@ -677,8 +677,8 @@ public void testLookupPhn_warning() {
         assertEquals("M", beneficiary.getGender());
         
         assertTransactionCreated(TransactionType.PHN_LOOKUP);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 50);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 50);
 	}
 	
 	@Test
@@ -704,8 +704,8 @@ public void testLookupPhn_error_invalidContractNumber() {
         assertEquals(0, beneficiaries.size());
         
         assertTransactionCreated(TransactionType.PHN_LOOKUP);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
 	}
 	
 	@Test
@@ -731,8 +731,8 @@ public void testLookupPhn_error_invalidGroupNumber() {
         assertEquals(0, beneficiaries.size());
         
         assertTransactionCreated(TransactionType.PHN_LOOKUP);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
 	}
 
     /**
diff --git a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/EnrollmentControllerTest.java b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/EnrollmentControllerTest.java
index 74603637..4552a4b7 100644
--- a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/EnrollmentControllerTest.java
+++ b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/EnrollmentControllerTest.java
@@ -87,8 +87,8 @@ void testEnrollSubscriber_Z06_Error() throws Exception {
         assertEquals("/", recordedRequest.getPath());
         
         assertTransactionCreated(TransactionType.ENROLL_SUBSCRIBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
     }
     
     @Test
@@ -112,8 +112,8 @@ void testEnrollSubscriber_Z05_Error() throws Exception {
         assertEquals("/", recordedRequest.getPath());
         
         assertTransactionCreated(TransactionType.ENROLL_SUBSCRIBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
     }
     
     @Test
@@ -140,8 +140,8 @@ void testEnrollSubscriber_Z06_Success() throws Exception {
         assertEquals("/", recordedRequest.getPath());       
         
         assertTransactionCreated(TransactionType.ENROLL_SUBSCRIBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
     }
     
     @Test
@@ -167,8 +167,8 @@ void testEnrollSubscriber_Z05_Success() throws Exception {
         assertEquals("/", recordedRequest.getPath());       
         
         assertTransactionCreated(TransactionType.ENROLL_SUBSCRIBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     
@@ -195,8 +195,8 @@ void testGetDemographicsDetails_Success() throws Exception {
         assertEquals("/", recordedRequest.getPath());
         
         assertTransactionCreated(TransactionType.GET_PERSON_DETAILS);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -220,8 +220,8 @@ void testGetDemographicsDetails_Warning() throws Exception {
         assertEquals("/", recordedRequest.getPath());
         
         assertTransactionCreated(TransactionType.GET_PERSON_DETAILS);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -249,8 +249,8 @@ void testGetDemographicsDetails_Error() throws Exception {
         assertEquals("/", recordedRequest.getPath());
         
         assertTransactionCreated(TransactionType.GET_PERSON_DETAILS);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
     }
     
     @Test
@@ -280,8 +280,8 @@ void testGetNameSearch_MultiRecords() throws Exception {
         assertEquals("/", recordedRequest.getPath());
         
         assertTransactionCreated(TransactionType.NAME_SEARCH);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 0);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 3);
     }
     
     
@@ -309,8 +309,8 @@ void testGetNameSearch_NoRecords() throws Exception {
         assertEquals("/", recordedRequest.getPath());
         
         assertTransactionCreated(TransactionType.NAME_SEARCH);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 0);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
     }
     
     @Test
@@ -339,8 +339,8 @@ void testGetNameSearch_Warnings() throws Exception {
         assertEquals("/", recordedRequest.getPath());
         
         assertTransactionCreated(TransactionType.NAME_SEARCH);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 0);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 10);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 10);
     }
     
     @Test
@@ -367,8 +367,8 @@ void testGetNameSearch_Error() throws Exception {
         assertEquals("/", recordedRequest.getPath());
         
         assertTransactionCreated(TransactionType.NAME_SEARCH);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 0);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
     }
     
     /**
diff --git a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/GroupMemberControllerTest.java b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/GroupMemberControllerTest.java
index 24c4fad8..40c88e45 100644
--- a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/GroupMemberControllerTest.java
+++ b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/GroupMemberControllerTest.java
@@ -79,8 +79,8 @@ public void testUpdateGroupMember_invalidRequest() {
     	assertEquals("Department Number or Group Number is required", exception.getReason());
     	
         assertTransactionCreated(TransactionType.UPDATE_NUMBER_AND_OR_DEPT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 0);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 0);
     }
 
     @Test
@@ -110,8 +110,8 @@ public void testUpdateGroupMember_phnHasNoCoverageInGroup() throws InterruptedEx
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.UPDATE_NUMBER_AND_OR_DEPT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 4);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 4);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -141,8 +141,8 @@ public void testUpdateGroupMember_success() throws InterruptedException {
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.UPDATE_NUMBER_AND_OR_DEPT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 4);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 4);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -169,8 +169,8 @@ public void testCancelGroupMember_cancelDateMissing() throws InterruptedExceptio
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_GROUP_MEMBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -198,8 +198,8 @@ public void testCancelGroupMember_cancelDayInvalid() throws InterruptedException
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_GROUP_MEMBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -227,8 +227,8 @@ public void testCancelGroupMember_cancelReasonInvalid() throws InterruptedExcept
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_GROUP_MEMBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
 
     @Test
@@ -255,8 +255,8 @@ public void testCancelGroupMember_phnDoesNotHaveCoverage() throws InterruptedExc
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_GROUP_MEMBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -283,8 +283,8 @@ public void testCancelGroupMember_futureCancelDate() throws InterruptedException
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_GROUP_MEMBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -311,8 +311,8 @@ public void testCancelGroupMember_success() throws InterruptedException {
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_GROUP_MEMBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -346,8 +346,8 @@ public void testAddGroupMember_coverageAlreadyExists() throws InterruptedExcepti
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.ADD_GROUP_MEMBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 4);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 4);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -381,8 +381,8 @@ public void testAddGroupMember_success() throws InterruptedException {
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.ADD_GROUP_MEMBER);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 4);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 4);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -410,8 +410,8 @@ public void testAddDependent_success() throws InterruptedException {
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.ADD_DEPENDENT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 3);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
 
     @Test
@@ -439,8 +439,8 @@ public void testAddDependent_InvalidRelationship() throws InterruptedException {
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.ADD_DEPENDENT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 3);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
 
     @Test
@@ -469,8 +469,8 @@ public void testAddDependent_InvalidIsStudentFlag() throws InterruptedException
 	    assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.ADD_DEPENDENT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 3);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
     
     @Test
@@ -498,8 +498,8 @@ public void testAddDependent_PhnNotFound() throws InterruptedException {
 	    assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.ADD_DEPENDENT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 3);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
     @Test
@@ -527,8 +527,8 @@ public void testCancelDependent_dependentNotUnderSubcriberCoverage() throws Inte
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_DEPENDENT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 3);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -556,8 +556,8 @@ public void testCancelDependent_subscriberPhnNotInGroup() throws InterruptedExce
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_DEPENDENT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 3);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -585,8 +585,8 @@ public void testCancelDependent_subscriberAndDependentPhnAreSame() throws Interr
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_DEPENDENT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 3);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
     
     @Test
@@ -614,8 +614,8 @@ public void testCancelDependent_noActiveCoverage() throws InterruptedException {
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_DEPENDENT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 3);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
 
     @Test
@@ -643,8 +643,8 @@ public void testCancelDependent_futureCancelDate() throws InterruptedException {
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_DEPENDENT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 3);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
 
     @Test
@@ -673,8 +673,8 @@ public void testCancelDependent_success() throws InterruptedException {
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
 
         assertTransactionCreated(TransactionType.CANCEL_DEPENDENT);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 3);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
     }
    
     /**
diff --git a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
new file mode 100644
index 00000000..3030994d
--- /dev/null
+++ b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
@@ -0,0 +1,144 @@
+package ca.bc.gov.hlth.hnweb.controller;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+
+import ca.bc.gov.hlth.hnweb.BaseControllerTest;
+import ca.bc.gov.hlth.hnweb.model.rest.StatusEnum;
+import ca.bc.gov.hlth.hnweb.model.rest.maintenance.ReinstateOverAgeDependentRequest;
+import ca.bc.gov.hlth.hnweb.model.rest.maintenance.ReinstateOverAgeDependentResponse;
+import ca.bc.gov.hlth.hnweb.persistence.entity.AffectedPartyDirection;
+import ca.bc.gov.hlth.hnweb.security.TransactionType;
+import ca.bc.gov.hlth.hnweb.util.V2MessageUtil;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.RecordedRequest;
+
+public class MaintenanceControllerTest extends BaseControllerTest {
+	
+	private static final String R43_SUCCESS = "";
+	
+	private static final String R43_INVALID_STUDENT_DATE_DATE = "        RPBSPRE000000010                                ERRORMSGRPBS0111STUDENT END DATE YEAR MUST BE GREATER THAN OR EQUAL TO CURRENT YEAR.    9332912486633710993292797331970-01-01Y2020-01";
+
+	private static final String R43_NOT_ATTENDING_CANADIAN_SCHOOL = "        RPBSPRE000000010                                ERRORMSGRPBS0108STUDENT NOT ATTENDING SCHOOL IN CANADA, MUST FORWARD DOCUMENTS TO MSP.  9332912486633710993292797331970-01-01N2023-01";
+
+	private static final String R43_NO_COVERAGE_FOUND = "        RPBSPRE000000010                                ERRORMSGRPBS0067NO COVERAGE FOUND FOR THE PHN ENTERED. PLEASE CONTACT MSP               9332912486633710993292797331970-01-01Y2023-01";
+	
+
+	protected static DateTimeFormatter dateOnlyFormatter = DateTimeFormatter.ofPattern(V2MessageUtil.DATE_FORMAT_DATE_ONLY);
+	
+	@Autowired
+	private MaintenanceController maintenanceController;
+   
+	@Test
+	public void testReinstateOverAgeDependent_error_invalidStudentEndDate() throws Exception {
+        mockBackEnd.enqueue(new MockResponse()
+        		.setBody(R43_INVALID_STUDENT_DATE_DATE)
+        	    .addHeader(CONTENT_TYPE, MediaType.TEXT_PLAIN.toString()));
+        
+        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest(LocalDate.of(2020, 1, 1));
+		
+        ResponseEntity<ReinstateOverAgeDependentResponse> response = maintenanceController.reinstateOverAgeDependent(reinstateRequest, createHttpServletRequest());
+		
+        ReinstateOverAgeDependentResponse reinstateResponse = response.getBody();
+		assertEquals(StatusEnum.ERROR, reinstateResponse.getStatus());
+        assertEquals("RPBS0111 STUDENT END DATE YEAR MUST BE GREATER THAN OR EQUAL TO CURRENT YEAR.", reinstateResponse.getMessage());
+
+        assertEquals("9332912486", reinstateResponse.getPhn());
+        
+		// Check the client request is sent as expected
+        RecordedRequest recordedRequest = mockBackEnd.takeRequest();        
+        assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
+        assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
+        
+        assertTransactionCreated(TransactionType.REINSTATE_OVER_AGE_DEPENDENT);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
+	}
+	
+	@Test
+	public void testReinstateOverAgeDependent_error_noCoverageFound() throws Exception {
+        mockBackEnd.enqueue(new MockResponse()
+        		.setBody(R43_NO_COVERAGE_FOUND)
+        	    .addHeader(CONTENT_TYPE, MediaType.TEXT_PLAIN.toString()));
+        
+        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest(null);
+		
+        ResponseEntity<ReinstateOverAgeDependentResponse> response = maintenanceController.reinstateOverAgeDependent(reinstateRequest, createHttpServletRequest());
+		
+        ReinstateOverAgeDependentResponse reinstateResponse = response.getBody();
+		assertEquals(StatusEnum.ERROR, reinstateResponse.getStatus());
+        assertEquals("RPBS0067 NO COVERAGE FOUND FOR THE PHN ENTERED. PLEASE CONTACT MSP", reinstateResponse.getMessage());
+
+        assertEquals("9332912486", reinstateResponse.getPhn());
+        
+		// Check the client request is sent as expected
+        RecordedRequest recordedRequest = mockBackEnd.takeRequest();        
+        assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
+        assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
+        
+        assertTransactionCreated(TransactionType.REINSTATE_OVER_AGE_DEPENDENT);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
+	}
+	
+	@Test
+	public void testReinstateOverAgeDependent_error_notAttendingCanadianSchool() throws Exception {
+        mockBackEnd.enqueue(new MockResponse()
+        		.setBody(R43_NOT_ATTENDING_CANADIAN_SCHOOL)
+        	    .addHeader(CONTENT_TYPE, MediaType.TEXT_PLAIN.toString()));
+        
+        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest(null);
+		
+        ResponseEntity<ReinstateOverAgeDependentResponse> response = maintenanceController.reinstateOverAgeDependent(reinstateRequest, createHttpServletRequest());
+		
+        ReinstateOverAgeDependentResponse reinstateResponse = response.getBody();
+		assertEquals(StatusEnum.ERROR, reinstateResponse.getStatus());
+        assertEquals("RPBS0108 STUDENT NOT ATTENDING SCHOOL IN CANADA, MUST FORWARD DOCUMENTS TO MSP.", reinstateResponse.getMessage());
+
+        assertEquals("9332912486", reinstateResponse.getPhn());
+        
+		// Check the client request is sent as expected
+        RecordedRequest recordedRequest = mockBackEnd.takeRequest();        
+        assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
+        assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
+        
+        assertTransactionCreated(TransactionType.REINSTATE_OVER_AGE_DEPENDENT);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
+	}
+	
+    /**
+     * The URL property used by the mocked endpoint needs to be set after the MockWebServer starts as the port it uses is 
+     * created dynamically on start up to ensure it uses an available port so it is not known before then. 
+     * @param registry
+     */
+    @DynamicPropertySource
+    static void registerMockUrlProperty(DynamicPropertyRegistry registry) {
+        registry.add("rapid.url", () -> String.format("http://localhost:%s", mockBackEnd.getPort()));
+    }
+	
+	private ReinstateOverAgeDependentRequest createReinstateOverAgeDependentRequest(LocalDate studentEndDate) {
+		ReinstateOverAgeDependentRequest reinstateRequest = new ReinstateOverAgeDependentRequest();
+		reinstateRequest.setGroupNumber("6337109");
+		reinstateRequest.setPhn("9332912486");
+		reinstateRequest.setDependentPhn("9329279733");
+		reinstateRequest.setDependentDateOfBirth(LocalDate.of(1970, 1, 1));
+		reinstateRequest.setStudentEndDate(studentEndDate);
+		
+		return reinstateRequest;
+	}
+	
+}
+
+
diff --git a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MspContractsControllerTest.java b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MspContractsControllerTest.java
index 1f206e58..c4935dd6 100644
--- a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MspContractsControllerTest.java
+++ b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MspContractsControllerTest.java
@@ -153,8 +153,8 @@ public void testGetContractPeriods_success() throws InterruptedException {
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.GET_CONTRACT_PERIODS);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 4);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 4);
 	}
 	
 	@Test
@@ -198,8 +198,8 @@ public void testGetContractPeriods_warning_moreThan20PersonsFound() throws Inter
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));        
         
         assertTransactionCreated(TransactionType.GET_CONTRACT_PERIODS);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 22);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 22);
 	}
 	
 	@Test
@@ -230,8 +230,8 @@ public void testGetContractPeriods_error_phnNotFound() throws InterruptedExcepti
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.GET_CONTRACT_PERIODS);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 1);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -289,8 +289,8 @@ public void testContractInquiry_success() throws InterruptedException {
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         
         assertTransactionCreated(TransactionType.CONTRACT_INQUIRY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 2);
 	}
 	
 	@Test
@@ -321,8 +321,8 @@ public void testContractInquiry_error_phnNotFound() throws InterruptedException
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         assertTransactionCreated(TransactionType.CONTRACT_INQUIRY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -352,8 +352,8 @@ public void testContractInquiry_error_NoCoverageFound() throws InterruptedExcept
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE)); 
         assertTransactionCreated(TransactionType.CONTRACT_INQUIRY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -397,8 +397,8 @@ public void testContractInquiry_warning_moreThan20PersonsFound() throws Interrup
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE)); 
         assertTransactionCreated(TransactionType.CONTRACT_INQUIRY);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 20);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 20);
 	}
 	
 	@Test
@@ -432,8 +432,8 @@ public void testUpdateContractAddress_error_phoneAlreadyExist() throws Interrupt
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         assertTransactionCreated(TransactionType.UPDATE_CONTRACT_ADDRESS);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -474,8 +474,8 @@ public void testUpdateContractAddress_success() throws InterruptedException {
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         assertTransactionCreated(TransactionType.UPDATE_CONTRACT_ADDRESS);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -519,8 +519,8 @@ public void testUpdateContractAddress_error_addressAlreadyExist() throws Interru
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         assertTransactionCreated(TransactionType.UPDATE_CONTRACT_ADDRESS);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
 	@Test
@@ -556,8 +556,8 @@ public void testUpdateContractAddress_error_phnNotFound() throws InterruptedExce
         assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
         assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
         assertTransactionCreated(TransactionType.UPDATE_CONTRACT_ADDRESS);
-        assertAffectedParyCount(AffectedPartyDirection.INBOUND, 2);
-        assertAffectedParyCount(AffectedPartyDirection.OUTBOUND, 1);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 2);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
     /**
diff --git a/backend/src/test/resources/application-dev.yaml b/backend/src/test/resources/application-dev.yaml
index b55e7734..89e4d154 100644
--- a/backend/src/test/resources/application-dev.yaml
+++ b/backend/src/test/resources/application-dev.yaml
@@ -36,7 +36,8 @@ rapid:
   r38Path:
   r40Path:   
   r41Path: 
-  r42Path: 
+  r42Path:
+  r43Path: 
   user: 
     name: 
     password: 
diff --git a/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue b/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
index 4d08a876..6b409538 100644
--- a/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
+++ b/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
@@ -35,7 +35,9 @@
       </AppRow>
       <AppRow>
         <AppCol class="col4">
-          <AppDateInput :e-model="v$.studentEndDate" id="studentEndDate" label="Student End Date" v-model="studentEndDate" />
+          <AppDateInput :e-model="v$.studentEndDate" id="studentEndDate" label="Student End Date" monthPicker inputDateFormat="yyyyMM" placeholder="YYYYMM" v-model="studentEndDate">
+            <template #tooltip>Date always defaults to last day of the month</template>
+          </AppDateInput>
         </AppCol>
       </AppRow>
       <AppRow>
@@ -95,6 +97,12 @@ export default {
       },
     }
   },
+  computed: {
+    // Student End Date should be the last day of the month. In JavaScript this can be done by using day 0 of the next month
+    studentEndDateAdjusted() {
+      return new Date(this.studentEndDate.year, this.studentEndDate.month + 1, 0)
+    },
+  },
   methods: {
     async submitForm() {
       this.submitting = true
@@ -102,7 +110,6 @@ export default {
       try {
         const isValid = await this.v$.$validate()
         if (!isValid) {
-          console.log('isValid ' + isValid)
           this.showError()
           return
         }
@@ -114,7 +121,7 @@ export default {
             dependentPhn: this.dependentPhn,
             dependentDateOfBirth: dayjs(this.dependentDateOfBirth).format(API_DATE_FORMAT),
             isStudent: this.isStudent,
-            studentEndDate: this.studentEndDate ? dayjs(this.studentEndDate).format(API_DATE_FORMAT) : null,
+            studentEndDate: this.studentEndDate ? dayjs(this.studentEndDateAdjusted).format(API_DATE_FORMAT) : null,
           })
         ).data
 

From 09d07f55ecff2771902ee6084437802a03d872da Mon Sep 17 00:00:00 2001
From: weskubo-cgi <wes.kubo@cgi.com>
Date: Thu, 2 Jun 2022 16:36:47 -0700
Subject: [PATCH 5/9] Minor updates.

---
 .../controller/MaintenanceControllerTest.java | 39 ++++++++++++++++---
 .../maintenance/ReinstateOverAgeDependent.vue |  2 +-
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
index 3030994d..de42c7ae 100644
--- a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
+++ b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
@@ -34,7 +34,8 @@ public class MaintenanceControllerTest extends BaseControllerTest {
 
 	private static final String R43_NO_COVERAGE_FOUND = "        RPBSPRE000000010                                ERRORMSGRPBS0067NO COVERAGE FOUND FOR THE PHN ENTERED. PLEASE CONTACT MSP               9332912486633710993292797331970-01-01Y2023-01";
 	
-
+	private static final String R43_CANNOT_BE_REINSTANTED = "        RPBSPRE000000010                                ERRORMSGRPBS1054DEPENDENT CANNOT BE REINSTATED AS A STUDENT THIS TIME. PLS CONTACT MSP. 9387807484502802293190799262013-03-29Y2022-12";
+	
 	protected static DateTimeFormatter dateOnlyFormatter = DateTimeFormatter.ofPattern(V2MessageUtil.DATE_FORMAT_DATE_ONLY);
 	
 	@Autowired
@@ -46,7 +47,7 @@ public void testReinstateOverAgeDependent_error_invalidStudentEndDate() throws E
         		.setBody(R43_INVALID_STUDENT_DATE_DATE)
         	    .addHeader(CONTENT_TYPE, MediaType.TEXT_PLAIN.toString()));
         
-        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest(LocalDate.of(2020, 1, 1));
+        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest("9332912486", LocalDate.of(2020, 1, 1));
 		
         ResponseEntity<ReinstateOverAgeDependentResponse> response = maintenanceController.reinstateOverAgeDependent(reinstateRequest, createHttpServletRequest());
 		
@@ -72,7 +73,7 @@ public void testReinstateOverAgeDependent_error_noCoverageFound() throws Excepti
         		.setBody(R43_NO_COVERAGE_FOUND)
         	    .addHeader(CONTENT_TYPE, MediaType.TEXT_PLAIN.toString()));
         
-        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest(null);
+        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest("9332912486", null);
 		
         ResponseEntity<ReinstateOverAgeDependentResponse> response = maintenanceController.reinstateOverAgeDependent(reinstateRequest, createHttpServletRequest());
 		
@@ -98,7 +99,7 @@ public void testReinstateOverAgeDependent_error_notAttendingCanadianSchool() thr
         		.setBody(R43_NOT_ATTENDING_CANADIAN_SCHOOL)
         	    .addHeader(CONTENT_TYPE, MediaType.TEXT_PLAIN.toString()));
         
-        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest(null);
+        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest("9332912486", null);
 		
         ResponseEntity<ReinstateOverAgeDependentResponse> response = maintenanceController.reinstateOverAgeDependent(reinstateRequest, createHttpServletRequest());
 		
@@ -118,6 +119,32 @@ public void testReinstateOverAgeDependent_error_notAttendingCanadianSchool() thr
         assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
+	@Test
+	public void testReinstateOverAgeDependent_error_cannotBeReinstated() throws Exception {
+        mockBackEnd.enqueue(new MockResponse()
+        		.setBody(R43_CANNOT_BE_REINSTANTED)
+        	    .addHeader(CONTENT_TYPE, MediaType.TEXT_PLAIN.toString()));
+        
+        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest("9387807484", null);
+		
+        ResponseEntity<ReinstateOverAgeDependentResponse> response = maintenanceController.reinstateOverAgeDependent(reinstateRequest, createHttpServletRequest());
+		
+        ReinstateOverAgeDependentResponse reinstateResponse = response.getBody();
+		assertEquals(StatusEnum.ERROR, reinstateResponse.getStatus());
+        assertEquals("RPBS1054 DEPENDENT CANNOT BE REINSTATED AS A STUDENT THIS TIME. PLS CONTACT MSP.", reinstateResponse.getMessage());
+
+        assertEquals("9387807484", reinstateResponse.getPhn());
+        
+		// Check the client request is sent as expected
+        RecordedRequest recordedRequest = mockBackEnd.takeRequest();        
+        assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
+        assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
+        
+        assertTransactionCreated(TransactionType.REINSTATE_OVER_AGE_DEPENDENT);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
+	}
+	
     /**
      * The URL property used by the mocked endpoint needs to be set after the MockWebServer starts as the port it uses is 
      * created dynamically on start up to ensure it uses an available port so it is not known before then. 
@@ -128,10 +155,10 @@ static void registerMockUrlProperty(DynamicPropertyRegistry registry) {
         registry.add("rapid.url", () -> String.format("http://localhost:%s", mockBackEnd.getPort()));
     }
 	
-	private ReinstateOverAgeDependentRequest createReinstateOverAgeDependentRequest(LocalDate studentEndDate) {
+	private ReinstateOverAgeDependentRequest createReinstateOverAgeDependentRequest(String phn, LocalDate studentEndDate) {
 		ReinstateOverAgeDependentRequest reinstateRequest = new ReinstateOverAgeDependentRequest();
 		reinstateRequest.setGroupNumber("6337109");
-		reinstateRequest.setPhn("9332912486");
+		reinstateRequest.setPhn(phn);
 		reinstateRequest.setDependentPhn("9329279733");
 		reinstateRequest.setDependentDateOfBirth(LocalDate.of(1970, 1, 1));
 		reinstateRequest.setStudentEndDate(studentEndDate);
diff --git a/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue b/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
index 6b409538..9a9dd618 100644
--- a/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
+++ b/frontend/src/views/coverage/maintenance/ReinstateOverAgeDependent.vue
@@ -49,7 +49,7 @@
   <div id="confirmation" v-if="!inputFormActive">
     <br />
     <p>PHN: {{ result?.phn }}</p>
-    <AppButton @click="resetForm" mode="primary" type="button">Add Another Group Member's Dependent</AppButton>
+    <AppButton @click="resetForm" mode="primary" type="button">Reinstate Another OverAge Dependent</AppButton>
   </div>
 </template>
 

From 280827597e3416c76ca87d72253719d619d864c9 Mon Sep 17 00:00:00 2001
From: weskubo-cgi <wes.kubo@cgi.com>
Date: Fri, 3 Jun 2022 11:48:10 -0700
Subject: [PATCH 6/9] Completed TestCafe tests.

---
 .../ReinstateOverAgeDependentPage.js          |  18 +++
 .../ReinstateOverAgeDependentTest.js          | 147 ++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 frontend/tests/e2e/pages/maintenance/ReinstateOverAgeDependentPage.js
 create mode 100644 frontend/tests/e2e/tests/maintenance/ReinstateOverAgeDependentTest.js

diff --git a/frontend/tests/e2e/pages/maintenance/ReinstateOverAgeDependentPage.js b/frontend/tests/e2e/pages/maintenance/ReinstateOverAgeDependentPage.js
new file mode 100644
index 00000000..149de69f
--- /dev/null
+++ b/frontend/tests/e2e/pages/maintenance/ReinstateOverAgeDependentPage.js
@@ -0,0 +1,18 @@
+import { Selector } from 'testcafe'
+
+class ReinstateOverAgeDependent {
+  constructor() {
+    this.groupNumberInput = Selector('#groupNumber')
+    this.phnInput = Selector('#phn')
+    this.dependentPhnInput = Selector('#dependentPhn')
+    this.dependentDateOfBirthInput = Selector('#dp-input-dependentDateOfBirth')
+    this.isStudentRadioButton = Selector('#isStudent')
+    this.isStudentNoRadioButton = Selector('#N')
+    this.studentEndDateInput = Selector('#studentEndDate')
+    this.submitButton = Selector('button[type="submit"]')
+    this.clearButton = Selector('button[type="button"]')
+    this.errorText = Selector('div').withAttribute('class', 'error-text')
+  }
+}
+
+export default new ReinstateOverAgeDependent()
diff --git a/frontend/tests/e2e/tests/maintenance/ReinstateOverAgeDependentTest.js b/frontend/tests/e2e/tests/maintenance/ReinstateOverAgeDependentTest.js
new file mode 100644
index 00000000..18736300
--- /dev/null
+++ b/frontend/tests/e2e/tests/maintenance/ReinstateOverAgeDependentTest.js
@@ -0,0 +1,147 @@
+import { SITE_UNDER_TEST } from '../../configuration'
+import AlertPage from '../../pages/AlertPage'
+import ReinstateOverAgeDependentPage from '../../pages/maintenance/ReinstateOverAgeDependentPage'
+import { regularAccUser } from '../../roles/roles'
+
+const ERROR_MESSAGE = 'Please correct errors before submitting'
+const GROUP_NUMBER_REQUIRED_MESSAGE = 'Group Number is required'
+const INVALID_GROUP_NUMBER_ERROR_MESSAGE = 'Group Number is invalid'
+const PHN_REQUIRED_MESSAGE = 'PHN is required'
+const INVALID_PHN_ERROR_MESSAGE = 'PHN format is invalid'
+const DEPENDENT_PHN_REQUIRED_MESSAGE = "Dependent's PHN is required"
+const INVALID_DEPENDENT_PHN_ERROR_MESSAGE = 'PHN format is invalid'
+const DEPENDENT_BIRTH_DATE_REQUIRED_MESSAGE = "Dependent's Birth Date is required"
+const IS_STUDENT_REQUIRED_MESSAGE = 'Is this Dependent attending a Canadian Educational Institution? is required'
+const STUDENT_END_DATE_REQUIRED_MESSAGE = 'The value is required'
+
+const RAPID_ERROR_CANNOT_BE_REINSTATED = 'RPBS1054 DEPENDENT CANNOT BE REINSTATED AS A STUDENT THIS TIME. PLS CONTACT MSP.'
+const RAPID_ERROR_NOT_ATTENDING_SCHOOL = 'RPBS0108 STUDENT NOT ATTENDING SCHOOL IN CANADA, MUST FORWARD DOCUMENTS TO MSP.'
+
+const PAGE_TO_TEST = SITE_UNDER_TEST + '/coverage/maintenance/ReinstateOverAgeDependent'
+
+fixture(`ReinstateOverAgeDependent Page`).disablePageCaching`Test ReinstateOverAgeDependent`
+  .beforeEach(async (t) => {
+    await t.useRole(regularAccUser).navigateTo(PAGE_TO_TEST)
+  })
+  .page(SITE_UNDER_TEST)
+
+test('Check required fields validation', async (t) => {
+  await t
+    // Given required fields aren't filled out (Group Number, PHN, Dependent's PHN, Dependent's Birth Date, Is Student)
+    // When I click the submit button
+    .click(ReinstateOverAgeDependentPage.submitButton)
+    // I expect an error message stating the page had errors and individual error messages for each required field
+    .expect(AlertPage.alertBannerText.textContent)
+    .contains(ERROR_MESSAGE)
+    .expect(ReinstateOverAgeDependentPage.errorText.nth(0).textContent)
+    .contains(GROUP_NUMBER_REQUIRED_MESSAGE)
+    .expect(ReinstateOverAgeDependentPage.errorText.nth(1).textContent)
+    .contains(PHN_REQUIRED_MESSAGE)
+    .expect(ReinstateOverAgeDependentPage.errorText.nth(2).textContent)
+    .contains(DEPENDENT_PHN_REQUIRED_MESSAGE)
+    .expect(ReinstateOverAgeDependentPage.errorText.nth(3).textContent)
+    .contains(DEPENDENT_BIRTH_DATE_REQUIRED_MESSAGE)
+    .expect(ReinstateOverAgeDependentPage.errorText.nth(4).textContent)
+    .contains(IS_STUDENT_REQUIRED_MESSAGE)
+})
+
+test('Check student end date required validation', async (t) => {
+  await t
+    // Given other form fields filled out and Is Student is Yes but Student End Date is not filled in then
+    .typeText(ReinstateOverAgeDependentPage.groupNumberInput, '6243109')
+    .typeText(ReinstateOverAgeDependentPage.phnInput, '9397105575')
+    .typeText(ReinstateOverAgeDependentPage.dependentPhnInput, '9329090895')
+    .typeText(ReinstateOverAgeDependentPage.dependentDateOfBirthInput, '19700101')
+    .pressKey('tab')
+    .click(ReinstateOverAgeDependentPage.isStudentRadioButton)
+    .wait(1000)
+    // When I click the submit button
+    .click(ReinstateOverAgeDependentPage.submitButton)
+    // I expect an error message stating the page had errors and error message for student end date required
+    .expect(AlertPage.alertBannerText.textContent)
+    .contains(ERROR_MESSAGE)
+    .expect(ReinstateOverAgeDependentPage.errorText.nth(0).textContent)
+    .contains(STUDENT_END_DATE_REQUIRED_MESSAGE)
+})
+
+test('Check invalid formats validation', async (t) => {
+  await t
+    // Given I enter Group Number,  PHN, Dependent's PHN with invalid formats
+    .typeText(ReinstateOverAgeDependentPage.groupNumberInput, '1234')
+    .typeText(ReinstateOverAgeDependentPage.phnInput, '9000448000')
+    .typeText(ReinstateOverAgeDependentPage.dependentPhnInput, '9000559000')
+    // When I click the submit button
+    .click(ReinstateOverAgeDependentPage.submitButton)
+    // I expect an error message stating the page had errors and an individual error message for the Group Number, PHN, Dependent's PHN
+    .expect(ReinstateOverAgeDependentPage.errorText.nth(0).textContent)
+    .contains(INVALID_GROUP_NUMBER_ERROR_MESSAGE)
+    .expect(ReinstateOverAgeDependentPage.errorText.nth(1).textContent)
+    .contains(INVALID_PHN_ERROR_MESSAGE)
+    .expect(ReinstateOverAgeDependentPage.errorText.nth(2).textContent)
+    .contains(INVALID_DEPENDENT_PHN_ERROR_MESSAGE)
+    .expect(AlertPage.alertBannerText.textContent)
+    .contains(ERROR_MESSAGE)
+})
+
+test('Check properly filled form passes validation', async (t) => {
+  await t
+    // Given I have a form filled out with data
+    .typeText(ReinstateOverAgeDependentPage.groupNumberInput, '5028022')
+    .typeText(ReinstateOverAgeDependentPage.phnInput, '9387807484')
+    .typeText(ReinstateOverAgeDependentPage.dependentPhnInput, '9319079926')
+    .typeText(ReinstateOverAgeDependentPage.dependentDateOfBirthInput, '20130329')
+    .pressKey('tab')
+    .click(ReinstateOverAgeDependentPage.isStudentRadioButton)
+    .wait(1000)
+    .typeText(ReinstateOverAgeDependentPage.studentEndDateInput, '202212')
+    .pressKey('tab')
+    // When I click the submit button
+    .click(ReinstateOverAgeDependentPage.submitButton)
+    // I expect a response from RAPID
+    .expect(AlertPage.alertBannerText.textContent)
+    .contains(RAPID_ERROR_CANNOT_BE_REINSTATED)
+})
+
+test('Check properly filled form passes validation, non-student', async (t) => {
+  await t
+    // Given I have a form filled out with data
+    .typeText(ReinstateOverAgeDependentPage.groupNumberInput, '6243109')
+    .typeText(ReinstateOverAgeDependentPage.phnInput, '9020198746')
+    .typeText(ReinstateOverAgeDependentPage.dependentPhnInput, '9329090895')
+    .typeText(ReinstateOverAgeDependentPage.dependentDateOfBirthInput, '19700101')
+    .pressKey('tab')
+    .click(ReinstateOverAgeDependentPage.isStudentNoRadioButton)
+    .wait(1000)
+    // When I click the submit button
+    .click(ReinstateOverAgeDependentPage.submitButton)
+    // I expect a response from RAPID
+    .expect(AlertPage.alertBannerText.textContent)
+    .contains(RAPID_ERROR_NOT_ATTENDING_SCHOOL)
+})
+
+test('Check clear button clears the form', async (t) => {
+  await t
+    // Given I have a form filled out with data
+    .typeText(ReinstateOverAgeDependentPage.groupNumberInput, '6243109')
+    .typeText(ReinstateOverAgeDependentPage.phnInput, '9020198746')
+    .typeText(ReinstateOverAgeDependentPage.dependentPhnInput, '9329090895')
+    .typeText(ReinstateOverAgeDependentPage.dependentDateOfBirthInput, '19700101')
+    .pressKey('tab')
+    .click(ReinstateOverAgeDependentPage.isStudentRadioButton)
+    .wait(1000)
+    .typeText(ReinstateOverAgeDependentPage.studentEndDateInput, '202201')
+    .pressKey('tab')
+    // When I click the Clear button
+    .click(ReinstateOverAgeDependentPage.clearButton)
+    // I expect the form to be cleared
+    .expect(ReinstateOverAgeDependentPage.groupNumberInput.value)
+    .eql('')
+    .expect(ReinstateOverAgeDependentPage.phnInput.value)
+    .eql('')
+    .expect(ReinstateOverAgeDependentPage.dependentPhnInput.value)
+    .eql('')
+    .expect(ReinstateOverAgeDependentPage.isStudentRadioButton.value)
+    .eql(undefined)
+    .expect(ReinstateOverAgeDependentPage.studentEndDateInput.value)
+    .eql(undefined)
+})

From 5295ed6863a75fd36cdf8f8b2c40daa44c69b830 Mon Sep 17 00:00:00 2001
From: weskubo-cgi <wes.kubo@cgi.com>
Date: Tue, 2 Aug 2022 15:40:33 -0700
Subject: [PATCH 7/9] Fixed bug in default date generation. Updated unit test.

---
 .../converter/rapid/RPBSPRE0Converter.java    |  2 +-
 .../controller/MaintenanceControllerTest.java | 28 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
index 22060b1d..b98a66cb 100644
--- a/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
@@ -56,7 +56,7 @@ public String getTranCode() {
 	private LocalDate calculateStudentEndDate(LocalDate birthDate) {
 		// The end date is to be stripped of the dd portion. If the end date is empty then a new end date
 		// is to be made up from the dependents birth date and the current year plus one
-		return LocalDate.of(LocalDate.now().getYear(), birthDate.getMonth(), birthDate.getDayOfYear()).plusYears(1);
+		return LocalDate.of(LocalDate.now().getYear(), birthDate.getMonth(), birthDate.getDayOfMonth()).plusYears(1);
 	}
 
 }
\ No newline at end of file
diff --git a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
index de42c7ae..1999964e 100644
--- a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
+++ b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
@@ -26,7 +26,7 @@
 
 public class MaintenanceControllerTest extends BaseControllerTest {
 	
-	private static final String R43_SUCCESS = "";
+	private static final String R43_SUCCESS = "        RPBSPRE000000010                                RESPONSERPBS9014TRANSACTION SUCCESSFUL                                                  9873252394484190498732523872000-05-10Y2022-12";
 	
 	private static final String R43_INVALID_STUDENT_DATE_DATE = "        RPBSPRE000000010                                ERRORMSGRPBS0111STUDENT END DATE YEAR MUST BE GREATER THAN OR EQUAL TO CURRENT YEAR.    9332912486633710993292797331970-01-01Y2020-01";
 
@@ -145,6 +145,32 @@ public void testReinstateOverAgeDependent_error_cannotBeReinstated() throws Exce
         assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
 	}
 	
+	@Test
+	public void testReinstateOverAgeDependent_success() throws Exception {
+        mockBackEnd.enqueue(new MockResponse()
+        		.setBody(R43_SUCCESS)
+        	    .addHeader(CONTENT_TYPE, MediaType.TEXT_PLAIN.toString()));
+        
+        ReinstateOverAgeDependentRequest reinstateRequest = createReinstateOverAgeDependentRequest("9873252394", null);
+		
+        ResponseEntity<ReinstateOverAgeDependentResponse> response = maintenanceController.reinstateOverAgeDependent(reinstateRequest, createHttpServletRequest());
+		
+        ReinstateOverAgeDependentResponse reinstateResponse = response.getBody();
+		assertEquals(StatusEnum.SUCCESS, reinstateResponse.getStatus());
+        assertEquals("RPBS9014 TRANSACTION COMPLETED", reinstateResponse.getMessage());
+
+        assertEquals("9873252394", reinstateResponse.getPhn());
+        
+		// Check the client request is sent as expected
+        RecordedRequest recordedRequest = mockBackEnd.takeRequest();        
+        assertEquals(HttpMethod.POST.name(), recordedRequest.getMethod());
+        assertEquals(MediaType.TEXT_PLAIN.toString(), recordedRequest.getHeader(CONTENT_TYPE));
+        
+        assertTransactionCreated(TransactionType.REINSTATE_OVER_AGE_DEPENDENT);
+        assertAffectedPartyCount(AffectedPartyDirection.INBOUND, 3);
+        assertAffectedPartyCount(AffectedPartyDirection.OUTBOUND, 1);
+	}
+	
     /**
      * The URL property used by the mocked endpoint needs to be set after the MockWebServer starts as the port it uses is 
      * created dynamically on start up to ensure it uses an available port so it is not known before then. 

From 9e0582eb3c399d10737bc676d558c2733ab9a8ae Mon Sep 17 00:00:00 2001
From: weskubo-cgi <wes.kubo@cgi.com>
Date: Thu, 4 Aug 2022 11:19:03 -0700
Subject: [PATCH 8/9] Updated sucess message to use Dependent PHN. Updated unit
 tests. Fixed menu text.

---
 .../hlth/hnweb/converter/rapid/RPBSPRE0Converter.java  |  2 +-
 .../hnweb/controller/MaintenanceControllerTest.java    | 10 +++++-----
 frontend/src/components/template/TheNavBar.vue         |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java b/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
index b98a66cb..c9fb5ba0 100644
--- a/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
+++ b/backend/src/main/java/ca/bc/gov/hlth/hnweb/converter/rapid/RPBSPRE0Converter.java
@@ -43,7 +43,7 @@ public ReinstateOverAgeDependentResponse convertResponse(RPBSPRE0 rpbspre0) {
 		
 		handleStatus(header, response);
 		
-		response.setPhn(rpbspre0.getRe0().getSubscriberPHN());
+		response.setPhn(rpbspre0.getRe0().getDependentPHN());
 		
 		return response;
 	}
diff --git a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
index 1999964e..7fe655db 100644
--- a/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
+++ b/backend/src/test/java/ca/bc/gov/hlth/hnweb/controller/MaintenanceControllerTest.java
@@ -55,7 +55,7 @@ public void testReinstateOverAgeDependent_error_invalidStudentEndDate() throws E
 		assertEquals(StatusEnum.ERROR, reinstateResponse.getStatus());
         assertEquals("RPBS0111 STUDENT END DATE YEAR MUST BE GREATER THAN OR EQUAL TO CURRENT YEAR.", reinstateResponse.getMessage());
 
-        assertEquals("9332912486", reinstateResponse.getPhn());
+        assertEquals("9329279733", reinstateResponse.getPhn());
         
 		// Check the client request is sent as expected
         RecordedRequest recordedRequest = mockBackEnd.takeRequest();        
@@ -81,7 +81,7 @@ public void testReinstateOverAgeDependent_error_noCoverageFound() throws Excepti
 		assertEquals(StatusEnum.ERROR, reinstateResponse.getStatus());
         assertEquals("RPBS0067 NO COVERAGE FOUND FOR THE PHN ENTERED. PLEASE CONTACT MSP", reinstateResponse.getMessage());
 
-        assertEquals("9332912486", reinstateResponse.getPhn());
+        assertEquals("9329279733", reinstateResponse.getPhn());
         
 		// Check the client request is sent as expected
         RecordedRequest recordedRequest = mockBackEnd.takeRequest();        
@@ -107,7 +107,7 @@ public void testReinstateOverAgeDependent_error_notAttendingCanadianSchool() thr
 		assertEquals(StatusEnum.ERROR, reinstateResponse.getStatus());
         assertEquals("RPBS0108 STUDENT NOT ATTENDING SCHOOL IN CANADA, MUST FORWARD DOCUMENTS TO MSP.", reinstateResponse.getMessage());
 
-        assertEquals("9332912486", reinstateResponse.getPhn());
+        assertEquals("9329279733", reinstateResponse.getPhn());
         
 		// Check the client request is sent as expected
         RecordedRequest recordedRequest = mockBackEnd.takeRequest();        
@@ -133,7 +133,7 @@ public void testReinstateOverAgeDependent_error_cannotBeReinstated() throws Exce
 		assertEquals(StatusEnum.ERROR, reinstateResponse.getStatus());
         assertEquals("RPBS1054 DEPENDENT CANNOT BE REINSTATED AS A STUDENT THIS TIME. PLS CONTACT MSP.", reinstateResponse.getMessage());
 
-        assertEquals("9387807484", reinstateResponse.getPhn());
+        assertEquals("9319079926", reinstateResponse.getPhn());
         
 		// Check the client request is sent as expected
         RecordedRequest recordedRequest = mockBackEnd.takeRequest();        
@@ -159,7 +159,7 @@ public void testReinstateOverAgeDependent_success() throws Exception {
 		assertEquals(StatusEnum.SUCCESS, reinstateResponse.getStatus());
         assertEquals("RPBS9014 TRANSACTION COMPLETED", reinstateResponse.getMessage());
 
-        assertEquals("9873252394", reinstateResponse.getPhn());
+        assertEquals("9873252387", reinstateResponse.getPhn());
         
 		// Check the client request is sent as expected
         RecordedRequest recordedRequest = mockBackEnd.takeRequest();        
diff --git a/frontend/src/components/template/TheNavBar.vue b/frontend/src/components/template/TheNavBar.vue
index e2413791..20157def 100644
--- a/frontend/src/components/template/TheNavBar.vue
+++ b/frontend/src/components/template/TheNavBar.vue
@@ -31,7 +31,7 @@
           <div class="dropdown">
             <span>Coverage Maintenance</span>
             <div class="dropdown-content">
-              <router-link @click="resetAlert" :class="menuClass($route, 'ReinstateOverAgeDependent')" :to="{ name: 'ReinstateOverAgeDependent' }" v-if="hasPermission('ReinstateOverAgeDependent')">Reinstate Over Age Dependent</router-link>
+              <router-link @click="resetAlert" :class="menuClass($route, 'ReinstateOverAgeDependent')" :to="{ name: 'ReinstateOverAgeDependent' }" v-if="hasPermission('ReinstateOverAgeDependent')">Reinstate OverAge Dependent</router-link>
             </div>
           </div>
         </li>

From de17df6de8bc0071a14db834831acc4750caab11 Mon Sep 17 00:00:00 2001
From: weskubo-cgi <wes.kubo@cgi.com>
Date: Thu, 4 Aug 2022 15:13:41 -0700
Subject: [PATCH 9/9] Removed erroneous function.

---
 frontend/src/services/GroupMemberService.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/services/GroupMemberService.js b/frontend/src/services/GroupMemberService.js
index b9a8e493..a269c07f 100644
--- a/frontend/src/services/GroupMemberService.js
+++ b/frontend/src/services/GroupMemberService.js
@@ -16,7 +16,4 @@ export default {
   cancelDependent(request) {
     return apiRequest().then((axiosInstance) => axiosInstance.post(resources.groupMember.cancelDependent, request))
   },
-  reinstateOverAgeDependent(request) {
-    return apiRequest().then((axiosInstance) => axiosInstance.post(resources.groupMember.cancelDependent, request))
-  },
 }