Merge pull request #39 from truetandem/master

Release #1 3/20/2017

.travis.yml

@@ -31,7 +31,7 @@ deploy:
     script: "./bin/deploy.sh staging"
     skip_cleanup: true
     on:
-      branch: master
+      branch: pre-usability-fixes
       repo: truetandem/e-QIP-prototype
   - provider: script
     script: "./bin/deploy.sh production"

Dockerfile.api

@@ -1,2 +1,6 @@
 FROM golang:1.7
-RUN curl https://glide.sh/get | sh
+RUN go get -u github.com/Masterminds/glide; \
+    cd $GOPATH/src/github.com/Masterminds/glide; \
+    git checkout tags/$(git describe --tags $(git rev-list --tags --max-count=1)); \
+    go install; \
+    cd $GOPATH/src

README.md

@@ -17,6 +17,7 @@ To create the e-QIP questionnaire prototype, the project team is employing a use
 ## Table of contents
 
  - [Project Management](#project-management)
+    - [Sprint Backlogs](#sprint-backlogs)
  - [Getting to know the code](#getting-to-know-the-code)
     - [Clone all things](#clone-all-things)
     - [Checking dependencies](#checking-dependencies)
@@ -45,29 +46,73 @@ truetandem/e-QIP-prototype#issue_number Commit description
 ## Sprint Backlogs
 To view the items completed during each development sprint and to view the burndown chart for each respective sprint, please use the links provided below. 
 
-### Sprint 1
+### Sprint 1 
+```
+Duration: Nov 24, 2016 to Dec 7, 2016
+Story Points Completed: 109
+```
 View Sprint 1 [backlog items][26] completed and [burndown chart][34]
 
 ### Sprint 2
+```
+Duration: Dec 8, 2016 to Dec 21, 2016
+Story Points Completed: 116
+```
 View Sprint 2 [backlog items][27] completed and [burndown chart][35]
 
 ### Sprint 3
+```
+Duration: Dec 22, 2016 to Jan 4, 2017
+Story Points Completed: 58
+```
 View Sprint 3 [backlog items][28] completed and [burndown chart][36]
 
 ### Sprint 4
+```
+Duration: Jan 5, 2017 to Jan 18, 2017
+Story Points Completed: 86
+```
 View Sprint 4 [backlog items][29] completed and [burndown chart][37]
 
 ### Sprint 5
+```
+Duration: Jan 19, 2017 to Feb 1, 2017
+Story Points Completed: 148
+```
 View Sprint 5 [backlog items][30] completed and [burndown chart][38]
 
 ### Sprint 6
+```
+Duration: Feb 2, 2017 to Feb 15, 2017
+Story Points Completed: 133
+```
 View Sprint 6 [backlog items][31] completed and [burndown chart][39]
 
 ### Sprint 7
+```
+Duration: Feb 16, 2017 to Mar 1, 2017
+Story Points Completed: 102
+```
 View Sprint 7 [backlog items][32] completed and [burndown chart][40]
 
-### Sprint 8 (current sprint)
-View Sprint 8 [backlog items][33] in progress 
+### Sprint 8
+```
+Duration:  Mar 2, 2017 to Mar 15, 2017
+Story Points Completed: 110
+```
+View Sprint 8 [backlog items][33] completed and [burndown chart][41] 
+
+### Sprint 9 (current sprint)
+```
+Duration: Mar 16, 2017 to Mar 29, 2017
+Story Points Planned: 121
+```
+View Sprint 9 [backlog items][42] in progress
+
+View Sprint 9 [burndown chart][43]
+
+Team Velocity: **108** pts
+
 
 ## Getting to know the code
 
@@ -142,6 +187,14 @@ yarn test
 The individual test results will be seen in the output, and the coverage
 results may be viewed after running ```yarn test```.
 
+### Executing feature specifications
+
+Running the feature specifications is an on-demand process and can be ran through [docker-compose][20] by specifying a different configuration file:
+
+```
+docker-compose -f nightwatch-compose.yml up
+```
+
 ### Packaging Application
 
 To package up the application, use the command:
@@ -226,11 +279,14 @@ Please refer to the [contributing documentation][18].
 [30]: https://github.com/truetandem/e-QIP-prototype/milestone/6?closed=1
 [31]: https://github.com/truetandem/e-QIP-prototype/milestone/7?closed=1
 [32]: https://github.com/truetandem/e-QIP-prototype/milestone/8?closed=1
-[33]: https://github.com/truetandem/e-QIP-prototype/milestone/9
+[33]: https://github.com/truetandem/e-QIP-prototype/milestone/9?closed=1
 [34]: https://github.com/truetandem/e-QIP-prototype/issues/613
 [35]: https://github.com/truetandem/e-QIP-prototype/issues/614
 [36]: https://github.com/truetandem/e-QIP-prototype/issues/615
 [37]: https://github.com/truetandem/e-QIP-prototype/issues/616
 [38]: https://github.com/truetandem/e-QIP-prototype/issues/617
 [39]: https://github.com/truetandem/e-QIP-prototype/issues/618
 [40]: https://github.com/truetandem/e-QIP-prototype/issues/619
+[41]: https://github.com/truetandem/e-QIP-prototype/issues/725
+[42]: https://github.com/truetandem/e-QIP-prototype/milestone/10
+[43]: http://burndown.io/#truetandem/e-QIP-prototype/10

api/geo/usps.go

@@ -25,6 +25,8 @@ var (
 		"-2147219403":     "error.geocode.multiple",
 		"Default Address": "error.geocode.defaultAddress",
 		"Partial":         "error.geocode.partial",
+		"System":          "error.geocode.system",
+		"80040B19":        "error.geocode.system.xml",
 	}
 )
 
@@ -132,8 +134,14 @@ func decode(r io.Reader, addressResp *USPSAddressValidateResponse) error {
 		return err
 	}
 
-	// We have a system error so return the description of the error
-	return fmt.Errorf("%v", errorResp.Description)
+	// We have a system error so attempt to resolve error code
+	if errCode, ok := USPSErrorCodes[errorResp.Number]; ok {
+		return ErrUSPSSystem{Message: errCode}
+	}
+
+	fmt.Println("Unable to resolve error code. Default to generic error message")
+	sysErr := ErrUSPSSystem{Message: USPSErrorCodes["System"]}
+	return sysErr
 }
 
 // prepareQueryURI creates the url used to execute a http validate address request
@@ -313,6 +321,14 @@ func (address *USPSAddress) ToResult(geoValues Values) (result Result) {
 	return result
 }
 
+type ErrUSPSSystem struct {
+	Message string
+}
+
+func (e ErrUSPSSystem) Error() string {
+	return e.Message
+}
+
 // NewUSPSGeocoder creates a new instance of USPS Geocoder
 func NewUSPSGeocoder(userID string) *USPSGeocoder {
 	return &USPSGeocoder{

docker-compose.yml

@@ -64,43 +64,6 @@ services:
     depends_on:
       - db
 
-  hub:
-    image: selenium/hub:latest
-    expose:
-      - '4444'
-    networks:
-      - private
-
-  # Selenium nodes currently don't support docker networks.
-  # To get around this we emulate what `--link` would create for
-  # environment variables.
-  #
-  # Reference: https://github.com/SeleniumHQ/docker-selenium/issues/133
-  chrome:
-    image: selenium/node-chrome:latest
-    environment:
-      HUB_PORT_4444_TCP_ADDR: hub
-      HUB_PORT_4444_TCP_PORT: 4444
-    volumes:
-      - /dev/shm:/dev/shm
-    networks:
-      - private
-    depends_on:
-      - hub
-
-  nightwatch:
-    build:
-      context: .
-      dockerfile: Dockerfile.nightwatch
-    command: [npm, run, docker]
-    volumes:
-      - ./specs:/usr/src/app
-    networks:
-      - private
-    depends_on:
-      - chrome
-      - web
-
 networks:
   private:
     driver: bridge

manifest-api-staging.yml

@@ -1,7 +1,7 @@
 ---
 applications:
 - name: eqip-prototype-api-staging
-  memory: 1G
+  memory: 64M
   instances: 2
   domain: fr.cloud.gov
   host: eqip-prototype-api-staging

manifest-api.yml

@@ -1,7 +1,7 @@
 ---
 applications:
 - name: eqip-prototype-api
-  memory: 1G
+  memory: 64M
   instances: 2
   domain: fr.cloud.gov
   host: eqip-prototype-api

nightwatch-compose.yml

@@ -0,0 +1,93 @@
+version: '2'
+
+services:
+  db:
+    image: postgres
+    expose:
+      - '5432'
+    networks:
+      - private
+
+  # Within the docker world this is the main entrypoint in to
+  # this web application. This was done in order to have a
+  # combination of:
+  #  - development REPL
+  #  - automated unit tests
+  #  - spec testing
+  #
+  # Caddy will do the following:
+  #  - serve compiled static assets
+  #  - proxy /api requests to the backend API
+  web:
+    image: abiosoft/caddy
+    volumes:
+      - ./dist:/srv
+      - ./api/Caddyfile:/etc/Caddyfile
+    ports:
+      - '8080:2015'
+    networks:
+      - private
+    depends_on:
+      - api
+
+  api:
+    build:
+      context: .
+      dockerfile: Dockerfile.api
+    env_file:
+      - .env
+    working_dir: /go/src/github.com/18F/e-QIP-prototype/api
+    command: ./run.sh
+    volumes:
+      - .:/go/src/github.com/18F/e-QIP-prototype
+    expose:
+      - '3000'
+    environment:
+      DATABASE_USER: postgres
+      DATABASE_NAME: postgres
+      DATABASE_HOST: db:5432
+    networks:
+      - private
+    depends_on:
+      - db
+
+  hub:
+    image: selenium/hub:latest
+    expose:
+      - '4444'
+    networks:
+      - private
+
+  # Selenium nodes currently don't support docker networks.
+  # To get around this we emulate what `--link` would create for
+  # environment variables.
+  #
+  # Reference: https://github.com/SeleniumHQ/docker-selenium/issues/133
+  chrome:
+    image: selenium/node-chrome:latest
+    environment:
+      HUB_PORT_4444_TCP_ADDR: hub
+      HUB_PORT_4444_TCP_PORT: 4444
+    volumes:
+      - /dev/shm:/dev/shm
+    networks:
+      - private
+    depends_on:
+      - hub
+
+  nightwatch:
+    build:
+      context: .
+      dockerfile: Dockerfile.nightwatch
+    command: [npm, run, docker]
+    volumes:
+      - ./specs:/usr/src/app
+    networks:
+      - private
+    depends_on:
+      - chrome
+      - web
+
+networks:
+  private:
+    driver: bridge

src/App.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { i18n } from './config'
 import { SectionTitle, ProgressBar, ScoreCard, Navigation } from './components'
 import { connect } from 'react-redux'
-import { login, logout } from './actions/AuthActions'
+import { logout } from './actions/AuthActions'
 
 /*
            1/6-ish                                 2/3-ish                               1/6-ish