accept !radius for miles radius search

broker/ntgvision.go

@@ -221,43 +221,7 @@ func (ntg NTGVision) SearchZips(zips []string) ([]Job, error) {
 	return jobs, nil
 }
 
-func (ntg NTGVision) workingHours(now time.Time) bool {
-	// TODO assert M-F 9-4 EST
-	now = now.In(time.FixedZone("EST", -5*60*60))
-	working := config.Get().Brokers.NTG.Working
-	logtr.Debugf("ntg.workingHours: now=%s, weekday=%v, hour=%v (ok=%+v)", now.String(), now.Weekday(), now.Hour(), working)
-	if ok := func() bool {
-		for _, hr := range working.Hours {
-			if now.Hour() == hr {
-				return true
-			}
-		}
-		return false
-	}(); !ok {
-		return false
-	}
-	if ok := func() bool {
-		for _, weekday := range working.Weekdays {
-			if now.Weekday() == time.Weekday(weekday) {
-				return true
-			}
-		}
-		return false
-	}(); !ok {
-		return false
-	}
-	return true
-}
-
 func (ntg NTGVision) SearchStates(states []config.State) ([]Job, error) {
-	if !ntg.workingHours(time.Now()) {
-		lastNtgB, _ := config.Get().DB().Get("ntg_last_search_states")
-		var jobs []Job
-		json.Unmarshal(lastNtgB, &jobs)
-		logtr.Verbosef("ntg.SearchStates: outside of working hours so returning ntg_last_search_states: %+v", jobs)
-		return jobs, nil
-	}
-
 	rc, err := ntg.searcher.searchStates(states)
 	if err != nil {
 		return nil, err
@@ -273,22 +237,12 @@ func (ntg NTGVision) SearchStates(states []config.State) ([]Job, error) {
 
 	var ntgjobs []ntgVisionJob
 	err = json.Unmarshal(b, &ntgjobs)
-	if err != nil {
-		return nil, err
-	}
 
 	jobs := make([]Job, len(ntgjobs))
 	for i := range jobs {
 		jobs[i] = ntgjobs[i].Job()
 	}
-
-	jobsB, err := json.Marshal(jobs)
-	if err == nil {
-		config.Get().DB().Set("ntg_last_search_states", jobsB)
-		logtr.Verbosef("ntg.SearchStates: in working hours so setting ntg_last_search_states: %+v", jobs)
-	}
-
-	return jobs, nil
+	return jobs, err
 }
 
 func getNTGTokenKey() string {
@@ -380,7 +334,7 @@ func (ntg NTGVision) _searchStates(states []config.State) (io.ReadCloser, error)
 		request2, _ := ntg.newRequest(states)
 		requestb, _ := ioutil.ReadAll(request2.Body)
 		logtr.Debugf("ntg auth bad status: url=%s, status=%v, body=%s, headers=%+v, request=%+v, requestb=%s", request.URL.String(), resp.StatusCode, b, resp.Header, request2, requestb)
-		if resp.StatusCode > 400 && resp.StatusCode < 404 || resp.StatusCode == 417 { // TODO wtf is 417 for
+		if resp.StatusCode > 400 && resp.StatusCode < 404 {
 			logtr.Debugf("ntg auth bad status: err no auth")
 			return nil, ErrNoAuth
 		}

broker/ntgvision_test.go

@@ -1,22 +0,0 @@
-package broker
-
-import (
-	"local/truckstop/config"
-	"os"
-	"testing"
-	"time"
-)
-
-func TestWorkingHoursNTG(t *testing.T) {
-	os.Setenv("CONFIG", "../config.json")
-	if err := config.Refresh(nil); err != nil {
-		t.Fatal(err)
-	}
-	ntg := NTGVision{}
-	if !ntg.workingHours(time.Date(2022, 1, 27, 12, 0, 0, 0, time.FixedZone("MST", -7*60*60))) {
-		t.Fatal("noon MST not ok")
-	}
-	if ntg.workingHours(time.Date(2022, 1, 27, 23, 0, 0, 0, time.FixedZone("MST", -7*60*60))) {
-		t.Fatal("midnight MST ok")
-	}
-}

config.json

@@ -79,10 +79,6 @@
       "UseZips": true,
       "RadiusMiles": 200,
       "NTG": {
-         "Working": {
-            "Hours": [6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-            "Weekdays": [1, 2, 3, 4, 5]
-         },
          "Enabled": false,
          "JobInfo": true,
          "Mock": true,
@@ -98,4 +94,4 @@
          "Password": "166647"
       }
    }
-}
+}

config.main_test.json

@@ -83,10 +83,6 @@
          "Password": "p"
       },
       "NTG": {
-         "Working": {
-            "Hours": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
-            "Weekdays": [0, 1, 2, 3, 4, 5, 6]
-         },
          "Enabled": true,
          "JobInfo": true,
          "Mock": true,

config/config.go

@@ -67,10 +67,6 @@ type Config struct {
 		UseZips     bool
 		RadiusMiles int
 		NTG         struct {
-			Working struct {
-				Hours    []int
-				Weekdays []int
-			}
 			Enabled              bool
 			JobInfo              bool
 			Mock                 bool

main.go

@@ -371,7 +371,7 @@ func __main() error {
 			logtr.Errorf("failed _main: %v", err)
 		}
 		if config.Get().Once {
-			time.Sleep(10 * time.Second)
+			time.Sleep(3 * time.Second)
 			return err
 		}
 		if err != nil {

todo.yaml

@@ -1,4 +1,7 @@
 todo:
+- fast exact does not use ID in UID because they spammy
+- from states to zip codes w/ range
+- modify old items once no longer available; drop stale jobs good candidate but requires new matrix interaction
 - more than NTG; blue one
 - !states emits current state
 - test each !command callbacks to matrix
@@ -11,11 +14,7 @@ todo:
   subtasks:
   - banlist criteria like vendors, brokers, metadata
 - set up copy for caleb, broc
-- move from main() and make more functions
 done:
-- modify old items once no longer available; drop stale jobs good candidate but requires new matrix interaction
-- from states to zip codes w/ range
-- fast exact does not use ID in UID because they spammy
 - fast exact is dumb or...?
 - try search ntg by autoinc?
 - TEST. Just like, refactor and test to shit.