diff --git a/broker/job.go b/broker/job.go index 6225cf1..31100ea 100644 --- a/broker/job.go +++ b/broker/job.go @@ -4,7 +4,7 @@ import ( "encoding/base64" "fmt" "local/truckstop/config" - "local/truckstop/logtr" + "local/truckstop/zip" "strings" "time" ) @@ -86,9 +86,17 @@ func (j Job) FormatMultilineText() string { } out := "" clients := config.Clients(j.Pickup.Date) + useZip := config.Get().Brokers.UseZips + zipRadius := config.Get().Brokers.RadiusMiles + jobZip := zip.FromCityState(j.Pickup.City, j.Pickup.State) for k := range clients { - logtr.Debugf("job multiline: %+v contains %s then use %v", clients[k].States, j.Pickup.State, k) - if strings.Contains(fmt.Sprint(clients[k].States), j.Pickup.State) { + should := strings.Contains(fmt.Sprint(clients[k].States), j.Pickup.State) + if useZip { + for _, z := range clients[k].Zips { + should = should || zip.Get(z).MilesTo(jobZip) <= zipRadius + } + } + if should { if len(out) > 0 { out += "\n" } diff --git a/config.json b/config.json index d812aa1..4f7b8e6 100644 --- a/config.json +++ b/config.json @@ -49,7 +49,8 @@ "NC" ], "Zips": [ - "27006" + "27006", + "84058" ], "IDs": { "Matrix": "@bel:m.bltrucks.top" @@ -78,14 +79,14 @@ "RadiusMiles": 100, "FastExact": { "Enabled": true, - "Mock": true, + "Mock": false, "Username": "birdman", "Password": "166647" }, "NTG": { "Enabled": false, "JobInfo": true, - "Mock": true, + "Mock": false, "LoadPageURIFormat": "https://ntgvision.com/LoadDetails?loadId=%d", "LoadPageAPIURIFormat": "https://ntgvision.com/api/v1/load/LoadDetails?loadId==%d", "Username": "noeasyrunstrucking@gmail.com",