diff --git a/app/sidekiq/education_form/forms/va_1995.rb b/app/sidekiq/education_form/forms/va_1995.rb index 4ac1c6b2267..ad95181efb0 100644 --- a/app/sidekiq/education_form/forms/va_1995.rb +++ b/app/sidekiq/education_form/forms/va_1995.rb @@ -8,6 +8,7 @@ class VA1995 < Base chapter33: 'CH33', chapter33Post911: 'CH33', chapter33FryScholarship: 'CH33', + chapter35: 'CH35', chapter1606: 'CH1606', chapter1607: 'CH1607', transferOfEntitlement: 'TransferOfEntitlement' @@ -17,6 +18,12 @@ def school @applicant.newSchool end + def header_abbreviated_form_type(header_form_type) + return 'CH33' if header_form_type.eql?('transferOfEntitlement') + + FORM_TYPES[header_form_type&.to_sym] + end + def form_type FORM_TYPES[@applicant.benefit&.to_sym] end diff --git a/app/sidekiq/education_form/templates/1995.erb b/app/sidekiq/education_form/templates/1995.erb index 98b3b80e739..64b4613ae4f 100644 --- a/app/sidekiq/education_form/templates/1995.erb +++ b/app/sidekiq/education_form/templates/1995.erb @@ -1,8 +1,8 @@ <%= parse_with_template_path('header_1995') %> <% if @applicant.benefitAppliedFor -%> -<%= @applicant.benefitAppliedFor&.titleize %> +<%= header_abbreviated_form_type(@applicant.benefitAppliedFor)%> <% else -%> -<%= form_benefit %> +<%= header_abbreviated_form_type(@applicant.benefitUpdate)%> <% end -%> *START* VA Form 22-1995 diff --git a/spec/fixtures/education_benefits_claims/1995/ch1606.spl b/spec/fixtures/education_benefits_claims/1995/ch1606.spl index 7c98dfb4bd7..db5421c5406 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch1606.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch1606.spl @@ -7,7 +7,7 @@ TESTER2 1995R -Chapter30 +CH30 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/ch1606_baf.json b/spec/fixtures/education_benefits_claims/1995/ch1606_baf.json new file mode 100644 index 00000000000..e0d0de3076e --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/ch1606_baf.json @@ -0,0 +1,39 @@ +{ + "veteranFullName": { + "first": "Joe", + "last": "Tester2" + }, + "veteranSocialSecurityNumber": "223334444", + "veteranAddress": { + "city": "Austin", + "country": "USA", + "postalCode": "73301", + "state": "TX", + "street": "1234 Test St" + }, + "sponsorSocialSecurityNumber": "444433322", + "applicantGender": "F", + "dateOfBirth": "1970-01-01", + "email": "test@test.com", + "benefit": "chapter1606", + "benefitUpdate": "chapter1606", + "rudisillReview": "Yes", + "remarks": "remarks", + "programName": "program name", + "privacyAgreementAccepted": true, + "isActiveDuty": true, + "applicantServed": "Yes", + "toursOfDuty": [{ + "dateRange": { + "from": "2010-06-26", + "to": "2011-04-10" + }, + "serviceBranch": "Army Reserve" + }, { + "dateRange": { + "from": "2010-04-22", + "to": "2011-06-14" + }, + "serviceBranch": "navy" + }] +} diff --git a/spec/fixtures/education_benefits_claims/1995/ch1606_baf.spl b/spec/fixtures/education_benefits_claims/1995/ch1606_baf.spl new file mode 100644 index 00000000000..0e146597cb9 --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/ch1606_baf.spl @@ -0,0 +1,81 @@ +*INIT* +JOE + +TESTER2 +223334444 +223334444 +1995R + + +CH1606 +*START* +VA Form 22-1995 +OMB Control #: 2900-0074 + + + REQUEST FOR CHANGE OF BENEFIT, PROGRAM OR PLACE OF TRAINING +FOR VETERANS, SERVICEPERSONS, DEPENDENTS & MEMBERS OF THE SELECTED RESERVE + ------------------------------------- + + APPLICANT INFORMATION + --------------------- + +SSN: 223334444 VA File Number: N/A + +Sex: F Date of Birth: 1970-01-01 + +Name: Joe Tester2 + +Address: +1234 TEST ST +AUSTIN, TX, 73301 +USA + +Telephone Numbers: Mobile: + Home: + +Email Address: test@test.com +Preferred Method of Contact: + +Direct Deposit: Type of Account: +Routing/Transit #: Account #: + + TYPE AND PROGRAM OF EDUCATION OR TRAINING + ----------------------------------------- + +Benefit Most Recently Received: Chapter1606 + +Do you wish to request a 'Rudisill' review?: Yes + +Select Another Benefit: + +Benefit Being Applied For: + +Type of Education or Training: +Education or Career Goal: + +New School or Training Establishment: + + + APPLICANT ACTIVE DUTY SERVICE INFORMATION + ----------------------------------------- + +Served in the armed forces?: Yes + +Are You Now On Active Duty?: YES + +Do you have any new periods of service to record since you last applied for +education benefits? YES + +Date Entered Date Separated Service Component +2010-06-26 2011-04-10 Army Reserve +2010-04-22 2011-06-14 navy + + +As an active-duty service member, you have consulted with an Education Service +Officer (ESO) regarding your education program. + +Electronically Received by VA: 2017-01-17 +Confirmation #: V-EBC-1 + +*END* diff --git a/spec/fixtures/education_benefits_claims/1995/ch30.spl b/spec/fixtures/education_benefits_claims/1995/ch30.spl index e1366adecd3..6ef49378a75 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch30.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch30.spl @@ -7,7 +7,7 @@ TESTER 1995R -Chapter1606 +CH1606 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.spl b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.spl index 1154b9df15c..1931049d262 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.spl @@ -7,7 +7,7 @@ TESTER 1995R -Chapter1606 +CH1606 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.spl b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.spl index 38df887751f..374ae98b761 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.spl @@ -7,7 +7,7 @@ TESTER 1995R -Chapter35 +CH35 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_not_graduated.spl b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_not_graduated.spl index 684b6642667..70c0bf65133 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_not_graduated.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_not_graduated.spl @@ -7,7 +7,7 @@ TESTER 1995R -Chapter30 +CH30 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/ch30_mgi_bill.json b/spec/fixtures/education_benefits_claims/1995/ch30_mgi_bill.json new file mode 100644 index 00000000000..769a0cc4a6d --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/ch30_mgi_bill.json @@ -0,0 +1,27 @@ +{ + "veteranFullName": { + "first": "Joe", + "last": "Tester" + }, + "veteranSocialSecurityNumber": "223334444", + "veteranAddress": { + "city": "Austin", + "country": "USA", + "postalCode": "73301", + "state": "TX", + "street": "123 Test St" + }, + "applicantServed": "No", + "sponsorSocialSecurityNumber": "444433322", + "applicantGender": "F", + "dateOfBirth": "1970-01-01", + "email": "test@test.com", + "benefit": "chapter33Post911", + "benefitUpdate": "chapter33Post911", + "rudisillReview": "Yes", + "changeAnotherBenefit": "Yes", + "benefitAppliedFor": "chapter30", + "remarks": "remarks", + "programName": "program name", + "privacyAgreementAccepted": true +} diff --git a/spec/fixtures/education_benefits_claims/1995/ch30_mgi_bill.spl b/spec/fixtures/education_benefits_claims/1995/ch30_mgi_bill.spl new file mode 100644 index 00000000000..944b2faee95 --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/ch30_mgi_bill.spl @@ -0,0 +1,79 @@ +*INIT* +JOE + +TESTER +223334444 +223334444 +1995R + + +CH30 +*START* +VA Form 22-1995 +OMB Control #: 2900-0074 + + + REQUEST FOR CHANGE OF BENEFIT, PROGRAM OR PLACE OF TRAINING +FOR VETERANS, SERVICEPERSONS, DEPENDENTS & MEMBERS OF THE SELECTED RESERVE + ------------------------------------- + + APPLICANT INFORMATION + --------------------- + +SSN: 223334444 VA File Number: N/A + +Sex: F Date of Birth: 1970-01-01 + +Name: Joe Tester + +Address: +123 TEST ST +AUSTIN, TX, 73301 +USA + +Telephone Numbers: Mobile: + Home: + +Email Address: test@test.com +Preferred Method of Contact: + +Direct Deposit: Type of Account: +Routing/Transit #: Account #: + + TYPE AND PROGRAM OF EDUCATION OR TRAINING + ----------------------------------------- + +Benefit Most Recently Received: Chapter33 Post911 + +Do you wish to request a 'Rudisill' review?: Yes + +Select Another Benefit: Yes + +Benefit Being Applied For: Chapter30 + +Type of Education or Training: +Education or Career Goal: + +New School or Training Establishment: + + + APPLICANT ACTIVE DUTY SERVICE INFORMATION + ----------------------------------------- + +Served in the armed forces?: No + +Are You Now On Active Duty?: N/A + +Do you have any new periods of service to record since you last applied for +education benefits? NO + +Date Entered Date Separated Service Component + + + Certification and Signature of Applicant +Signature of Applicant Date + +Electronically Received by VA: 2017-01-17 +Confirmation #: V-EBC-1 + +*END* diff --git a/spec/fixtures/education_benefits_claims/1995/ch33_fry.spl b/spec/fixtures/education_benefits_claims/1995/ch33_fry.spl index 19f7f1271e8..a1b9d16ba28 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch33_fry.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch33_fry.spl @@ -7,7 +7,7 @@ LAST 1995R SCHOOL NAME -Chapter1606 +CH1606 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/ch33_fry_baf.json b/spec/fixtures/education_benefits_claims/1995/ch33_fry_baf.json new file mode 100644 index 00000000000..abbcb8d0a65 --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/ch33_fry_baf.json @@ -0,0 +1,84 @@ +{ + "veteranFullName": { + "first": "first", + "middle": "middle", + "last": "last" + }, + "veteranSocialSecurityNumber": "223334444", + "newSchool": { + "name": "school name", + "address": { + "city": "Milwaukee", + "country": "USA", + "postalCode": "53135", + "state": "WI", + "street": "111 Uni Drive" + } + }, + "oldSchool": { + "name": "old school name", + "address": { + "city": "Anytown", + "country": "USA", + "postalCode": "41414", + "state": "MA", + "street": "2222 Uni Drive" + } + }, + "preferredContactMethod": "email", + "trainingEndDate": "2007-06-XX", + "reasonForChange": "reason for change", + "vaFileNumber": "c12345678", + "homePhone": "5551110000", + "mobilePhone": "5551110001", + "veteranAddress": { + "city": "Milwaukee", + "country": "USA", + "postalCode": "53130", + "state": "WI", + "street": "123 Main St" + }, + "sponsorSocialSecurityNumber": "444433322", + "applicantGender": "F", + "dateOfBirth": "1970-01-01", + "civilianBenefitsAssistance": true, + "email": "test@sample.com", + "benefit": "chapter33FryScholarship", + "benefitUpdate": "chapter33FryScholarship", + "rudisillReview": "Yes", + "educationType": "tuitionTopUp", + "educationTypeUpdate": "prepCourseForLoC", + "educationObjective": "bachelor's degree", + "bankAccountChange": "startUpdate", + "bankAccountChangeUpdate": "startUpdate", + "bankAccount": { + "accountNumber": "88888888888", + "accountType": "checking", + "bankName": "First Bank of JSON", + "routingNumber": "123456789" + }, + "serviceBefore1977": { + "haveDependents": true, + "married": true, + "parentDependent": false + }, + "isActiveDuty": true, + "applicantServed": "Yes", + "toursOfDuty": [{ + "dateRange": { + "from": "2012-06-26", + "to": "2013-04-10" + }, + "serviceBranch": "Army Reserve" + }, { + "dateRange": { + "from": "2013-04-22", + "to": "2013-06-14" + }, + "serviceBranch": "navy" + }], + "nonVaAssistance": true, + "remarks": "remarks", + "programName": "program name", + "privacyAgreementAccepted": true +} diff --git a/spec/fixtures/education_benefits_claims/1995/ch33_fry_baf.spl b/spec/fixtures/education_benefits_claims/1995/ch33_fry_baf.spl new file mode 100644 index 00000000000..d021f33f451 --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/ch33_fry_baf.spl @@ -0,0 +1,85 @@ +*INIT* +FIRST +MIDDLE +LAST +223334444 +223334444 +1995R + +SCHOOL NAME +CH33 +*START* +VA Form 22-1995 +OMB Control #: 2900-0074 + + + REQUEST FOR CHANGE OF BENEFIT, PROGRAM OR PLACE OF TRAINING +FOR VETERANS, SERVICEPERSONS, DEPENDENTS & MEMBERS OF THE SELECTED RESERVE + ------------------------------------- + + APPLICANT INFORMATION + --------------------- + +SSN: 223334444 VA File Number: c12345678 + +Sex: F Date of Birth: 1970-01-01 + +Name: first middle last + +Address: +123 MAIN ST +MILWAUKEE, WI, 53130 +USA + +Telephone Numbers: Mobile: 5551110001 + Home: 5551110000 + +Email Address: test@sample.com +Preferred Method of Contact: email + +Direct Deposit: Start or Update EFT +Type of Account: checking +Routing/Transit #: 123456789 Account #: 88888888888 + + TYPE AND PROGRAM OF EDUCATION OR TRAINING + ----------------------------------------- + +Benefit Most Recently Received: Chapter33 Fry Scholarship + +Do you wish to request a 'Rudisill' review?: Yes + +Select Another Benefit: + +Benefit Being Applied For: + +Type of Education or Training: Prep Course For Lo C +Education or Career Goal: bachelor's degree + +New School or Training Establishment: +school name +111 UNI DRIVE +MILWAUKEE, WI, 53135 +USA + + APPLICANT ACTIVE DUTY SERVICE INFORMATION + ----------------------------------------- + +Served in the armed forces?: Yes + +Are You Now On Active Duty?: YES + +Do you have any new periods of service to record since you last applied for +education benefits? YES + +Date Entered Date Separated Service Component +2012-06-26 2013-04-10 Army Reserve +2013-04-22 2013-06-14 navy + + +As an active-duty service member, you have consulted with an Education Service +Officer (ESO) regarding your education program. + +Electronically Received by VA: 2017-01-17 +Confirmation #: V-EBC-1 + +*END* diff --git a/spec/fixtures/education_benefits_claims/1995/ch33_fry_noncollege.spl b/spec/fixtures/education_benefits_claims/1995/ch33_fry_noncollege.spl index c8125c5d785..731ed94695f 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch33_fry_noncollege.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch33_fry_noncollege.spl @@ -7,7 +7,7 @@ LAST 1995R SCHOOL NAME -Chapter1606 +CH1606 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/ch33_p911_to_fry.json b/spec/fixtures/education_benefits_claims/1995/ch33_p911_to_fry.json new file mode 100644 index 00000000000..141547e1cd5 --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/ch33_p911_to_fry.json @@ -0,0 +1,86 @@ +{ + "veteranFullName": { + "first": "first", + "middle": "middle", + "last": "last" + }, + "veteranSocialSecurityNumber": "223334444", + "newSchool": { + "name": "school name", + "address": { + "city": "Milwaukee", + "country": "USA", + "postalCode": "53135", + "state": "WI", + "street": "111 Uni Drive" + } + }, + "oldSchool": { + "name": "old school name", + "address": { + "city": "Anytown", + "country": "USA", + "postalCode": "41414", + "state": "MA", + "street": "2222 Uni Drive" + } + }, + "preferredContactMethod": "email", + "trainingEndDate": "2007-06-XX", + "reasonForChange": "reason for change", + "vaFileNumber": "c12345678", + "homePhone": "5551110000", + "mobilePhone": "5551110001", + "veteranAddress": { + "city": "Milwaukee", + "country": "USA", + "postalCode": "53130", + "state": "WI", + "street": "123 Main St" + }, + "sponsorSocialSecurityNumber": "444433322", + "applicantGender": "F", + "dateOfBirth": "1970-01-01", + "civilianBenefitsAssistance": true, + "email": "test@sample.com", + "benefit": "chapter33Post911", + "benefitUpdate": "chapter33Post911", + "rudisillReview": "Yes", + "changeAnotherBenefit": "Yes", + "benefitAppliedFor": "chapter33FryScholarship", + "educationType": "tuitionTopUp", + "educationTypeUpdate": "prepCourseForLoC", + "educationObjective": "bachelor's degree", + "bankAccountChange": "startUpdate", + "bankAccountChangeUpdate": "startUpdate", + "bankAccount": { + "accountNumber": "88888888888", + "accountType": "checking", + "bankName": "First Bank of JSON", + "routingNumber": "123456789" + }, + "serviceBefore1977": { + "haveDependents": true, + "married": true, + "parentDependent": false + }, + "isActiveDuty": true, + "applicantServed": "Yes", + "toursOfDuty": [{ + "dateRange": { + "from": "2012-06-26", + "to": "2013-04-10" + }, + "serviceBranch": "Army Reserve" + }, { + "dateRange": { + "from": "2013-04-22", + "to": "2013-06-14" + }, + "serviceBranch": "navy" + }], + "nonVaAssistance": true, + "remarks": "remarks", + "programName": "program name", + "privacyAgreementAccepted": true +} diff --git a/spec/fixtures/education_benefits_claims/1995/ch33_p911_to_fry.spl b/spec/fixtures/education_benefits_claims/1995/ch33_p911_to_fry.spl new file mode 100644 index 00000000000..359872ded2a --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/ch33_p911_to_fry.spl @@ -0,0 +1,85 @@ +*INIT* +FIRST +MIDDLE +LAST +223334444 +223334444 +1995R + +SCHOOL NAME +CH33 +*START* +VA Form 22-1995 +OMB Control #: 2900-0074 + + + REQUEST FOR CHANGE OF BENEFIT, PROGRAM OR PLACE OF TRAINING +FOR VETERANS, SERVICEPERSONS, DEPENDENTS & MEMBERS OF THE SELECTED RESERVE + ------------------------------------- + + APPLICANT INFORMATION + --------------------- + +SSN: 223334444 VA File Number: c12345678 + +Sex: F Date of Birth: 1970-01-01 + +Name: first middle last + +Address: +123 MAIN ST +MILWAUKEE, WI, 53130 +USA + +Telephone Numbers: Mobile: 5551110001 + Home: 5551110000 + +Email Address: test@sample.com +Preferred Method of Contact: email + +Direct Deposit: Start or Update EFT +Type of Account: checking +Routing/Transit #: 123456789 Account #: 88888888888 + + TYPE AND PROGRAM OF EDUCATION OR TRAINING + ----------------------------------------- + +Benefit Most Recently Received: Chapter33 Post911 + +Do you wish to request a 'Rudisill' review?: Yes + +Select Another Benefit: Yes + +Benefit Being Applied For: Chapter33 Fry Scholarship + +Type of Education or Training: Prep Course For Lo C +Education or Career Goal: bachelor's degree + +New School or Training Establishment: +school name +111 UNI DRIVE +MILWAUKEE, WI, 53135 +USA + + APPLICANT ACTIVE DUTY SERVICE INFORMATION + ----------------------------------------- + +Served in the armed forces?: Yes + +Are You Now On Active Duty?: YES + +Do you have any new periods of service to record since you last applied for +education benefits? YES + +Date Entered Date Separated Service Component +2012-06-26 2013-04-10 Army Reserve +2013-04-22 2013-06-14 navy + + +As an active-duty service member, you have consulted with an Education Service +Officer (ESO) regarding your education program. + +Electronically Received by VA: 2017-01-17 +Confirmation #: V-EBC-1 + +*END* diff --git a/spec/fixtures/education_benefits_claims/1995/ch33_post911.spl b/spec/fixtures/education_benefits_claims/1995/ch33_post911.spl index b36344baeb1..0257473ac7c 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch33_post911.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch33_post911.spl @@ -7,7 +7,7 @@ LAST 1995R SCHOOL NAME -Chapter1606 +CH1606 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/kitchen_sink.spl b/spec/fixtures/education_benefits_claims/1995/kitchen_sink.spl index 475775fb865..2cb7c931fce 100644 --- a/spec/fixtures/education_benefits_claims/1995/kitchen_sink.spl +++ b/spec/fixtures/education_benefits_claims/1995/kitchen_sink.spl @@ -7,7 +7,7 @@ LAST V1995 SCHOOL NAME -Chapter35 +CH35 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/kitchen_sink_blank_appliedfor.spl b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_blank_appliedfor.spl index 01a28093df2..4dde78795dc 100644 --- a/spec/fixtures/education_benefits_claims/1995/kitchen_sink_blank_appliedfor.spl +++ b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_blank_appliedfor.spl @@ -7,7 +7,7 @@ LAST V1995 SCHOOL NAME -Chapter35 +CH35 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/kitchen_sink_blank_appliedfor_ch30.spl b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_blank_appliedfor_ch30.spl index 1fcb6098a7b..8d4442f9e37 100644 --- a/spec/fixtures/education_benefits_claims/1995/kitchen_sink_blank_appliedfor_ch30.spl +++ b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_blank_appliedfor_ch30.spl @@ -7,7 +7,7 @@ LAST V1995 SCHOOL NAME -Chapter30 +CH30 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch33_p911_baf.json b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch33_p911_baf.json new file mode 100644 index 00000000000..ad7cd7c4641 --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch33_p911_baf.json @@ -0,0 +1,87 @@ +{ + "veteranFullName": { + "first": "first", + "middle": "middle", + "last": "last" + }, + "veteranSocialSecurityNumber": "223334444", + "newSchool": { + "name": "school name", + "address": { + "city": "Milwaukee", + "country": "USA", + "postalCode": "53135", + "state": "WI", + "street": "111 Uni Drive" + } + }, + "sponsorSocialSecurityNumber": "444433322", + "sponsorFullName": { + "first": "John", + "last": "Smith" + }, + "oldSchool": { + "name": "old school name", + "address": { + "city": "Anytown", + "country": "USA", + "postalCode": "41414", + "state": "MA", + "street": "2222 Uni Drive" + } + }, + "preferredContactMethod": "email", + "trainingEndDate": "2007-06-XX", + "reasonForChange": "reason for change", + "vaFileNumber": "c12345679", + "homePhone": "5551110000", + "mobilePhone": "5551110001", + "veteranAddress": { + "city": "Milwaukee", + "country": "USA", + "postalCode": "53130", + "state": "WI", + "street": "123 Main St" + }, + "applicantGender": "F", + "dateOfBirth": "1970-01-01", + "civilianBenefitsAssistance": true, + "email": "test@sample.com", + "benefit": "chapter33Post911", + "benefitUpdate": "chapter33Post911", + "rudisillReview": "No", + "educationType": "tuitionTopUp", + "educationTypeUpdate": "prepCourseForLoC", + "educationObjective": "bachelor's degree", + "bankAccountChange": "startUpdate", + "bankAccountChangeUpdate": "startUpdate", + "bankAccount": { + "accountNumber": "88888888888", + "accountType": "checking", + "bankName": "First Bank of JSON", + "routingNumber": "123456789" + }, + "serviceBefore1977": { + "haveDependents": true, + "married": true, + "parentDependent": false + }, + "applicantServed": "Yes", + "toursOfDuty": [{ + "dateRange": { + "from": "2012-06-26", + "to": "2013-04-10" + }, + "serviceBranch": "Army Reserve" + }, { + "dateRange": { + "from": "2013-04-22", + "to": "2013-06-14" + }, + "serviceBranch": "navy" + }], + "nonVaAssistance": true, + "remarks": "remarks", + "programName": "program name", + "privacyAgreementAccepted": true + } diff --git a/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch33_p911_baf.spl b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch33_p911_baf.spl new file mode 100644 index 00000000000..c2b7aeb5754 --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch33_p911_baf.spl @@ -0,0 +1,85 @@ +*INIT* +FIRST +MIDDLE +LAST +223334444 +223334444 +V1995 + +SCHOOL NAME +CH33 +*START* +VA Form 22-1995 +OMB Control #: 2900-0074 + + + REQUEST FOR CHANGE OF BENEFIT, PROGRAM OR PLACE OF TRAINING +FOR VETERANS, SERVICEPERSONS, DEPENDENTS & MEMBERS OF THE SELECTED RESERVE + ------------------------------------- + + APPLICANT INFORMATION + --------------------- + +SSN: 223334444 VA File Number: c12345679 + +Sex: F Date of Birth: 1970-01-01 + +Name: first middle last + +Address: +123 MAIN ST +MILWAUKEE, WI, 53130 +USA + +Telephone Numbers: Mobile: 5551110001 + Home: 5551110000 + +Email Address: test@sample.com +Preferred Method of Contact: email + +Direct Deposit: Start or Update EFT +Type of Account: checking +Routing/Transit #: 123456789 Account #: 88888888888 + + TYPE AND PROGRAM OF EDUCATION OR TRAINING + ----------------------------------------- + +Benefit Most Recently Received: Chapter33 Post911 + +Do you wish to request a 'Rudisill' review?: No + +Select Another Benefit: + +Benefit Being Applied For: + +Type of Education or Training: Prep Course For Lo C +Education or Career Goal: bachelor's degree + +New School or Training Establishment: +school name +111 UNI DRIVE +MILWAUKEE, WI, 53135 +USA + + APPLICANT ACTIVE DUTY SERVICE INFORMATION + ----------------------------------------- + +Served in the armed forces?: Yes + +Are You Now On Active Duty?: N/A + +Do you have any new periods of service to record since you last applied for +education benefits? YES + +Date Entered Date Separated Service Component +2012-06-26 2013-04-10 Army Reserve +2013-04-22 2013-06-14 navy + + + Certification and Signature of Applicant +Signature of Applicant Date + +Electronically Received by VA: 2017-01-17 +Confirmation #: V-EBC-1 + +*END* diff --git a/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch35_ch33.spl b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch35_ch33.spl index c2c62607403..37e2d79e141 100644 --- a/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch35_ch33.spl +++ b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch35_ch33.spl @@ -7,7 +7,7 @@ LAST V1995 SCHOOL NAME -Chapter33 Post911 +CH33 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch35_ch35.spl b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch35_ch35.spl index 6c4ebac5dfd..32a7c478276 100644 --- a/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch35_ch35.spl +++ b/spec/fixtures/education_benefits_claims/1995/kitchen_sink_ch35_ch35.spl @@ -7,7 +7,7 @@ LAST V1995 SCHOOL NAME -Chapter35 +CH35 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/minimal.spl b/spec/fixtures/education_benefits_claims/1995/minimal.spl index 56f278277a0..62151307b08 100644 --- a/spec/fixtures/education_benefits_claims/1995/minimal.spl +++ b/spec/fixtures/education_benefits_claims/1995/minimal.spl @@ -7,7 +7,7 @@ FAKE V1995 -Chapter35 +CH35 *START* VA Form 22-1995 OMB Control #: 2900-0074 diff --git a/spec/fixtures/education_benefits_claims/1995/toe.json b/spec/fixtures/education_benefits_claims/1995/toe.json new file mode 100644 index 00000000000..6f40d9585b6 --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/toe.json @@ -0,0 +1,41 @@ +{ + "veteranFullName": { + "first": "Joe", + "last": "Tester2" + }, + "veteranSocialSecurityNumber": "223334444", + "veteranAddress": { + "city": "Austin", + "country": "USA", + "postalCode": "73301", + "state": "TX", + "street": "1234 Test St" + }, + "sponsorSocialSecurityNumber": "444433322", + "applicantGender": "F", + "dateOfBirth": "1970-01-01", + "email": "test@test.com", + "benefit": "chapter1606", + "benefitUpdate": "chapter1606", + "rudisillReview": "Yes", + "changeAnotherBenefit": "Yes", + "benefitAppliedFor": "transferOfEntitlement", + "remarks": "remarks", + "programName": "program name", + "privacyAgreementAccepted": true, + "isActiveDuty": true, + "applicantServed": "Yes", + "toursOfDuty": [{ + "dateRange": { + "from": "2010-06-26", + "to": "2011-04-10" + }, + "serviceBranch": "Army Reserve" + }, { + "dateRange": { + "from": "2010-04-22", + "to": "2011-06-14" + }, + "serviceBranch": "navy" + }] +} diff --git a/spec/fixtures/education_benefits_claims/1995/toe.spl b/spec/fixtures/education_benefits_claims/1995/toe.spl new file mode 100644 index 00000000000..db02a8ce56a --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/toe.spl @@ -0,0 +1,81 @@ +*INIT* +JOE + +TESTER2 +223334444 +223334444 +1995R + + +CH33 +*START* +VA Form 22-1995 +OMB Control #: 2900-0074 + + + REQUEST FOR CHANGE OF BENEFIT, PROGRAM OR PLACE OF TRAINING +FOR VETERANS, SERVICEPERSONS, DEPENDENTS & MEMBERS OF THE SELECTED RESERVE + ------------------------------------- + + APPLICANT INFORMATION + --------------------- + +SSN: 223334444 VA File Number: N/A + +Sex: F Date of Birth: 1970-01-01 + +Name: Joe Tester2 + +Address: +1234 TEST ST +AUSTIN, TX, 73301 +USA + +Telephone Numbers: Mobile: + Home: + +Email Address: test@test.com +Preferred Method of Contact: + +Direct Deposit: Type of Account: +Routing/Transit #: Account #: + + TYPE AND PROGRAM OF EDUCATION OR TRAINING + ----------------------------------------- + +Benefit Most Recently Received: Chapter1606 + +Do you wish to request a 'Rudisill' review?: Yes + +Select Another Benefit: Yes + +Benefit Being Applied For: Transfer Of Entitlement + +Type of Education or Training: +Education or Career Goal: + +New School or Training Establishment: + + + APPLICANT ACTIVE DUTY SERVICE INFORMATION + ----------------------------------------- + +Served in the armed forces?: Yes + +Are You Now On Active Duty?: YES + +Do you have any new periods of service to record since you last applied for +education benefits? YES + +Date Entered Date Separated Service Component +2010-06-26 2011-04-10 Army Reserve +2010-04-22 2011-06-14 navy + + +As an active-duty service member, you have consulted with an Education Service +Officer (ESO) regarding your education program. + +Electronically Received by VA: 2017-01-17 +Confirmation #: V-EBC-1 + +*END* diff --git a/spec/fixtures/education_benefits_claims/1995/toe_baf.json b/spec/fixtures/education_benefits_claims/1995/toe_baf.json new file mode 100644 index 00000000000..5d7a9748b52 --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/toe_baf.json @@ -0,0 +1,39 @@ +{ + "veteranFullName": { + "first": "Joe", + "last": "Tester2" + }, + "veteranSocialSecurityNumber": "223334444", + "veteranAddress": { + "city": "Austin", + "country": "USA", + "postalCode": "73301", + "state": "TX", + "street": "1234 Test St" + }, + "sponsorSocialSecurityNumber": "444433322", + "applicantGender": "F", + "dateOfBirth": "1970-01-01", + "email": "test@test.com", + "benefit": "chapter1606", + "benefitUpdate": "transferOfEntitlement", + "rudisillReview": "Yes", + "remarks": "remarks", + "programName": "program name", + "privacyAgreementAccepted": true, + "isActiveDuty": true, + "applicantServed": "Yes", + "toursOfDuty": [{ + "dateRange": { + "from": "2010-06-26", + "to": "2011-04-10" + }, + "serviceBranch": "Army Reserve" + }, { + "dateRange": { + "from": "2010-04-22", + "to": "2011-06-14" + }, + "serviceBranch": "navy" + }] +} diff --git a/spec/fixtures/education_benefits_claims/1995/toe_baf.spl b/spec/fixtures/education_benefits_claims/1995/toe_baf.spl new file mode 100644 index 00000000000..67e9bfceab4 --- /dev/null +++ b/spec/fixtures/education_benefits_claims/1995/toe_baf.spl @@ -0,0 +1,81 @@ +*INIT* +JOE + +TESTER2 +223334444 +223334444 +1995R + + +CH33 +*START* +VA Form 22-1995 +OMB Control #: 2900-0074 + + + REQUEST FOR CHANGE OF BENEFIT, PROGRAM OR PLACE OF TRAINING +FOR VETERANS, SERVICEPERSONS, DEPENDENTS & MEMBERS OF THE SELECTED RESERVE + ------------------------------------- + + APPLICANT INFORMATION + --------------------- + +SSN: 223334444 VA File Number: N/A + +Sex: F Date of Birth: 1970-01-01 + +Name: Joe Tester2 + +Address: +1234 TEST ST +AUSTIN, TX, 73301 +USA + +Telephone Numbers: Mobile: + Home: + +Email Address: test@test.com +Preferred Method of Contact: + +Direct Deposit: Type of Account: +Routing/Transit #: Account #: + + TYPE AND PROGRAM OF EDUCATION OR TRAINING + ----------------------------------------- + +Benefit Most Recently Received: Transfer Of Entitlement + +Do you wish to request a 'Rudisill' review?: Yes + +Select Another Benefit: + +Benefit Being Applied For: + +Type of Education or Training: +Education or Career Goal: + +New School or Training Establishment: + + + APPLICANT ACTIVE DUTY SERVICE INFORMATION + ----------------------------------------- + +Served in the armed forces?: Yes + +Are You Now On Active Duty?: YES + +Do you have any new periods of service to record since you last applied for +education benefits? YES + +Date Entered Date Separated Service Component +2010-06-26 2011-04-10 Army Reserve +2010-04-22 2011-06-14 navy + + +As an active-duty service member, you have consulted with an Education Service +Officer (ESO) regarding your education program. + +Electronically Received by VA: 2017-01-17 +Confirmation #: V-EBC-1 + +*END* diff --git a/spec/sidekiq/education_form/forms/va1995_spec.rb b/spec/sidekiq/education_form/forms/va1995_spec.rb index ba7e9a550f0..a63aa3d22ed 100644 --- a/spec/sidekiq/education_form/forms/va1995_spec.rb +++ b/spec/sidekiq/education_form/forms/va1995_spec.rb @@ -18,8 +18,12 @@ # For each sample application we have, format it and compare it against a 'known good' # copy of that submission. This technically covers all the helper logic found in the # `Form` specs, but are a good safety net for tracking how forms change over time. - %i[minimal kitchen_sink kitchen_sink_blank_appliedfor kitchen_sink_blank_appliedfor_ch30 - kitchen_sink_ch35_ch33 kitchen_sink_ch35_ch35 ch33_post911 ch33_fry ch30 ch1606].each do |application_name| + %i[ + minimal kitchen_sink kitchen_sink_blank_appliedfor kitchen_sink_blank_appliedfor_ch30 + kitchen_sink_ch35_ch33 kitchen_sink_ch35_ch35 ch33_post911 ch33_fry ch30 ch1606 + kitchen_sink_ch33_p911_baf ch33_p911_to_fry ch33_fry_baf ch30_mgi_bill ch1606_baf toe + toe_baf + ].each do |application_name| test_spool_file('1995', application_name) end