Merge branch 'master' of http://gogs.scratch.com:59515/bel/truckstop

broker/ntgvision.go

@@ -223,11 +223,8 @@ func (ntg NTGVision) SearchZips(zips []string) ([]Job, error) {
 
 func (ntg NTGVision) workingHours(now time.Time) bool {
 	// TODO assert M-F 9-4 EST
-	location, err := time.LoadLocation("EST")
+	now = now.In(time.FixedZone("EST", -5*60*60))
-	if err != nil {
+	logtr.Debugf("ntg.workingHours: %s: weekday=%v (sun=%v, sat=%v), hour=%v (ok=9..16)", now.String(), now.Weekday(), time.Sunday, time.Saturday, now.Hour())
-		panic(err)
-	}
-	now = now.In(location)
 	switch now.Weekday() {
 	case time.Sunday, time.Saturday:
 		return false
@@ -241,7 +238,7 @@ func (ntg NTGVision) workingHours(now time.Time) bool {
 }
 
 func (ntg NTGVision) SearchStates(states []config.State) ([]Job, error) {
-	if ntg.workingHours(time.Now()) {
+	if !ntg.workingHours(time.Now()) {
 		return nil, nil
 	}
 

broker/ntgvision_test.go

@@ -7,10 +7,10 @@ import (
 
 func TestWorkingHoursNTG(t *testing.T) {
 	ntg := NTGVision{}
-	if !ntg.workingHours(time.Date(2022, 1, 27, 12, 0, 0, 0, time.Local)) {
+	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.Local)) {
+	if ntg.workingHours(time.Date(2022, 1, 27, 23, 0, 0, 0, time.FixedZone("MST", -7*60*60))) {
 		t.Fatal("midnight MST ok")
 	}
 }

todo.yaml

@@ -1,7 +1,4 @@
 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
@@ -14,7 +11,11 @@ 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.