new places

This commit is contained in:
Simon Martens
2026-01-09 14:45:11 +01:00
parent 8903da2350
commit 80c28eca4e
15 changed files with 1028 additions and 137 deletions

View File

@@ -52,3 +52,18 @@ func nextAgentMusenalmID(app core.App) (int, error) {
}
return agent.MusenalmID() + 1, nil
}
func nextPlaceMusenalmID(app core.App) (int, error) {
var place dbmodels.Place
err := app.RecordQuery(dbmodels.PLACES_TABLE).
OrderBy(dbmodels.MUSENALMID_FIELD + " DESC").
Limit(1).
One(&place)
if err != nil {
if errors.Is(err, sql.ErrNoRows) {
return 1, nil
}
return 0, err
}
return place.MusenalmID() + 1, nil
}

333
controllers/ort_edit.go Normal file
View File

@@ -0,0 +1,333 @@
package controllers
import (
"fmt"
"net/http"
"net/url"
"slices"
"strings"
"github.com/Theodor-Springmann-Stiftung/musenalm/app"
"github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels"
"github.com/Theodor-Springmann-Stiftung/musenalm/middleware"
"github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels"
"github.com/Theodor-Springmann-Stiftung/musenalm/templating"
"github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/core"
"github.com/pocketbase/pocketbase/tools/router"
"github.com/pocketbase/pocketbase/tools/types"
)
const (
URL_ORT = "/ort/{id}/"
URL_ORT_EDIT = "edit"
URL_ORT_DELETE = "edit/delete"
TEMPLATE_ORT_EDIT = "/ort/edit/"
)
func init() {
pep := &OrtEditPage{
StaticPage: pagemodels.StaticPage{
Name: pagemodels.P_ORT_EDIT_NAME,
URL: URL_ORT_EDIT,
Template: TEMPLATE_ORT_EDIT,
Layout: pagemodels.LAYOUT_LOGIN_PAGES,
},
}
app.Register(pep)
}
type OrtEditPage struct {
pagemodels.StaticPage
}
func (p *OrtEditPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
rg := router.Group(URL_ORT)
rg.BindFunc(middleware.IsAdminOrEditor())
rg.GET(URL_ORT_EDIT, p.GET(engine, app))
rg.POST(URL_ORT_EDIT, p.POST(engine, app))
rg.POST(URL_ORT_DELETE, p.POSTDelete(engine, app))
return nil
}
type OrtEditResult struct {
Place *dbmodels.Place
User *dbmodels.User
Prev *dbmodels.Place
Next *dbmodels.Place
Entries []*dbmodels.Entry
}
func NewOrtEditResult(app core.App, id string) (*OrtEditResult, error) {
place, err := dbmodels.Places_ID(app, id)
if err != nil {
return nil, err
}
var user *dbmodels.User
if place.Editor() != "" {
u, err := dbmodels.Users_ID(app, place.Editor())
if err == nil {
user = u
} else {
app.Logger().Error("Failed to load user for place editor", "place", place.Id, "error", err)
}
}
prev, next, err := placeNeighbors(app, place.Id)
if err != nil {
app.Logger().Error("Failed to load place neighbors", "place", place.Id, "error", err)
}
entries, err := placeEntries(app, place.Id)
if err != nil {
app.Logger().Error("Failed to load place entries", "place", place.Id, "error", err)
}
if len(entries) > 0 {
dbmodels.Sort_Entries_Year_Title(entries)
}
return &OrtEditResult{
Place: place,
User: user,
Prev: prev,
Next: next,
Entries: entries,
}, nil
}
func (p *OrtEditPage) GET(engine *templating.Engine, app core.App) HandleFunc {
return func(e *core.RequestEvent) error {
id := e.Request.PathValue("id")
data := make(map[string]any)
result, err := NewOrtEditResult(app, id)
if err != nil {
return engine.Response404(e, err, data)
}
data["result"] = result
req := templating.NewRequest(e)
data["csrf_token"] = req.Session().Token
if msg := e.Request.URL.Query().Get("saved_message"); msg != "" {
data["success"] = msg
}
return engine.Response200(e, p.Template, data, p.Layout)
}
}
func (p *OrtEditPage) renderError(engine *templating.Engine, app core.App, e *core.RequestEvent, message string) error {
id := e.Request.PathValue("id")
data := make(map[string]any)
result, err := NewOrtEditResult(app, id)
if err != nil {
return engine.Response404(e, err, data)
}
data["result"] = result
data["error"] = message
req := templating.NewRequest(e)
data["csrf_token"] = req.Session().Token
return engine.Response200(e, p.Template, data, p.Layout)
}
type ortEditForm struct {
CSRFToken string `form:"csrf_token"`
LastEdited string `form:"last_edited"`
Name string `form:"name"`
Pseudonyms string `form:"pseudonyms"`
Annotation string `form:"annotation"`
URI string `form:"uri"`
Fictional bool `form:"fictional"`
Status string `form:"status"`
Comment string `form:"edit_comment"`
}
func applyPlaceForm(place *dbmodels.Place, formdata ortEditForm, name string, status string, user *dbmodels.FixedUser) {
place.SetName(name)
place.SetPseudonyms(strings.TrimSpace(formdata.Pseudonyms))
place.SetAnnotation(strings.TrimSpace(formdata.Annotation))
place.SetURI(strings.TrimSpace(formdata.URI))
place.SetFictional(formdata.Fictional)
place.SetEditState(status)
place.SetComment(strings.TrimSpace(formdata.Comment))
if user != nil {
place.SetEditor(user.Id)
}
}
func (p *OrtEditPage) POST(engine *templating.Engine, app core.App) HandleFunc {
return func(e *core.RequestEvent) error {
id := e.Request.PathValue("id")
req := templating.NewRequest(e)
formdata := ortEditForm{}
if err := e.BindBody(&formdata); err != nil {
return p.renderError(engine, app, e, "Formulardaten ungültig.")
}
if err := req.CheckCSRF(formdata.CSRFToken); err != nil {
return p.renderError(engine, app, e, err.Error())
}
place, err := dbmodels.Places_ID(app, id)
if err != nil {
return engine.Response404(e, err, nil)
}
if formdata.LastEdited != "" {
lastEdited, err := types.ParseDateTime(formdata.LastEdited)
if err != nil {
return p.renderError(engine, app, e, "Ungültiger Bearbeitungszeitstempel.")
}
if !place.Updated().Time().Equal(lastEdited.Time()) {
return p.renderError(engine, app, e, "Der Ort wurde inzwischen geändert. Bitte Seite neu laden.")
}
}
name := strings.TrimSpace(formdata.Name)
if name == "" {
return p.renderError(engine, app, e, "Name ist erforderlich.")
}
status := strings.TrimSpace(formdata.Status)
if status == "" || !slices.Contains(dbmodels.EDITORSTATE_VALUES, status) {
return p.renderError(engine, app, e, "Ungültiger Status.")
}
user := req.User()
if err := app.RunInTransaction(func(tx core.App) error {
applyPlaceForm(place, formdata, name, status, user)
return tx.Save(place)
}); err != nil {
app.Logger().Error("Failed to save place", "place_id", place.Id, "error", err)
return p.renderError(engine, app, e, "Speichern fehlgeschlagen.")
}
redirect := fmt.Sprintf("/ort/%s/edit?saved_message=%s", id, url.QueryEscape("Änderungen gespeichert."))
return e.Redirect(http.StatusSeeOther, redirect)
}
}
type ortDeletePayload struct {
CSRFToken string `json:"csrf_token"`
LastEdited string `json:"last_edited"`
}
func (p *OrtEditPage) POSTDelete(engine *templating.Engine, app core.App) HandleFunc {
return func(e *core.RequestEvent) error {
id := e.Request.PathValue("id")
req := templating.NewRequest(e)
payload := ortDeletePayload{}
if err := e.BindBody(&payload); err != nil {
return e.JSON(http.StatusBadRequest, map[string]any{
"error": "Ungültige Formulardaten.",
})
}
if err := req.CheckCSRF(payload.CSRFToken); err != nil {
return e.JSON(http.StatusBadRequest, map[string]any{
"error": err.Error(),
})
}
place, err := dbmodels.Places_ID(app, id)
if err != nil {
return e.JSON(http.StatusNotFound, map[string]any{
"error": "Ort wurde nicht gefunden.",
})
}
if payload.LastEdited != "" {
lastEdited, err := types.ParseDateTime(payload.LastEdited)
if err != nil {
return e.JSON(http.StatusBadRequest, map[string]any{
"error": "Ungültiger Bearbeitungszeitstempel.",
})
}
if !place.Updated().Time().Equal(lastEdited.Time()) {
return e.JSON(http.StatusConflict, map[string]any{
"error": "Der Ort wurde inzwischen geändert. Bitte Seite neu laden.",
})
}
}
entries, err := placeEntries(app, place.Id)
if err != nil {
return e.JSON(http.StatusInternalServerError, map[string]any{
"error": "Löschen fehlgeschlagen.",
})
}
if err := app.RunInTransaction(func(tx core.App) error {
for _, entry := range entries {
updatedPlaces := []string{}
for _, placeID := range entry.Places() {
if placeID != place.Id {
updatedPlaces = append(updatedPlaces, placeID)
}
}
entry.SetPlaces(updatedPlaces)
if err := tx.Save(entry); err != nil {
return err
}
}
record, err := tx.FindRecordById(dbmodels.PLACES_TABLE, place.Id)
if err != nil {
return err
}
return tx.Delete(record)
}); err != nil {
app.Logger().Error("Failed to delete place", "place_id", place.Id, "error", err)
return e.JSON(http.StatusInternalServerError, map[string]any{
"error": "Löschen fehlgeschlagen.",
})
}
return e.JSON(http.StatusOK, map[string]any{
"success": true,
"redirect": "/orte",
})
}
}
func placeEntries(app core.App, placeID string) ([]*dbmodels.Entry, error) {
entries := []*dbmodels.Entry{}
err := app.RecordQuery(dbmodels.ENTRIES_TABLE).
Where(dbx.NewExp(
dbmodels.PLACES_TABLE+" = {:id} OR (json_valid("+dbmodels.PLACES_TABLE+") = 1 AND EXISTS (SELECT 1 FROM json_each("+dbmodels.PLACES_TABLE+") WHERE value = {:id}))",
dbx.Params{"id": placeID},
)).
All(&entries)
return entries, err
}
func placeNeighbors(app core.App, currentID string) (*dbmodels.Place, *dbmodels.Place, error) {
places := []*dbmodels.Place{}
if err := app.RecordQuery(dbmodels.PLACES_TABLE).All(&places); err != nil {
return nil, nil, err
}
if len(places) == 0 {
return nil, nil, nil
}
dbmodels.Sort_Places_Name(places)
for index, item := range places {
if item.Id != currentID {
continue
}
var prev *dbmodels.Place
var next *dbmodels.Place
if index > 0 {
prev = places[index-1]
}
if index+1 < len(places) {
next = places[index+1]
}
return prev, next, nil
}
return nil, nil, nil
}

