diff --git a/src/assets/htmx/store.html b/src/assets/htmx/store.html index 380c734..79716de 100644 --- a/src/assets/htmx/store.html +++ b/src/assets/htmx/store.html @@ -1,12 +1,45 @@ {{ define "store" }} - - - - - - - - - -
ID:{{ .store.StoreID }}
Name:{{ .store.StoreName }}
+
+
+
+ STORE FORM +
+

+ + {{ if eq .method "put" }} + + + {{ end }} + + + +
+
+ +
+ + {{ if eq .method "put" }} + + {{ end }} + +
+
+{{ template "deleteModal" }} {{ end }} diff --git a/src/assets/htmx/storeNew.html b/src/assets/htmx/storeNew.html deleted file mode 100644 index c47ac22..0000000 --- a/src/assets/htmx/storeNew.html +++ /dev/null @@ -1,28 +0,0 @@ -{{ define "storeNew" }} -
-
-
- STORE FORM -
-

- - -

- - - - - - - -
-
-
-
-
-{{ end }} diff --git a/src/assets/htmx/terminal.html b/src/assets/htmx/terminal.html index dcaf3b2..267984f 100644 --- a/src/assets/htmx/terminal.html +++ b/src/assets/htmx/terminal.html @@ -67,8 +67,6 @@ {{ template "stores" . }} {{ else if eq .content "store" }} {{ template "store" . }} - {{ else if eq .content "storeNew" }} - {{ template "storeNew" . }} {{ else if eq .content "types" }} {{ template "types" . }} {{ else if eq .content "type" }} diff --git a/src/expenses/stores.go b/src/expenses/stores.go index dfae6ac..ff3d2b8 100644 --- a/src/expenses/stores.go +++ b/src/expenses/stores.go @@ -4,7 +4,6 @@ import ( "database/sql" "fmt" "log" - "strconv" _ "github.com/mattn/go-sqlite3" ) @@ -58,18 +57,18 @@ func GetStore(storeID int) (Store, error) { query := "SELECT StoreID,StoreName " + "FROM stores " + - "WHERE StoreID = " + strconv.Itoa(storeID) + "WHERE StoreID = ?" - var store Store - err = db.QueryRow(query).Scan(&store.StoreID, &store.StoreName) + store := Store{StoreID: -1} + err = db.QueryRow(query, storeID).Scan(&store.StoreID, &store.StoreName) if err != nil { - return Store{}, nil + return Store{StoreID: -1}, nil } return store, nil } -func (cat *Store) Insert() error { +func (s *Store) Insert() error { db, err := sql.Open("sqlite3", "./data/data.db") if err != nil { return err @@ -77,7 +76,7 @@ func (cat *Store) Insert() error { defer db.Close() query := "INSERT INTO stores(StoreName) VALUES(?)" - res, err := db.Exec(query, cat.StoreName) + res, err := db.Exec(query, s.StoreName) if err != nil { return err } @@ -92,7 +91,7 @@ func (cat *Store) Insert() error { return nil } -func (cat *Store) Delete() error { +func (s *Store) Update() error { db, err := sql.Open("sqlite3", "./data/data.db") if err != nil { return err @@ -104,8 +103,36 @@ func (cat *Store) Delete() error { return err } + query := "UPDATE stores SET StoreName = ? WHERE StoreID = ?" + res, err := db.Exec(query, s.StoreName, s.StoreID) + if err != nil { + return err + } + + rowsAffected, err := res.RowsAffected() + if err != nil { + return err + } else if rowsAffected == 0 { + return ErrNotFound + } + + return nil +} + +func (s *Store) Delete() error { + db, err := sql.Open("sqlite3", "./data/data.db") + if err != nil { + return err + } + defer db.Close() + + _, err = db.Exec("PRAGMA foreign_keys = ON") + if err != nil { + return err + } + query := "DELETE FROM stores WHERE StoreID = ?" - res, err := db.Exec(query, cat.StoreID) + res, err := db.Exec(query, s.StoreID) if err != nil { return err } diff --git a/src/pages/stores.go b/src/pages/stores.go index 7e3e75b..2078f08 100644 --- a/src/pages/stores.go +++ b/src/pages/stores.go @@ -37,12 +37,21 @@ func storePage(c *gin.Context) { } store, err := expenses.GetStore(storeID) + if err != nil { + ServerErrorView(c, fmt.Sprintf("error getting store: %+v", err.Error())) + return + } + if store.StoreID == -1 { + NotFoundView(c, fmt.Sprintf("didn't store with ID `%d`", storeID)) + return + } c.HTML(http.StatusOK, "terminal", gin.H{ "page": "store", "renderNavBar": false, "content": "store", "store": store, + "method": "put", }) } @@ -50,7 +59,8 @@ func newStorePage(c *gin.Context) { c.HTML(http.StatusOK, "terminal", gin.H{ "page": "storeNew", "renderNavBar": false, - "content": "storeNew", + "content": "store", + "method": "post", }) } @@ -69,6 +79,27 @@ func createStore(c *gin.Context) { c.Header("HX-Trigger", "{\"formState\":\"Success\"}") } +func updateStore(c *gin.Context) { + storeID, err := strconv.Atoi(c.Param("id")) + if err != nil { + c.Redirect(404, "/404") + } + newName := c.PostForm("store-name") + + newStore := expenses.Store{ + StoreID: storeID, + StoreName: newName, + } + + err = newStore.Update() + if err != nil { + c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error())) + return + } + + c.Header("HX-Trigger", "{\"formState\":\"Success\"}") +} + func deleteStore(c *gin.Context) { storeID, err := strconv.Atoi(c.Param("id")) if err != nil { @@ -101,5 +132,6 @@ func RouteStores(router *gin.Engine) { router.GET(StoresPath+"/new", newStorePage) router.POST(StoresPath+"/new", createStore) + router.PUT(StoresPath+"/:id", updateStore) router.DELETE(StoresPath+"/:id", deleteStore) }