Fix SetNextRun timezones, update Makefile

City-Bureau · Sep 19, 2019 · a52e73f · a52e73f
1 parent 3ef86ab
commit a52e73f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,10 @@
+.PHONY: install test build deploy clean
+
 functions := $(shell find functions -name \*main.go | awk -F'/' '{print $$2}')
 
+install:
+	npm install
+
 test:
 	go test ./...
 
@@ -8,5 +13,8 @@ build:
 		env GOOS=linux go build -ldflags="-s -w" -o bin/$$function functions/$$function/main.go ; \
 	done
 
+deploy:
+	serverless deploy
+
 clean:
 	rm -rf bin
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ You'll need GNU Make, Go and node.js installed as well as credentials for AWS an
 To install dependencies, build functions and deploy:
 
 ```bash
-npm install
+make install
 make build
-sls deploy
+make deploy
 ```
diff --git a/pkg/models/bill.go b/pkg/models/bill.go
@@ -244,15 +244,18 @@ func (b *Bill) CreateTweet(billUrl string) string {
 func (b *Bill) SetNextRun() {
 	// Set NextRun to a time in the future within a defined range
 	loc, _ := time.LoadLocation("America/Chicago")
-	now := time.Now().In(loc)
+	now := time.Now().Add(time.Hour * time.Duration(12)).In(loc)
+	_, offset := now.Zone()
+
 	// Make sure it's between 9AM and 10PM Chicago with some randomness to stagger posts
+	localHour := now.Hour() + (offset / 3600)
 	diffHours := 24
 	diffMinutes := 0
-	if now.Hour() < 9 {
-		diffHours = diffHours + (9 - now.Hour()) + rand.Intn(4)
+	if localHour < 9 {
+		diffHours = diffHours + (9 - localHour) + rand.Intn(4)
 		diffMinutes = rand.Intn(60)
-	} else if now.Hour() > 17 {
-		diffHours = diffHours - (now.Hour() - 17) - rand.Intn(4)
+	} else if localHour > 17 {
+		diffHours = diffHours - (localHour - 17) - rand.Intn(4)
 		diffMinutes = -rand.Intn(60)
 	}
 	nextRun := now.Add(time.Hour * time.Duration(diffHours)).Add(time.Minute * time.Duration(diffMinutes))

diff --git a/pkg/models/bill_test.go b/pkg/models/bill_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"testing"
+	"time"
 )
 
 func TestUnmarshalBill(t *testing.T) {
@@ -54,7 +55,12 @@ func TestGetCleanBillID(t *testing.T) {
 func TestSetNextRun(t *testing.T) {
 	bill := Bill{}
 	bill.SetNextRun()
-	if bill.NextRun.Hour() < 9 || bill.NextRun.Hour() > 17 {
+	loc, _ := time.LoadLocation("America/Chicago")
+	now := time.Now().In(loc)
+	_, offset := now.Zone()
+	localHour := bill.NextRun.Hour() + (offset / 3600)
+
+	if localHour < 9 || localHour > 17 {
 		t.Errorf("Hour: %d is outside range 9AM-10PM", bill.NextRun.Hour())
 	}
 }

diff --git a/serverless.yml b/serverless.yml
@@ -150,7 +150,7 @@ functions:
         - Ref: ServerlessSubnetB
         - Ref: ServerlessSubnetC
     events:
-      - schedule: rate(4 hours)
+      - schedule: cron(3 2,14,17,20,23 * * ? *)
   update_bill:
     handler: bin/update_bill
     timeout: 120