From d71d3ccdefcbddbb5eccb9ed5eadc5d6c26ecffa Mon Sep 17 00:00:00 2001 From: Vernon Keenan Date: Fri, 19 Feb 2021 09:47:02 -0800 Subject: [PATCH] split places --- api/geo/geo_models/place.go | 3 +++ app/force.go | 2 +- app/place-helpers.go | 2 ++ app/place.go | 1 + app/root.go | 2 -- swagger/geo-taxnexus.yaml | 3 +++ 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/api/geo/geo_models/place.go b/api/geo/geo_models/place.go index f3fd614..0d433dc 100644 --- a/api/geo/geo_models/place.go +++ b/api/geo/geo_models/place.go @@ -134,6 +134,9 @@ type Place struct { // sales tax rate SalesTaxRate *TaxRate `json:"SalesTaxRate,omitempty"` + // Is this place that is split by county boundaries? + Split bool `json:"Split,omitempty"` + // State Code StateCode string `json:"StateCode,omitempty"` diff --git a/app/force.go b/app/force.go index 521af2b..d76108e 100644 --- a/app/force.go +++ b/app/force.go @@ -9,7 +9,7 @@ func InitForce(serviceAccountName string) *force.API { sugar.Infof("app.initForce: 📥 %s", serviceAccountName) acct := GetServiceAccount(serviceAccountName) theForce, err := force.Create( - "v45.0", + "v49.0", acct.ClientID, acct.ClientSecret, acct.Username, diff --git a/app/place-helpers.go b/app/place-helpers.go index c56cf70..f1074a4 100644 --- a/app/place-helpers.go +++ b/app/place-helpers.go @@ -54,6 +54,7 @@ func UnMarshalPlace(s *geo_models.Place) *Place { RevenueNet: s.RevenueNet, RevenueNotTaxable: s.RevenueNotTaxable, Revneuebase: s.RevenueBase, + Split: s.Split, StateCode: s.StateCode, StateID: s.StateID, Status: s.Status, @@ -135,6 +136,7 @@ func (obj *Place) MarshalToSwagger() *geo_models.Place { RevenueNet: obj.RevenueNet, RevenueNotTaxable: obj.RevenueNotTaxable, SalesTaxRate: salesTaxRate, + Split: obj.Split, StateID: obj.StateID, Status: obj.Status, Subtotal: obj.Subtotal, diff --git a/app/place.go b/app/place.go index d6cee9f..e814360 100644 --- a/app/place.go +++ b/app/place.go @@ -54,6 +54,7 @@ type Place struct { RevenueNotTaxable float64 Revneuebase float64 SalesTaxRate *TaxRate + Split bool StateCode string StateID string Status string diff --git a/app/root.go b/app/root.go index 1735a97..48c3599 100644 --- a/app/root.go +++ b/app/root.go @@ -47,8 +47,6 @@ const countyGeocodeLength = 7 var maxTaxTypes = int64(2000) //nolint:gomnd // it's a var const -// const cityGeocodeLength = 12 - // InitConfig exports the config initialization func func InitConfig(systemName string, initalLogLevel zapcore.Level) { if configured { diff --git a/swagger/geo-taxnexus.yaml b/swagger/geo-taxnexus.yaml index 699c4ab..a17223f 100644 --- a/swagger/geo-taxnexus.yaml +++ b/swagger/geo-taxnexus.yaml @@ -2093,6 +2093,9 @@ definitions: SalesTaxRate: $ref: "#/definitions/TaxRate" type: object + Split: + type: boolean + description: Is this place that is split by county boundaries? StateID: description: State type: string