cmd/main.go

@@ -1,39 +1,19 @@
 package main
 
 import (
-	"fmt"
 	"net/http"
 	"os"
-	"path"
 
 	"haberdasher-twirp/haberdasher"
 	"haberdasher-twirp/internal/haberdasherserver"
 )
 
 func main() {
-	var cwd, dbPath, dbDir string
-	var err error
-
 	var bind string = ":8080"
-
-	cwd, err = os.Getwd()
-	dbPath = path.Join(cwd, "var/hat.db")
-	dbDir = path.Dir(dbPath)
-
-	if _, err = os.Stat(dbDir); os.IsNotExist(err) {
-		err = os.Mkdir(dbDir, 0700)
-		if err != nil {
-			fmt.Printf("boltdb: %s\n", err)
-		}
-	}
-
 	if len(os.Args) > 1 {
 		bind = os.Args[1]
 	}
-
+	server := &haberdasherserver.Server{}
-	fmt.Printf("boltdb: %s\n", dbPath)
-
-	server := &haberdasherserver.Server{DBPath: dbPath}
 	twirpHandler := haberdasher.NewHaberdasherServer(server)
 
 	http.ListenAndServe(bind, twirpHandler)

internal/haberdasherserver/server.go

@@ -16,9 +16,7 @@ import (
 
 const dbBucket = "hats"
 
-type Server struct {
+type Server struct{}
-	DBPath string
-}
 
 type Hat struct {
 	Inches int32  `json:"inchues"`
@@ -66,7 +64,7 @@ func HatQueryToHatQueryModel(q *pb.HatQuery) HatQuery {
 }
 
 func (s *Server) MakeHat(ctx context.Context, size *pb.Size) (hat *pb.Hat, err error) {
-	st, _ := NewStore(s.DBPath, 0600, nil)
+	st, _ := NewStore("hat.db", 0600, nil)
 	defer st.Close()
 
 	if size.Inches <= 0 {
@@ -87,7 +85,22 @@ func (s *Server) MakeHat(ctx context.Context, size *pb.Size) (hat *pb.Hat, err e
 }
 
 func (s *Server) ListHats(ctx context.Context, q *pb.HatQuery) (hats *pb.Hats, err error) {
-	st, _ := NewStore(s.DBPath, 0600, nil)
+	/*
+		var hat *pb.Hat
+
+		hats = &pb.Hats{}
+
+		for i := 0; i < 10; i++ {
+			hat = &pb.Hat{
+				Inches: int32(rand.Intn(12)),
+				Color:  []string{"white", "black", "red", "blue"}[rand.Intn(4)],
+				Name:   []string{"bowler", "baseball cap", "top hat", "derby"}[rand.Intn(3)],
+			}
+			hats.Hats = append(hats.Hats, hat)
+		}
+	*/
+
+	st, _ := NewStore("hat.db", 0600, nil)
 	defer st.Close()
 
 	hs, err := st.ListHats(HatQueryToHatQueryModel(q))