Added endpoint for shares

This commit is contained in:
2026-03-04 14:23:09 +01:00
parent 2f4e0bb8ce
commit 91997686d1
7 changed files with 102 additions and 10 deletions

View File

@@ -1,7 +1,6 @@
package auth package auth
import ( import (
"os"
"time" "time"
"github.com/golang-jwt/jwt/v5" "github.com/golang-jwt/jwt/v5"
@@ -13,8 +12,6 @@ type Claims struct {
jwt.RegisteredClaims jwt.RegisteredClaims
} }
var secret = os.Getenv("SHAP_JWT_SECRET")
func GenerateJWT(userID, role string, secret []byte) (string, error) { func GenerateJWT(userID, role string, secret []byte) (string, error) {
claims := Claims{ claims := Claims{
UserID: userID, UserID: userID,

View File

@@ -236,7 +236,7 @@ func UserInfo(w http.ResponseWriter, r *http.Request) {
err = json.NewEncoder(w).Encode(map[string]interface{}{ err = json.NewEncoder(w).Encode(map[string]interface{}{
"id": user.ID, "id": user.ID,
"name": user.Username, "name": user.Username,
"avatar_url": nil, "avatar_url": "",
}) })
if err != nil { if err != nil {
log.Println("GET [api/userinfo] " + r.RemoteAddr + ": " + err.Error()) log.Println("GET [api/userinfo] " + r.RemoteAddr + ": " + err.Error())

View File

@@ -7,6 +7,7 @@ import (
"shap-planner-backend/models" "shap-planner-backend/models"
"shap-planner-backend/storage" "shap-planner-backend/storage"
"shap-planner-backend/utils" "shap-planner-backend/utils"
"strings"
"time" "time"
) )
@@ -21,7 +22,9 @@ func Expenses(w http.ResponseWriter, r *http.Request) {
http.Error(w, "Something went wrong", http.StatusInternalServerError) http.Error(w, "Something went wrong", http.StatusInternalServerError)
return return
} }
err = json.NewEncoder(w).Encode(expenses) err = json.NewEncoder(w).Encode(map[string]interface{}{
"expenses": expenses,
})
if err != nil { if err != nil {
log.Println("GET [api/expense] " + r.RemoteAddr + ": " + err.Error()) log.Println("GET [api/expense] " + r.RemoteAddr + ": " + err.Error())
return return
@@ -102,4 +105,56 @@ func Expenses(w http.ResponseWriter, r *http.Request) {
http.Error(w, "Invalid request method", http.StatusMethodNotAllowed) http.Error(w, "Invalid request method", http.StatusMethodNotAllowed)
} }
} }
func ExpenseShares(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
query := r.URL.Query()
idParam := query.Get("id")
idTypeParam := strings.ToLower(query.Get("idType"))
if idTypeParam == models.IDTypeEXPENSE {
println(idParam)
shares, err := storage.GetSharesByExpenseId(idParam)
if err != nil {
log.Println("GET [api/shares] " + r.RemoteAddr + ": " + err.Error())
http.Error(w, "Something went wrong", http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(map[string]interface{}{
"shares": shares,
})
if err != nil {
log.Println("GET [api/shares] " + r.RemoteAddr + ": " + err.Error())
return
}
log.Println("GET [api/shares] " + r.RemoteAddr + ": Successfully retrieved shares")
} else if idTypeParam == models.IDTypeSHARE || idTypeParam == "" {
share, err := storage.GetShareById(idParam)
if err != nil {
log.Println("GET [api/shares] " + r.RemoteAddr + ": " + err.Error())
http.Error(w, "Something went wrong", http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(map[string]interface{}{
"id": share.ID,
"expense_id": share.ExpenseID,
"user_id": share.UserID,
"share_cents": share.ShareCents,
})
if err != nil {
log.Println("GET [api/shares] " + r.RemoteAddr + ": " + err.Error())
return
}
log.Println("GET [api/shares] " + r.RemoteAddr + ": Successfully retrieved shares")
}
break
case http.MethodPut:
break
case http.MethodDelete:
break
default:
http.Error(w, "Invalid request method", http.StatusMethodNotAllowed)
}
}
func AdminPanel(w http.ResponseWriter, r *http.Request) {} func AdminPanel(w http.ResponseWriter, r *http.Request) {}

14
models/constants.go Normal file
View File

@@ -0,0 +1,14 @@
package models
// Roles
const (
RoleUser = "user"
RoleAdmin = "admin"
)
// ID-Types
const (
IDTypeSHARE = "share"
IDTypeEXPENSE = "expense"
IDTypeUSER = "user"
)

View File

@@ -24,8 +24,3 @@ type ExpenseShare struct {
UserID string `json:"user_id"` UserID string `json:"user_id"`
ShareCents int64 `json:"share_cents"` ShareCents int64 `json:"share_cents"`
} }
const (
RoleUser = "user"
RoleAdmin = "admin"
)

View File

@@ -62,6 +62,7 @@ func (server *Server) Run() {
// Login required // Login required
mux.Handle("/api/expenses", auth.AuthMiddleware(server.JWTSecret)(http.HandlerFunc(handlers.Expenses))) mux.Handle("/api/expenses", auth.AuthMiddleware(server.JWTSecret)(http.HandlerFunc(handlers.Expenses)))
mux.Handle("/api/shares", auth.AuthMiddleware(server.JWTSecret)(http.HandlerFunc(handlers.ExpenseShares)))
mux.Handle("/api/balance", auth.AuthMiddleware(server.JWTSecret)(http.HandlerFunc(handlers.GetBalance))) mux.Handle("/api/balance", auth.AuthMiddleware(server.JWTSecret)(http.HandlerFunc(handlers.GetBalance)))
mux.Handle("/api/ping", auth.AuthMiddleware(server.JWTSecret)(http.HandlerFunc(handlers.TestHandler))) mux.Handle("/api/ping", auth.AuthMiddleware(server.JWTSecret)(http.HandlerFunc(handlers.TestHandler)))
mux.Handle("/api/userinfo", auth.AuthMiddleware(server.JWTSecret)(http.HandlerFunc(handlers.UserInfo))) mux.Handle("/api/userinfo", auth.AuthMiddleware(server.JWTSecret)(http.HandlerFunc(handlers.UserInfo)))

View File

@@ -160,6 +160,36 @@ func AddShare(share *models.ExpenseShare) error {
share.ShareCents) share.ShareCents)
return err return err
} }
func GetShareById(id string) (models.ExpenseShare, error) {
row := DB.QueryRow("SELECT * FROM expense_shares WHERE id = ?", id)
var share models.ExpenseShare
err := row.Scan(&share.ID, &share.ExpenseID, &share.UserID, &share.ShareCents)
return share, err
}
func GetSharesByExpenseId(id string) ([]models.ExpenseShare, error) {
query := "SELECT * FROM expense_shares WHERE expense_id = ?"
rows, err := DB.Query(query, id)
if err != nil {
return nil, err
}
defer rows.Close()
var shares []models.ExpenseShare
for rows.Next() {
var share models.ExpenseShare
err := rows.Scan(&share.ID, &share.ExpenseID, &share.UserID, &share.ShareCents)
if err != nil {
return nil, err
}
shares = append(shares, share)
}
if err = rows.Err(); err != nil {
return nil, err
}
return shares, nil
}
// Balances // Balances
func ComputeBalance(userId string) (float64, error) { func ComputeBalance(userId string) (float64, error) {