Merge pull request #70 from fecgov/release/sprint-7

Release Sprint 7 to production
fecgov · May 10, 2022 · 3bfb390 · 3bfb390
2 parents ebcde48 + efff584
commit 3bfb390
Show file tree

Hide file tree

Showing 19 changed files with 1,065 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@ local_settings.py
 */CACHE
 */package-lock.json
 *.editorconfig
+cov_profile/*
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
@@ -22,7 +23,8 @@ local_settings.py
 /out-tsc
 
 # dependencies
-*/node_modules
+fecfile_validate_js/node_modules/*
+node_modules/*
 
 # IDEs and editors
 *.idea

diff --git a/README.md b/README.md
@@ -35,6 +35,8 @@ is missing a value, the validation passes but with a warning issued about the mi
 
 # Deployment (FEC team only)
 
+*Special Note:* The requirements.txt field in the fecfile-web-api repo must be updated with the most recent commit hash for the commit changes to be pulled into the api build by CircleCI.
+
 ### Create a feature branch
 
 Using git-flow extensions:
@@ -54,29 +56,30 @@ Without the git-flow extensions:
 
 ### Create a release branch
 
-Using git-flow extensions:
+* Using git-flow extensions:
 ```
 git flow release start sprint-#
 ```
 
-Without the git-flow extensions:
+* Without the git-flow extensions:
 ```
 git checkout develop
 git pull
 git checkout -b release/sprint-# develop
 git push --set-upstream origin release/sprint-#
 ```
+* Developer creates a PR in GitHub to merge release/sprint-# branch into the `main` branch to track if commits pass deployment checks. The actual merge will happen when deploying a release to production.
 
 ### Create and deploy a hotfix
 
-Using git-flow extensions:
+* Using git-flow extensions:
 ```
 git flow hotfix start my-fix
 # Work happens here
 git flow hotfix finish my-fix
 ```
 
-Without the git-flow extensions:
+* Without the git-flow extensions:
 ```
 git checkout -b hotfix/my-fix main
 # Work happens here
@@ -88,7 +91,6 @@ git push --set-upstream origin hotfix/my-fix
 * Developer deploys hotfix/my-fix branch to main using **Deploying a release to production** instructions below
 
 ### Deploying a release to production
-* Developer creates a PR in GitHub to merge release/sprint-# branch into the `main` branch
 * Reviewer approves PR and merges into `main`
 * Check CircleCI for passing pipeline tests
 * If tests pass, continue

diff --git a/docs/Contact_Candidate.html b/docs/Contact_Candidate.html
diff --git a/docs/Contact_Candidate_spec.html b/docs/Contact_Candidate_spec.html
@@ -1,3 +1,214 @@
-<!DOCTYPE html><html lang="en"><head><title>Contact_Candidate</title><link rel="stylesheet" href="spec_table.css"></head><body><table><caption>Specification for Contact_Candidate</caption><tr><th>COL SEQ</th><th>FIELD DESCRIPTION</th><th>TYPE</th><th>REQUIRED</th><th>SAMPLE DATA</th><th>VALUE REFERENCE</th><th>RULE REFERENCE</th><th>FIELD FORM ASSOCIATION</th></tr><tr><td>1</td><td>TYPE</td><td>Dropdown</td><td>X (error)</td><td></td><td>Individual Committee Organization Candidate</td><td></td><td></td><td></td></tr><tr><td>2</td><td>CANDIDATE ID</td><td>A/N-9</td><td>X (error)</td><td></td><td>H01234567</td><td></td><td></td><td></td></tr><tr><td>3</td><td>LAST NAME</td><td>A/N-30</td><td>X (error)</td><td></td><td>Smith</td><td></td><td></td><td></td></tr><tr><td>4</td><td>FIRST NAME</td><td>A/N-20</td><td>X (error)</td><td></td><td>John</td><td></td><td></td><td></td></tr><tr><td>5</td><td>MIDDLE NAME</td><td>A/N-20</td><td></td><td></td><td>W</td><td></td><td></td><td></td></tr><tr><td>6</td><td>PREFIX</td><td>A/N-10</td><td></td><td></td><td>Dr</td><td></td><td></td><td></td></tr><tr><td>7</td><td>SUFFIX</td><td>A/N-10</td><td></td><td></td><td>Jr</td><td></td><td></td><td></td></tr><tr><td>8</td><td>STREET 1</td><td>A/N-34</td><td>X (error)</td><td></td><td>123 Main Street</td><td></td><td></td><td></td></tr><tr><td>9</td><td>STREET 2</td><td>A/N-34</td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td>10</td><td>CITY</td><td>A/N-30</td><td>X (error)</td><td></td><td>Anytown</td><td></td><td></td><td></td></tr><tr><td>11</td><td>STATE</td><td>A/N-2</td><td>X (error)</td><td></td><td>WA</td><td></td><td>Edit: ST. Default to ZZ if Country DNE US</td><td></td></tr><tr><td>12</td><td>ZIP</td><td>A/N-9</td><td>X (error)</td><td></td><td>981110123</td><td></td><td></td><td></td></tr><tr><td>13</td><td>EMPLOYER</td><td>A/N-38</td><td></td><td></td><td>XYZ Company</td><td></td><td>Req if Donor aggregate >$200</td><td></td></tr><tr><td>14</td><td>OCCUPATION</td><td>A/N-38</td><td></td><td></td><td>QC Inspector</td><td></td><td>Req if Donor aggregate >$200</td><td></td></tr><tr><td>15</td><td>CANDIDATE OFFICE</td><td>Dropdown</td><td>X (error)</td><td></td><td>House
-Senate
-Presidential</td><td></td><td></td><td></td></tr><tr><td>16</td><td>CANDIDATE STATE</td><td>A/N-2</td><td>X (error)</td><td></td><td>WA</td><td></td><td>Required if Office = H or S</td><td></td></tr><tr><td>17</td><td>CANDIDATE DISTRICT</td><td>A/N-2</td><td>X (error)</td><td></td><td></td><td></td><td>Required if Office = H</td><td></td></tr><tr><td></td><td>TELEPHONE</td><td>N-10</td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td>COUNTRY</td><td>Dropdown</td><td>X (error)</td><td></td><td></td><td></td><td>Should default to United States</td><td></td></tr></table></body></html>
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <title>Contact_Candidate</title>
+ <link rel="stylesheet" href="spec_table.css" />
+ </head>
+ <body>
+ <table>
+ <caption>
+ Specification for Contact_Candidate
+ </caption>
+ <tr>
+ <th>COL SEQ</th>
+ <th>FIELD DESCRIPTION</th>
+ <th>TYPE</th>
+ <th>REQUIRED</th>
+ <th>SAMPLE DATA</th>
+ <th>VALUE REFERENCE</th>
+ <th>RULE REFERENCE</th>
+ <th>FIELD FORM ASSOCIATION</th>
+ </tr>
+ <tr>
+ <td>1</td>
+ <td>TYPE</td>
+ <td>Dropdown</td>
+ <td>X (error)</td>
+ <td>Individual Committee Organization Candidate</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>2</td>
+ <td>CANDIDATE ID</td>
+ <td>A/N-9</td>
+ <td>X (error)</td>
+ <td>H01234567</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>3</td>
+ <td>LAST NAME</td>
+ <td>A/N-30</td>
+ <td>X (error)</td>
+ <td>Smith</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>4</td>
+ <td>FIRST NAME</td>
+ <td>A/N-20</td>
+ <td>X (error)</td>
+ <td>John</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>5</td>
+ <td>MIDDLE NAME</td>
+ <td>A/N-20</td>
+ <td></td>
+ <td>W</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>6</td>
+ <td>PREFIX</td>
+ <td>A/N-10</td>
+ <td></td>
+ <td>Dr</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>7</td>
+ <td>SUFFIX</td>
+ <td>A/N-10</td>
+ <td></td>
+ <td>Jr</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>8</td>
+ <td>STREET 1</td>
+ <td>A/N-34</td>
+ <td>X (error)</td>
+ <td>123 Main Street</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>9</td>
+ <td>STREET 2</td>
+ <td>A/N-34</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>10</td>
+ <td>CITY</td>
+ <td>A/N-30</td>
+ <td>X (error)</td>
+ <td>Anytown</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>11</td>
+ <td>STATE</td>
+ <td>A/N-2</td>
+ <td>X (error)</td>
+ <td>WA</td>
+ <td></td>
+ <td>Edit: ST. Default to ZZ if Country DNE US</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>12</td>
+ <td>ZIP</td>
+ <td>A/N-9</td>
+ <td>X (error)</td>
+ <td>981110123</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>13</td>
+ <td>EMPLOYER</td>
+ <td>A/N-38</td>
+ <td></td>
+ <td>XYZ Company</td>
+ <td></td>
+ <td>Req if Donor aggregate >$200</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>14</td>
+ <td>OCCUPATION</td>
+ <td>A/N-38</td>
+ <td></td>
+ <td>QC Inspector</td>
+ <td></td>
+ <td>Req if Donor aggregate >$200</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>15</td>
+ <td>CANDIDATE OFFICE</td>
+ <td>Dropdown</td>
+ <td>X (error)</td>
+ <td>House Senate Presidential</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>16</td>
+ <td>CANDIDATE STATE</td>
+ <td>A/N-2</td>
+ <td>X (error)</td>
+ <td>WA</td>
+ <td></td>
+ <td>Required if Office = H or S</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>17</td>
+ <td>CANDIDATE DISTRICT</td>
+ <td>A/N-2</td>
+ <td>X (error)</td>
+ <td></td>
+ <td></td>
+ <td>Required if Office = H</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>TELEPHONE</td>
+ <td>N-10</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>COUNTRY</td>
+ <td>Dropdown</td>
+ <td>X (error)</td>
+ <td></td>
+ <td></td>
+ <td>Should default to United States</td>
+ <td></td>
+ </tr>
+ </table>
+ </body>
+</html>