140
controllers/ort_new.go Normal file
View File

@@ -0,0 +1,140 @@
package controllers
import (
"fmt"
"net/http"
"net/url"
"slices"
"strings"
"github.com/Theodor-Springmann-Stiftung/musenalm/app"
"github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels"
"github.com/Theodor-Springmann-Stiftung/musenalm/middleware"
"github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels"
"github.com/Theodor-Springmann-Stiftung/musenalm/templating"
"github.com/pocketbase/pocketbase/core"
"github.com/pocketbase/pocketbase/tools/router"
)
const (
URL_ORTE_NEW = "/orte/new/"
)
func init() {
pnp := &OrtNewPage{
StaticPage: pagemodels.StaticPage{
Name: pagemodels.P_ORT_NEW_NAME,
URL: URL_ORTE_NEW,
Template: TEMPLATE_ORT_EDIT,
Layout: pagemodels.LAYOUT_LOGIN_PAGES,
},
}
app.Register(pnp)
}
type OrtNewPage struct {
pagemodels.StaticPage
}
func (p *OrtNewPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
rg := router.Group(URL_ORTE_NEW)
rg.BindFunc(middleware.IsAdminOrEditor())
rg.GET("", p.GET(engine, app))
rg.POST("", p.POST(engine, app))
return nil
}
func (p *OrtNewPage) GET(engine *templating.Engine, app core.App) HandleFunc {
return func(e *core.RequestEvent) error {
req := templating.NewRequest(e)
return p.renderPage(engine, app, e, req, "")
}
}
func (p *OrtNewPage) renderPage(engine *templating.Engine, app core.App, e *core.RequestEvent, req *templating.Request, message string) error {
data := make(map[string]any)
collection, err := app.FindCollectionByNameOrId(dbmodels.PLACES_TABLE)
if err != nil {
return engine.Response500(e, err, data)
}
place := dbmodels.NewPlace(core.NewRecord(collection))
place.SetEditState("Unknown")
result := &OrtEditResult{
Place: place,
User: nil,
Prev: nil,
Next: nil,
Entries: []*dbmodels.Entry{},
}
data["result"] = result
data["csrf_token"] = req.Session().Token
data["is_new"] = true
if message != "" {
data["error"] = message
}
return engine.Response200(e, p.Template, data, p.Layout)
}
func (p *OrtNewPage) POST(engine *templating.Engine, app core.App) HandleFunc {
return func(e *core.RequestEvent) error {
req := templating.NewRequest(e)
formdata := ortEditForm{}
if err := e.BindBody(&formdata); err != nil {
return p.renderPage(engine, app, e, req, "Formulardaten ungültig.")
}
if err := req.CheckCSRF(formdata.CSRFToken); err != nil {
return p.renderPage(engine, app, e, req, err.Error())
}
name := strings.TrimSpace(formdata.Name)
if name == "" {
return p.renderPage(engine, app, e, req, "Name ist erforderlich.")
}
status := strings.TrimSpace(formdata.Status)
if status == "" || !slices.Contains(dbmodels.EDITORSTATE_VALUES, status) {
return p.renderPage(engine, app, e, req, "Ungültiger Status.")
}
var createdPlace *dbmodels.Place
user := req.User()
if err := app.RunInTransaction(func(tx core.App) error {
collection, err := tx.FindCollectionByNameOrId(dbmodels.PLACES_TABLE)
if err != nil {
return err
}
place := dbmodels.NewPlace(core.NewRecord(collection))
nextID, err := nextPlaceMusenalmID(tx)
if err != nil {
return err
}
place.SetMusenalmID(nextID)
applyPlaceForm(place, formdata, name, status, user)
if err := tx.Save(place); err != nil {
return err
}
createdPlace = place
return nil
}); err != nil {
app.Logger().Error("Failed to create place", "error", err)
return p.renderPage(engine, app, e, req, "Speichern fehlgeschlagen.")
}
if createdPlace == nil {
return p.renderPage(engine, app, e, req, "Speichern fehlgeschlagen.")
}
redirect := fmt.Sprintf(
"/ort/%s/edit?saved_message=%s",
createdPlace.Id,
url.QueryEscape("Änderungen gespeichert."),
)
return e.Redirect(http.StatusSeeOther, redirect)
}
}

