From e36f08deba9e6362e4cc1591588628a58123e3c5 Mon Sep 17 00:00:00 2001
From: Bel LaPointe <breel@qualtrics.com>
Date: Fri, 27 Oct 2023 20:59:42 -0600
Subject: [PATCH] clean routing and move .html to ./public/

---
 cmd/clitest/main.go                 | 49 ++++++++++++++++++-----------
 cmd/clitest/{ => public}/index.html |  0
 2 files changed, 30 insertions(+), 19 deletions(-)
 rename cmd/clitest/{ => public}/index.html (100%)

diff --git a/cmd/clitest/main.go b/cmd/clitest/main.go
index 31ea29b..545e717 100644
--- a/cmd/clitest/main.go
+++ b/cmd/clitest/main.go
@@ -9,7 +9,6 @@ import (
 	"maps"
 	"net/http"
 	"os"
-	"path"
 	"slices"
 	"sort"
 	"strconv"
@@ -43,12 +42,6 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	deltas, err := f.Deltas()
-	if err != nil {
-		panic(err)
-	}
-
-	deltas = deltas.Group(ledger.GroupName(*groupName), ledger.GroupDate(*groupDate))
 
 	bpis := make(ledger.BPIs)
 	if *bpiPath != "" {
@@ -58,28 +51,41 @@ func main() {
 		}
 	}
 
-	like := ledger.Likes{ledger.LikeName(*likeName)}
-
 	if *httpOutput != "" {
-		like = append(like, ledger.LikeBefore(*likeBefore))
-		like = append(like, ledger.LikeAfter(*likeAfter))
-
 		foo := func(w http.ResponseWriter, r *http.Request) {
-			switch path.Dir(r.URL.Path) {
-			case "/api":
-			case "/":
-				f, err := os.Open("./index.html")
+			if strings.HasPrefix(r.URL.Path, "/api") {
+			} else if strings.HasPrefix(r.URL.Path, "/transactions") {
+				f, err := os.Open("./public/transactions.html")
 				if err != nil {
 					panic(err)
 				}
 				defer f.Close()
 				io.Copy(w, f)
 				return
-			default:
+			} else if strings.HasPrefix(r.URL.Path, "/graph") || r.URL.Path == "/" {
+				f, err := os.Open("./public/index.html")
+				if err != nil {
+					panic(err)
+				}
+				defer f.Close()
+				io.Copy(w, f)
+				return
+			} else {
 				http.NotFound(w, r)
 				return
 			}
 
+			deltas, err := f.Deltas()
+			if err != nil {
+				panic(err)
+			}
+			deltas = deltas.Group(ledger.GroupName(*groupName), ledger.GroupDate(*groupDate))
+			like := ledger.Likes{
+				ledger.LikeName(*likeName),
+				ledger.LikeBefore(*likeBefore),
+				ledger.LikeAfter(*likeAfter),
+			}
+
 			foolike := make(ledger.Likes, 0)
 			for _, v := range r.URL.Query()["likeName"] {
 				foolike = append(foolike, ledger.LikeName(v))
@@ -93,8 +99,7 @@ func main() {
 			if len(foolike) == 0 {
 				foolike = like
 			}
-
-			deltas := deltas.Like(foolike...)
+			deltas = deltas.Like(foolike...)
 
 			// MODIFIERS
 			for i, whatIf := range r.URL.Query()["whatIf"] {
@@ -299,6 +304,12 @@ func main() {
 			panic(err)
 		}
 	} else {
+		deltas, err := f.Deltas()
+		if err != nil {
+			panic(err)
+		}
+		deltas = deltas.Group(ledger.GroupName(*groupName), ledger.GroupDate(*groupDate))
+		like := ledger.Likes{ledger.LikeName(*likeName)}
 		if *likeLedger {
 			like = append(like, ledger.LikeBefore(*likeBefore))
 			like = append(like, ledger.LikeAfter(*likeAfter))
diff --git a/cmd/clitest/index.html b/cmd/clitest/public/index.html
similarity index 100%
rename from cmd/clitest/index.html
rename to cmd/clitest/public/index.html