Merge pull request #778 from 18F/develop

Merge in sprint ending 2018-09-11
18F · Sep 11, 2018 · 3fc0888 · 3fc0888
2 parents cb24e8e + 73b7880
commit 3fc0888
Show file tree

Hide file tree

Showing 109 changed files with 27,571 additions and 576 deletions.
diff --git a/api/Gopkg.lock b/api/Gopkg.lock
diff --git a/api/Gopkg.toml b/api/Gopkg.toml
@@ -69,6 +69,10 @@
  branch = "master"
  name = "github.com/antchfx/xmlquery"
 
+[[constraint]]
+ branch = "master"
+ name = "github.com/benbjohnson/clock"
+
 [prune]
   go-tests = true
   unused-packages = true
diff --git a/api/cmd/server/main.go b/api/cmd/server/main.go
@@ -16,6 +16,7 @@ import (
 	"github.com/18F/e-QIP-prototype/api/saml"
 	"github.com/18F/e-QIP-prototype/api/usps"
 	"github.com/18F/e-QIP-prototype/api/xml"
+	"github.com/benbjohnson/clock"
 	"github.com/gorilla/mux"
 )
 
@@ -26,12 +27,13 @@ var (
 func main() {
 	cloudfoundry.Configure()
 	logger := &log.Service{Log: log.NewLogger()}
+	localClock := clock.New()
 	settings := env.Native{}
 	settings.Configure()
 	database := &postgresql.Service{Log: logger, Env: settings}
 	database.Configure()
 	token := jwt.Service{Env: settings}
-	xmlsvc := xml.Service{Log: logger}
+	xmlsvc := xml.Service{Log: logger, Clock: localClock}
 	pdfsvc := pdf.Service{Log: logger, Env: settings}
 	samlsvc := &saml.Service{Log: logger, Env: settings}
 	api.Geocode = usps.Geocoder{Log: logger, Env: settings}

diff --git a/api/location.go b/api/location.go
@@ -23,6 +23,12 @@ const (
 	LayoutStreetCity                          = "Street, City"
 )
 
+// Special layout flags for e-QIP integration for Country elements with CountriesNoUS type
+const (
+	LayoutBirthPlaceWithoutCountyNoUS = "Birthplace without County CountriesNoUS"
+	LayoutBirthPlaceNoUS              = "Birthplace CountriesNoUS"
+)
+
 // Location is a basic input.
 type Location struct {
 	ID              int    `json:"-"`

diff --git a/api/templates/application.xml b/api/templates/application.xml
@@ -9,16 +9,16 @@
           <Version>2017-07</Version>
         </Form>
         <Applicant>
-          <Name>{{$name.first}} {{$name.middle}} {{$name.last}}</Name>
           {{if $ssn.notApplicable}}
           <SSN NotApplicable="True" />
           {{else}}
           <SSN>{{$ssn.first}}{{$ssn.middle}}{{$ssn.last}}</SSN>
           {{end}}
         </Applicant>
         <Responses>
-          <AgencyInstructionsForApplicant></AgencyInstructionsForApplicant>
+          <AgencyInstructionsForApplicant/>
           <FormInstanceSpecific>
+            <AgencyInstructionsForApplicant/>
             <ESigCertificationResponses Version="1" Type="Pooled" LastSummaryID="201" LastDynamicListID="201">
               <UserFinalizedCert>
                 <Answer>Yes</Answer>
@@ -30,6 +30,8 @@
             <UserPreferences Version="1" Type="Pooled" LastSummaryID="201" LastDynamicListID="201">
               <DisplayNavigation/>
             </UserPreferences>
+            <!-- TODO https://github.com/18F/e-QIP-prototype/issues/759 -->
+            <ValidationResponses Version="1" Type="FormInstanceSpecific" />
           </FormInstanceSpecific>
           <Pooled>
             {{tmpl "identification.xml" .}}
@@ -51,6 +53,7 @@
         </Responses>
       </Request>
     </RequestInfo>
+    <DateSubmitted>{{now}}</DateSubmitted>
   </SubmittedRequestInfo>
   <AgencyUsageBlock>
     <TypeOfInvestigation>

diff --git a/api/templates/citizenship-multiple.xml b/api/templates/citizenship-multiple.xml
@@ -2,7 +2,7 @@
   <DualCitizenships>
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
-    <Citizenship ID="{{$index}}">
+    <Citizenship ID="{{inc $index}}">
       {{country $Item.Country}}
       <CountryOfCitizenshipDetailComment>{{countryComments $Item.Country}}</CountryOfCitizenshipDetailComment>
       <CurrentlyHoldCitizenship>

diff --git a/api/templates/citizenship-status.xml b/api/templates/citizenship-status.xml
@@ -30,7 +30,7 @@
     </AlienRegistration>
     <Citizenships>
       {{range $cindex, $country := $citizenship.PriorCitizenship.props.value}}
-      <Citizenship ID="{{$cindex}}">
+      <Citizenship ID="{{inc $cindex}}">
         <Country>{{$country}}</Country>
       </Citizenship>
       {{end}}

diff --git a/api/templates/financial-bankruptcy.xml b/api/templates/financial-bankruptcy.xml
@@ -2,7 +2,7 @@
   <Activities>
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
-    <Activity ID="{{$index}}">
+    <Activity ID="{{inc $index}}">
       <AccountNumber>{{text $Item.CourtNumber}}</AccountNumber>
       <Amount Estimated="{{checkboxTrueFalse $Item.TotalAmountEstimated}}">{{number $Item.TotalAmount}}</Amount>
       <Authority>
@@ -37,10 +37,6 @@
     </Activity>
     {{end}}
     {{end}}
-
-    {{- if branch .props.HasBankruptcy | eq "Yes"}}
-    <HaveAdditionalEntryAnswer>{{branch .props.List.props.branch}}</HaveAdditionalEntryAnswer>
-    {{end}}
   </Activities>
   <Answer>{{branch .props.HasBankruptcy}}</Answer>
 

diff --git a/api/templates/financial-card.xml b/api/templates/financial-card.xml
@@ -4,7 +4,7 @@
   <Incidents>
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
-    <Incident ID="{{$index}}">
+    <Incident ID="{{inc $index}}">
       <Actions>{{textarea $Item.Description}}</Actions>
       <Agency>
         <Address>{{location $Item.Address}}</Address>

diff --git a/api/templates/financial-credit.xml b/api/templates/financial-credit.xml
@@ -4,7 +4,7 @@
   <Incidents>
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
-    <Incident ID="{{$index}}">
+    <Incident ID="{{inc $index}}">
       <Actions>{{textarea $Item.Description}}</Actions>
       <Comment></Comment>
       <Explanation>{{textarea $Item.Explanation}}</Explanation>

diff --git a/api/templates/financial-delinquent.xml b/api/templates/financial-delinquent.xml
@@ -4,7 +4,7 @@
   <Incidents>
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
-    <Incident ID="{{$index}}">
+    <Incident ID="{{inc $index}}">
       <AccountNumber>{{text $Item.AccountNumber}}</AccountNumber>
       <Agency>
         <Name>{{text $Item.Name}}</Name>
@@ -28,12 +28,13 @@
       <Description>{{textarea $Item.Description}}</Description>
       <IssueType>
         <Answer>{{if checkbox $Item.Infractions}}Yes{{else}}No{{end}}</Answer>
+        <!-- Note: Judgement with an 'e' and Judgment without an 'e' -->
         <Options
           {{ if (checkboxHas $Item.Infractions "Alimony") | eq "True" }}
-          Alimony="{{checkboxHas $Item.Infractions "Alimony"}}"
+          Alimony="True"
           {{end}}
-          {{ if (checkboxHas $Item.Infractions "Judgment") | eq "True" }}
-          Judgment="{{checkboxHas $Item.Infractions "Judgment"}}"
+          {{ if (checkboxHas $Item.Infractions "Judgement") | eq "True" }}
+          Judgment="True"
           {{end}}
           {{ if (checkboxHas $Item.Infractions "Lien") | eq "True" }}
           Lien="True"

diff --git a/api/templates/financial-gambling.xml b/api/templates/financial-gambling.xml
@@ -4,7 +4,7 @@
   <Incidents>
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
-    <Incident ID="{{$index}}">
+    <Incident ID="{{inc $index}}">
       <Actions>{{textarea $Item.Actions}}</Actions>
       <Amount>{{number $Item.Losses}}</Amount>
       <Comment></Comment>

diff --git a/api/templates/financial-nonpayment.xml b/api/templates/financial-nonpayment.xml
@@ -4,7 +4,7 @@
   <Incidents>
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
-    <Incident ID="{{$index}}">
+    <Incident ID="{{inc $index}}">
       <AccountNumber>{{text $Item.AccountNumber}}</AccountNumber>
       <Agency>
         <Name>{{text $Item.Name}}</Name>

diff --git a/api/templates/financial-taxes.xml b/api/templates/financial-taxes.xml
@@ -4,7 +4,7 @@
   <Incidents>
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
-    <Incident ID="{{$index}}">
+    <Incident ID="{{inc $index}}">
       <Actions>{{textarea $Item.Description}}</Actions>
       <Agency>{{text $Item.Agency}}</Agency>
       <Amount Estimated="{{checkboxTrueFalse $Item.AmountEstimated}}">{{number $Item.Amount}}</Amount>

diff --git a/api/templates/foreign-business-consultancies.xml b/api/templates/foreign-business-consultancies.xml
@@ -4,7 +4,7 @@
   <Comment></Comment>
   {{range $index, $item := .props.List.props.items}}
   {{with $Item := $item.Item}}
-  <Consultancy ID="{{$index}}">
+  <Consultancy ID="{{inc $index}}">
     <Agency>
       {{country $Item.Country}}
       <Name>{{text $Item.Agency}}</Name>

diff --git a/api/templates/foreign-business-government-contacts.xml b/api/templates/foreign-business-government-contacts.xml
@@ -4,11 +4,11 @@
   <Comment></Comment>
   {{range $index, $item := .props.List.props.items}}
   {{with $Item := $item.Item}}
-  <GovernmentContact ID="{{$index}}">
+  <GovernmentContact ID="{{inc $index}}">
     <Circumstances>{{text $Item.Purpose}}</Circumstances>
     <CountriesInvolved>
       {{range $cindex, $country := $Item.Governments.props.value}}
-      <CountryInvolved ID="{{$cindex}}">
+      <CountryInvolved ID="{{inc $cindex}}">
         <Country>{{$country}}</Country>
       </CountryInvolved>
       {{end}}
@@ -28,12 +28,12 @@
       </Place>
     </Location>
     <SubsequentForeignContacts>
-      <Answer>{{branchcollectionHas $Item.SubsequentContacts.props.List}}</Answer>
+      <Answer>{{branchcollectionHas $Item.SubsequentContacts}}</Answer>
       <AnswerComment></AnswerComment>
-      {{range $sindex, $contact := $Item.SubsequentContacts.props.List.props.items}}
+      {{range $sindex, $contact := $Item.SubsequentContacts.props.items}}
       {{with $Contact := $contact.Item}}
       {{- if branch $Contact.Has | eq "Yes"}}
-      <Contact ID="{{$sindex}}">
+      <Contact ID="{{inc $sindex}}">
         <Comment></Comment>
         <Date Type="{{dateEstimated $Contact.Recent}}">
           {{date $Contact.Recent}}

diff --git a/api/templates/foreign-business-job-offers.xml b/api/templates/foreign-business-job-offers.xml
@@ -10,7 +10,7 @@
 <ForeignJobOffers>
   {{range $index, $item := .props.List.props.items}}
   {{with $Item := $item.Item}}
-  <ForeignJobOffer ID="{{$index}}">
+  <ForeignJobOffer ID="{{inc $index}}">
     <AcceptOffer>
       <Answer>{{text $Item.Accepted}}</Answer>
       <Explanation>{{text $Item.Explanation}}</Explanation>

diff --git a/api/templates/foreign-business-meetings.xml b/api/templates/foreign-business-meetings.xml
@@ -4,7 +4,7 @@
   <Comment></Comment>
   {{range $index, $item := .props.List.props.items}}
   {{with $Item := $item.Item}}
-  <Meeting ID="{{$index}}">
+  <Meeting ID="{{inc $index}}">
     {{monthYearDaterange $Item.Dates}}
     <EntryComment></EntryComment>
     <Location>
@@ -22,7 +22,7 @@
       {{range $cindex, $contact := $Item.Contacts.props.List.props.items}}
       {{with $Contact := $contact.Item}}
       {{if branch $Contact.Has | eq "Yes"}}
-      <Contact ID="{{$cindex}}">
+      <Contact ID="{{inc $cindex}}">
         <Comment></Comment>
         <Explanation>{{text $Contact.Explanation}}</Explanation>
       </Contact>

diff --git a/api/templates/foreign-business-other-employment.xml b/api/templates/foreign-business-other-employment.xml
@@ -10,7 +10,7 @@
 <OtherForeignEmployments>
   {{range $index, $item := .props.List.props.items}}
   {{with $Item := $item.Item}}
-  <OtherForeignEmployment ID="{{$index}}">
+  <OtherForeignEmployment ID="{{inc $index}}">
     <Comment></Comment>
     <CompensationDescription>{{text $Item.Compensation}}</CompensationDescription>
     {{monthYearDaterange $Item.Dates}}
@@ -23,7 +23,7 @@
       </Address>
       <CountriesOfCitizenship>
         {{range $cindex, $country := $Item.Citizenship.props.value}}
-        <Citizenship ID="{{$cindex}}">
+        <Citizenship ID="{{inc $cindex}}">
           <Country>{{$country}}</Country>
         </Citizenship>
         {{end}}

diff --git a/api/templates/foreign-business-political-office.xml b/api/templates/foreign-business-political-office.xml
@@ -6,7 +6,7 @@
 <ForeignPoliticalOffices>
   {{range $index, $item := .props.List.props.items}}
   {{with $Item := $item.Item}}
-  <ForeignPoliticalOffice ID="{{$index}}">
+  <ForeignPoliticalOffice ID="{{inc $index}}">
     <Comment></Comment>
     {{country $Item.Country}}
     <CurrentEligibility>{{text $Item.Eligibility}}</CurrentEligibility>

diff --git a/api/templates/foreign-business-sponsored-visits.xml b/api/templates/foreign-business-sponsored-visits.xml
@@ -4,10 +4,10 @@
   <Comment></Comment>
   {{range $index, $item := .props.List.props.items}}
   {{with $Item := $item.Item}}
-  <SponsoredVisit ID="{{$index}}">
+  <SponsoredVisit ID="{{inc $index}}">
     <AddressWhileInUS>
       <Address>
-        {{location $Item.Address}}
+        {{location $Item.Residence}}
       </Address>
     </AddressWhileInUS>
     <Birth>
@@ -27,14 +27,14 @@
     </Birth>
     <CountriesOfCitizenship>
       {{range $cindex, $country := $Item.Citizenship.props.value}}
-      <Citizenship ID="{{$cindex}}">
+      <Citizenship ID="{{inc $cindex}}">
         <Country>{{$country}}</Country>
       </Citizenship>
       {{end}}
     </CountriesOfCitizenship>
     <CurrentAddress>
       <Address>
-        {{location $Item.Residence}}
+        {{location $Item.Address}}
       </Address>
     </CurrentAddress>
     {{monthYearDaterange $Item.Dates}}

diff --git a/api/templates/foreign-business-support-activities.xml b/api/templates/foreign-business-support-activities.xml
@@ -8,7 +8,7 @@
   {{end}}
   {{range $index, $item := .props.List.props.items}}
   {{with $Item := $item.Item}}
-  <SupportActivity ID="{{$index}}">
+  <SupportActivity ID="{{inc $index}}">
     {{country $Item.Country}}
     {{monthYearDaterange $Item.Dates}}
     <DescribeCompensation>{{text $Item.Compensation}}</DescribeCompensation>

diff --git a/api/templates/foreign-business-voted.xml b/api/templates/foreign-business-voted.xml
@@ -9,7 +9,7 @@
 <VotedInForeignElections>
   {{range $index, $item := .props.List.props.items}}
   {{with $Item := $item.Item}}
-  <ForeignElection ID="{{$index}}">
+  <ForeignElection ID="{{inc $index}}">
     <Comment></Comment>
     {{country $Item.Country}}
     <CurrentVotingEligibility>{{text $Item.Eligibility}}</CurrentVotingEligibility>