52
controllers/orte.go Normal file
View File

@@ -0,0 +1,52 @@
package controllers
import (
"github.com/Theodor-Springmann-Stiftung/musenalm/app"
"github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels"
"github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels"
"github.com/Theodor-Springmann-Stiftung/musenalm/templating"
"github.com/pocketbase/pocketbase/core"
"github.com/pocketbase/pocketbase/tools/router"
)
const (
URL_ORTE = "/orte/"
TEMPLATE_ORTE = "/orte/"
)
func init() {
op := &OrtePage{
StaticPage: pagemodels.StaticPage{
Name: pagemodels.P_ORTE_NAME,
URL: URL_ORTE,
Template: TEMPLATE_ORTE,
Layout: templating.DEFAULT_LAYOUT_NAME,
},
}
app.Register(op)
}
type OrtePage struct {
pagemodels.StaticPage
}
type OrteResult struct {
Places []*dbmodels.Place
}
func (p *OrtePage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
router.GET(URL_ORTE, func(e *core.RequestEvent) error {
places := []*dbmodels.Place{}
if err := app.RecordQuery(dbmodels.PLACES_TABLE).All(&places); err != nil {
return engine.Response500(e, err, nil)
}
if len(places) > 0 {
dbmodels.Sort_Places_Name(places)
}
data := map[string]any{
"result": &OrteResult{Places: places},
}
return engine.Response200(e, p.Template, data, p.Layout)
})
return nil
}