Decoupling server / engine / kgpz

This commit is contained in:
Simon Martens
2025-01-09 02:41:03 +01:00
parent a62a09b258
commit f998ce61c6
11 changed files with 189 additions and 94 deletions

View File

@@ -3,9 +3,9 @@ package controllers
import (
"strings"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/app"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/helpers/logging"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/viewmodels"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/xmlmodels"
"github.com/gofiber/fiber/v2"
)
@@ -13,11 +13,11 @@ const (
DEFAULT_AGENT = "a"
)
func GetAgents(kgpz *app.KGPZ) fiber.Handler {
func GetAgents(kgpz *xmlmodels.Library) fiber.Handler {
return func(c *fiber.Ctx) error {
a := c.Params("letterorid", DEFAULT_AGENT)
a = strings.ToLower(a)
agents := viewmodels.AgentsView(a, kgpz.Library)
agents := viewmodels.AgentsView(a, kgpz)
if len(agents.Agents) == 0 {
logging.Error(nil, "No agents found for letter or id: "+a)
return c.SendStatus(fiber.StatusNotFound)

View File

@@ -1,11 +1,11 @@
package controllers
import (
"github.com/Theodor-Springmann-Stiftung/kgpz_web/app"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/xmlmodels"
"github.com/gofiber/fiber/v2"
)
func GetCategory(kgpz *app.KGPZ) fiber.Handler {
func GetCategory(kgpz *xmlmodels.Library) fiber.Handler {
return func(c *fiber.Ctx) error {
return c.Render("/kategorie/", nil)
}

View File

@@ -3,9 +3,9 @@ package controllers
import (
"strconv"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/app"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/helpers/logging"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/viewmodels"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/xmlmodels"
"github.com/gofiber/fiber/v2"
)
@@ -14,7 +14,7 @@ const (
MAXYEAR = 1779
)
func GetIssue(kgpz *app.KGPZ) fiber.Handler {
func GetIssue(kgpz *xmlmodels.Library) fiber.Handler {
return func(c *fiber.Ctx) error {
y := c.Params("year")
yi, err := strconv.Atoi(y)
@@ -30,7 +30,7 @@ func GetIssue(kgpz *app.KGPZ) fiber.Handler {
return c.SendStatus(fiber.StatusNotFound)
}
issue, err := viewmodels.NewSingleIssueView(y, d, kgpz.Library)
issue, err := viewmodels.NewSingleIssueView(y, d, kgpz)
if err != nil {
logging.Error(err, "Issue could not be found")

View File

@@ -1,11 +1,11 @@
package controllers
import (
"github.com/Theodor-Springmann-Stiftung/kgpz_web/app"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/xmlmodels"
"github.com/gofiber/fiber/v2"
)
func GetPlace(kgpz *app.KGPZ) fiber.Handler {
func GetPlace(kgpz *xmlmodels.Library) fiber.Handler {
return func(c *fiber.Ctx) error {
return c.Render("/ort/", nil)
}

View File

@@ -3,13 +3,13 @@ package controllers
import (
"strconv"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/app"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/helpers/logging"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/viewmodels"
"github.com/Theodor-Springmann-Stiftung/kgpz_web/xmlmodels"
"github.com/gofiber/fiber/v2"
)
func GetYear(kgpz *app.KGPZ) fiber.Handler {
func GetYear(kgpz *xmlmodels.Library) fiber.Handler {
return func(c *fiber.Ctx) error {
y := c.Params("year", strconv.Itoa(MINYEAR))
yi, err := strconv.Atoi(y)
@@ -19,7 +19,7 @@ func GetYear(kgpz *app.KGPZ) fiber.Handler {
return c.SendStatus(fiber.StatusNotFound)
}
view, err := viewmodels.YearView(yi, kgpz.Library)
view, err := viewmodels.YearView(yi, kgpz)
if err != nil {
logging.ErrorDebug(err, "Keine Ausgaben für das Jahr "+y)
return c.SendStatus(fiber.StatusNotFound)