diff --git a/src/TODO.md b/src/TODO.md
index 86e9f3b..3d4c9d6 100644
--- a/src/TODO.md
+++ b/src/TODO.md
@@ -11,7 +11,7 @@ used
- [X] Reduce the size of the font file
- [X] Add some migration tool
- [X] Ownership on the image for the expenses webapp dir need to be changed
-- [ ] The button for deleting share rows isn't working at all unlike the payments
+- [X] The button for deleting share rows isn't working at all unlike the payments
- [X] Use shopspring/decimal for money handling
- [ ] Rename this file
diff --git a/src/assets/htmx/expensePaymentsTable.html b/src/assets/htmx/expensePaymentsTable.html
index a4f8980..49280a8 100644
--- a/src/assets/htmx/expensePaymentsTable.html
+++ b/src/assets/htmx/expensePaymentsTable.html
@@ -63,6 +63,7 @@
type="button"
class="delete-button"
hx-delete="/payments/{{ $payment.ExpPaymID }}"
+ hx-on="htmx:afterRequest: this.closest('tr').remove()"
hx-target="closest tr">X
diff --git a/src/assets/htmx/expenseShares.html b/src/assets/htmx/expenseShares.html
index 9ee0b61..9dd6701 100644
--- a/src/assets/htmx/expenseShares.html
+++ b/src/assets/htmx/expenseShares.html
@@ -58,7 +58,12 @@
value="{{ $share.Share }}" class="tui-input">
- X
+ X
{{ end }}
diff --git a/src/cmd/server.go b/src/cmd/server.go
index 474b0f4..3109a8d 100644
--- a/src/cmd/server.go
+++ b/src/cmd/server.go
@@ -54,6 +54,7 @@ func setRoutes(router *gin.Engine) {
pages.RouteStores(router)
pages.RouteTypes(router)
pages.RoutePayments(router)
+ pages.RouteShares(router)
pages.RouteOverview(router)
pages.RouteNotFound(router)
pages.RouteServerError(router)
diff --git a/src/expenses/db/queries/shares.sql b/src/expenses/db/queries/shares.sql
index c3c66a3..11afb36 100644
--- a/src/expenses/db/queries/shares.sql
+++ b/src/expenses/db/queries/shares.sql
@@ -17,3 +17,6 @@ VALUES(?, ?, ?);
UPDATE expensesShares
SET "UserID" = ?, "Share" = ?
WHERE "ExpShareID" = ?;
+
+-- name: DeleteShare :execresult
+DELETE FROM "expensesShares" where "ExpShareID" = ?;
diff --git a/src/expenses/db/repository/shares.sql.go b/src/expenses/db/repository/shares.sql.go
index 0201d65..f44d670 100644
--- a/src/expenses/db/repository/shares.sql.go
+++ b/src/expenses/db/repository/shares.sql.go
@@ -10,6 +10,14 @@ import (
"database/sql"
)
+const deleteShare = `-- name: DeleteShare :execresult
+DELETE FROM "expensesShares" where "ExpShareID" = ?
+`
+
+func (q *Queries) DeleteShare(ctx context.Context, expshareid int64) (sql.Result, error) {
+ return q.db.ExecContext(ctx, deleteShare, expshareid)
+}
+
const getShares = `-- name: GetShares :many
SELECT
shares.ExpShareID, shares.ExpID, shares.UserID, shares.Share, users.UserID, users.UserName, users.UserPass
diff --git a/src/expenses/expenseShares.go b/src/expenses/expenseShares.go
index cf33231..fb310bd 100644
--- a/src/expenses/expenseShares.go
+++ b/src/expenses/expenseShares.go
@@ -45,3 +45,22 @@ func ParseFormShares(userIDs []string, shares []string, sharesIDs []string,
return shareList, nil
}
+
+func (s *Service) DeleteShare(id int64) error {
+ tx, err := s.DB.Begin()
+ if err != nil {
+ return err
+ }
+ defer tx.Rollback()
+
+ share := mod.ExpenseShare{
+ ExpShareID: id,
+ }
+
+ err = share.Delete(tx)
+ if err != nil {
+ return err
+ }
+
+ return tx.Commit()
+}
diff --git a/src/expenses/models/expenseShare.go b/src/expenses/models/expenseShare.go
index afe57f4..b20af31 100644
--- a/src/expenses/models/expenseShare.go
+++ b/src/expenses/models/expenseShare.go
@@ -76,3 +76,22 @@ func (sh *ExpenseShare) Update(tx *sql.Tx) error {
return nil
}
+
+func (sh *ExpenseShare) Delete(tx *sql.Tx) error {
+ ctx := context.Background()
+
+ queries := repo.New(tx)
+ res, err := queries.DeleteShare(ctx, sh.ExpShareID)
+ if err != nil {
+ return err
+ }
+
+ rowsAffected, err := res.RowsAffected()
+ if err != nil {
+ return err
+ } else if rowsAffected == 0 {
+ return fmt.Errorf("no rows were created")
+ }
+
+ return nil
+}
diff --git a/src/pages/shares.go b/src/pages/shares.go
new file mode 100644
index 0000000..7b09dce
--- /dev/null
+++ b/src/pages/shares.go
@@ -0,0 +1,37 @@
+package pages
+
+import (
+ exp "expenses/expenses"
+ experr "expenses/expenses/errors"
+ "fmt"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+)
+
+func deleteShare(c *gin.Context) {
+ shareID, err := exp.ParseID(c.Param("id"))
+ if err != nil {
+ NotFoundView(c, "failed to fetch payment")
+ return
+ }
+
+ err = exp.Serv.DeleteShare(shareID)
+ if err == experr.ErrNotFound {
+ errMsg := fmt.Sprintf("share %d not found", shareID)
+ c.String(http.StatusNotFound, errMsg)
+ return
+ }
+
+ if err != nil {
+ errMsg := fmt.Sprintf("error deleting share %d", shareID)
+ c.String(http.StatusInternalServerError, errMsg)
+ return
+ }
+
+ c.Status(http.StatusNoContent)
+}
+
+func RouteShares(router *gin.Engine) {
+ router.DELETE("/shares/:id", deleteShare)
+}