Merge pull request #36 from truetandem/master

Release #1 3/14/17

api/geo/usps.go

@@ -17,6 +17,15 @@ var (
 
 	// VerifyAPI is the name of that API that handles address verifications
 	VerifyAPI = "Verify"
+
+	// USPSErrorCodes contains USPS code mapping to eApp error codes
+	USPSErrorCodes = map[string]string{
+		"-2147219400":     "error.geocode.city",
+		"-2147219401":     "error.geocode.notfound",
+		"-2147219403":     "error.geocode.multiple",
+		"Default Address": "error.geocode.defaultAddress",
+		"Partial":         "error.geocode.partial",
+	}
 )
 
 // USPSGeocoder geocodes address information using the United States Post Office webservice
@@ -55,7 +64,16 @@ func (g USPSGeocoder) query(geoValues Values) (results Results, err error) {
 
 	// Check if we've encountered an error
 	if foundAddress.Error != nil {
-		return results, fmt.Errorf("%v", foundAddress.Error.Description)
+		if errCode, ok := USPSErrorCodes[foundAddress.Error.Number]; ok {
+			return results, fmt.Errorf("%v", errCode)
+		}
+		return results, fmt.Errorf("%v", "geocode.generic")
+
+	}
+
+	if strings.ContainsAny(foundAddress.ReturnText, "Default Address") {
+		errCode := USPSErrorCodes["Default Address"]
+		return results, fmt.Errorf("%v", errCode)
 	}
 
 	// Generate a normalized Result struct from the address found
@@ -64,7 +82,8 @@ func (g USPSGeocoder) query(geoValues Values) (results Results, err error) {
 	// Check if any of values requested to be validate do not match up to what was
 	// returned by the validation response. If there is a mismatch, mark as partial
 	if results.HasPartial() {
-		return results, fmt.Errorf("Geocode contains partial matches. Suggestions are available")
+		errCode := USPSErrorCodes["Partial"]
+		return results, fmt.Errorf(errCode)
 	}
 
 	return results, nil

api/model/form/state_field.go

@@ -87,4 +87,7 @@ var stateList = [...]string{
 	"PR",
 	"VI",
 	"WQ",
+	"AE",
+	"AP",
+	"AA",
 }