fix(page): fix AddPage not checking if the template actually existed.

This commit is contained in:
2026-05-27 23:07:08 +02:00
parent ae65322aa0
commit 664ae1f7d3
3 changed files with 32 additions and 7 deletions
+13
View File
@@ -15,6 +15,7 @@ const GETSPECIFICSVGSQL string = "SELECT * FROM svg WHERE id = ?;"
const GETSVGSQL string = "SELECT * FROM svg;" const GETSVGSQL string = "SELECT * FROM svg;"
const DELETESVGSQL string = "DELETE FROM svg WHERE id = ?;" const DELETESVGSQL string = "DELETE FROM svg WHERE id = ?;"
const RENAMESVGSQL string = "UPDATE svg SET name = ? WHERE id = ?;" const RENAMESVGSQL string = "UPDATE svg SET name = ? WHERE id = ?;"
const EXISTSSVGSQL string = "SELECT COUNT(*) FROM svg WHERE id = ?;"
func InsertSVG(data *svg.TemplateData) error { func InsertSVG(data *svg.TemplateData) error {
if _, err := database.Exec(INSERTSVGSQL, data.Id, data.Name); err != nil { if _, err := database.Exec(INSERTSVGSQL, data.Id, data.Name); err != nil {
@@ -93,3 +94,15 @@ func RenameSvg(id string, name string) error {
} }
return nil return nil
} }
func Exists(id string) (bool, error) {
res := database.QueryRow(EXISTSSVGSQL, id)
var count int
if err := res.Scan(&count); err != nil {
return false, err
}
return count > 0, nil
}
+12
View File
@@ -2,6 +2,7 @@ package actions
import ( import (
"bytes" "bytes"
"errors"
"fmt" "fmt"
"io" "io"
"log" "log"
@@ -15,6 +16,17 @@ import (
const FILEFORMAT string = "%s-%d" const FILEFORMAT string = "%s-%d"
func AddPage(id string, svgbuf []byte) (svg.TemplatePage, error) { func AddPage(id string, svgbuf []byte) (svg.TemplatePage, error) {
exists, err := database.Exists(id)
if err != nil {
return svg.TemplatePage{}, err
}
if !exists {
return svg.TemplatePage{}, errors.New("Template does not exist.")
}
data := svg.TemplatePage{TemplateId: id} data := svg.TemplatePage{TemplateId: id}
populateKeys(&data, svgbuf) populateKeys(&data, svgbuf)
+7 -7
View File
@@ -10,11 +10,15 @@ import (
) )
func Create(svgbufs [][]byte, name string) (svg.TemplateData, error) { func Create(svgbufs [][]byte, name string) (svg.TemplateData, error) {
id := generateId() data := svg.TemplateData{Id: generateId(), Name: name}
if err := database.InsertSVG(&data); err != nil {
return svg.TemplateData{}, err
}
pages := make([]svg.TemplatePage, len(svgbufs)) pages := make([]svg.TemplatePage, len(svgbufs))
for i, pagebuf := range svgbufs { for i, pagebuf := range svgbufs {
page, err := AddPage(id, pagebuf) page, err := AddPage(data.Id, pagebuf)
if err != nil { if err != nil {
return svg.TemplateData{}, err return svg.TemplateData{}, err
@@ -23,11 +27,7 @@ func Create(svgbufs [][]byte, name string) (svg.TemplateData, error) {
pages[i] = page pages[i] = page
} }
data := svg.TemplateData{Id: id, Name: name, Pages: pages} data.Pages = pages
if err := database.InsertSVG(&data); err != nil {
return svg.TemplateData{}, err
}
log.Println("Created SVG Template " + data.Id) log.Println("Created SVG Template " + data.Id)
return data, nil return data, nil