Move addressSearch to where it belongs

Author: JacobMcKenzieSmarty

us-enrichment-api/client.go

@@ -109,20 +109,29 @@ func buildRequest(lookup enrichmentLookup) *http.Request {
 func buildLookupURL(lookup enrichmentLookup) string {
 	var newLookupURL string
 	if len(lookup.getDataSubset()) == 0 {
-		newLookupURL = strings.Replace(lookupURLWithoutSubSet, lookupURLSmartyKey, lookup.getSmartyKey(), 1)
+		newLookupURL = strings.Replace(lookupURLWithoutSubSet, lookupURLSmartyKey, getLookupURLSmartyKeyReplacement(lookup), 1)
 	} else {
-		newLookupURL = strings.Replace(lookupURLWithSubSet, lookupURLSmartyKey, lookup.getSmartyKey(), 1)
+		newLookupURL = strings.Replace(lookupURLWithSubSet, lookupURLSmartyKey, getLookupURLSmartyKeyReplacement(lookup), 1)
 	}
 
 	newLookupURL = strings.Replace(newLookupURL, lookupURLDataSet, lookup.getDataSet(), 1)
 	return strings.TrimSuffix(strings.Replace(newLookupURL, lookupURLDataSubSet, lookup.getDataSubset(), 1), "/")
 }
 
+func getLookupURLSmartyKeyReplacement(lookup enrichmentLookup) string {
+	if len(lookup.getSmartyKey()) > 0 {
+		return lookup.getSmartyKey()
+	} else {
+		return addressSearch
+	}
+}
+
 const (
 	lookupURLSmartyKey     = ":smartykey"
 	lookupURLDataSet       = ":dataset"
 	lookupURLDataSubSet    = ":datasubset"
 	lookupURLWithSubSet    = "/lookup/" + lookupURLSmartyKey + "/" + lookupURLDataSet + "/" + lookupURLDataSubSet // Remaining parts will be completed later by the sdk.BaseURLClient.
 	lookupURLWithoutSubSet = "/lookup/" + lookupURLSmartyKey + "/" + lookupURLDataSet                             // Remaining parts will be completed later by the sdk.BaseURLClient.
 	lookupETagHeader       = "Etag"
+	addressSearch          = "search"
 )

us-enrichment-api/lookup.go

@@ -37,9 +37,6 @@ type universalLookup struct {
 }
 
 func (g *universalLookup) getSmartyKey() string {
-	if len(g.Lookup.SmartyKey) == 0 {
-		return addressSearch
-	}
 	return g.Lookup.SmartyKey
 }
 func (g *universalLookup) getDataSet() string       { return g.DataSet }
@@ -87,9 +84,6 @@ type financialLookup struct {
 }
 
 func (f *financialLookup) getSmartyKey() string {
-	if len(f.Lookup.SmartyKey) == 0 {
-		return addressSearch
-	}
 	return f.Lookup.SmartyKey
 }
 
@@ -143,9 +137,6 @@ type principalLookup struct {
 }
 
 func (p *principalLookup) getSmartyKey() string {
-	if len(p.Lookup.SmartyKey) == 0 {
-		return addressSearch
-	}
 	return p.Lookup.SmartyKey
 }
 
@@ -213,9 +204,6 @@ func (g *geoReferenceLookup) populate(query url.Values) {
 }
 
 func (g *geoReferenceLookup) getSmartyKey() string {
-	if len(g.Lookup.SmartyKey) == 0 {
-		return addressSearch
-	}
 	return g.Lookup.SmartyKey
 }
 
@@ -255,9 +243,6 @@ type secondaryLookup struct {
 }
 
 func (s *secondaryLookup) getSmartyKey() string {
-	if len(s.Lookup.SmartyKey) == 0 {
-		return addressSearch
-	}
 	return s.SmartyKey
 }
 
@@ -311,9 +296,6 @@ type secondaryCountLookup struct {
 }
 
 func (s *secondaryCountLookup) getSmartyKey() string {
-	if len(s.Lookup.SmartyKey) == 0 {
-		return addressSearch
-	}
 	return s.SmartyKey
 }
 
@@ -367,7 +349,6 @@ const (
 	secondaryData       = "secondary"
 	secondaryDataCount  = "count"
 	emptyDataSubset     = ""
-	addressSearch       = "search"
 )
 
 func (l Lookup) populateInclude(query url.Values) {