From ef4355e2b6848d2c51d6026b7a32b3d0ef892e74 Mon Sep 17 00:00:00 2001 From: Bhasher Date: Thu, 28 Dec 2023 03:12:33 +0100 Subject: [PATCH] Fix cards --- backend/db/cards.go | 12 ++++++------ backend/handlers/cards.go | 4 ++-- backend/types/cards.go | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/db/cards.go b/backend/db/cards.go index a82a32f..fa90d8f 100644 --- a/backend/db/cards.go +++ b/backend/db/cards.go @@ -3,7 +3,7 @@ package db import "git.bhasher.com/bhasher/focus/backend/types" func CreateCard(c types.Card) (int, error) { - res, err := db.Exec("INSERT INTO cards (list_id, title, content) VALUES (?, ?, ?)", c.ListID, c.Title, c.Content) + res, err := db.Exec("INSERT INTO cards (project_id, title, content) VALUES (?, ?, ?)", c.ProjectID, c.Title, c.Content) if err != nil { return 0, err } @@ -16,8 +16,8 @@ func CreateCard(c types.Card) (int, error) { return int(id), nil } -func GetAllCardsOf(listID int) ([]types.Card, error) { - rows, err := db.Query("SELECT * FROM cards WHERE list_id = ?", listID) +func GetAllCardsOf(projectID int) ([]types.Card, error) { + rows, err := db.Query("SELECT * FROM cards WHERE project_id = ?", projectID) if err != nil { return nil, err } @@ -26,7 +26,7 @@ func GetAllCardsOf(listID int) ([]types.Card, error) { var cards []types.Card for rows.Next() { var c types.Card - if err := rows.Scan(&c.ID, &c.ListID, &c.Title, &c.Content); err != nil { + if err := rows.Scan(&c.ID, &c.ProjectID, &c.Title, &c.Content); err != nil { return nil, err } cards = append(cards, c) @@ -42,7 +42,7 @@ func GetAllCardsOf(listID int) ([]types.Card, error) { func GetCard(id int) (*types.Card, error) { var c types.Card - err := db.QueryRow("SELECT * FROM cards WHERE id = ?", id).Scan(&c.ID, &c.ListID, &c.Title, &c.Content) + err := db.QueryRow("SELECT * FROM cards WHERE id = ?", id).Scan(&c.ID, &c.ProjectID, &c.Title, &c.Content) if err != nil { return nil, err } @@ -56,6 +56,6 @@ func DeleteCard(id int) error { } func UpdateCard(c types.Card) error { - _, err := db.Exec("UPDATE cards SET list_id = ?, title = ?, content = ? WHERE id = ?", c.ListID, c.Title, c.Content, c.ID) + _, err := db.Exec("UPDATE cards SET project_id = ?, title = ?, content = ? WHERE id = ?", c.ProjectID, c.Title, c.Content, c.ID) return err } diff --git a/backend/handlers/cards.go b/backend/handlers/cards.go index ca6fcc0..925d59a 100644 --- a/backend/handlers/cards.go +++ b/backend/handlers/cards.go @@ -23,9 +23,9 @@ func CreateCards(c *fiber.Ctx) error { } func GetAllCardsOf(c *fiber.Ctx) error { - listID, err := strconv.Atoi(c.Params("list_id")) + listID, err := strconv.Atoi(c.Params("project_id")) if err != nil { - return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid list ID"}) + return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid project_id"}) } lists, err := db.GetAllListsOf(listID) diff --git a/backend/types/cards.go b/backend/types/cards.go index 39ae252..3fd5294 100644 --- a/backend/types/cards.go +++ b/backend/types/cards.go @@ -1,8 +1,8 @@ package types type Card struct { - ID int `json:"id"` - ListID int `json:"list_id"` - Title string `json:"title"` - Content string `json:"content"` + ID int `json:"id"` + ProjectID int `json:"project_id"` + Title string `json:"title"` + Content string `json:"content"` }