mirror of
https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git
synced 2025-08-03 02:09:15 +02:00
feat:#150 extracted functions rewrote error pipe for feed routes
This commit is contained in:
@@ -5,23 +5,21 @@ import (
|
||||
"encoding/json"
|
||||
"htwkalender/model"
|
||||
"htwkalender/service/db"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/jordic/goics"
|
||||
"github.com/labstack/echo/v5"
|
||||
"github.com/pocketbase/pocketbase"
|
||||
"github.com/pocketbase/pocketbase/apis"
|
||||
)
|
||||
|
||||
const expirationTime = 5 * time.Minute
|
||||
|
||||
func Feed(c echo.Context, app *pocketbase.PocketBase, token string) error {
|
||||
func Feed(app *pocketbase.PocketBase, token string) (string, error) {
|
||||
var result string
|
||||
var responseWriter = c.Response().Writer
|
||||
|
||||
feed, err := db.FindFeedByToken(token, app)
|
||||
if feed == nil && err != nil {
|
||||
return c.JSON(http.StatusNotFound, err)
|
||||
return "", err
|
||||
}
|
||||
|
||||
modules := make(map[string]model.FeedCollection)
|
||||
@@ -34,17 +32,11 @@ func Feed(c echo.Context, app *pocketbase.PocketBase, token string) error {
|
||||
|
||||
newFeed, err := createFeedForToken(app, modules)
|
||||
if err != nil {
|
||||
return c.JSON(http.StatusInternalServerError, err)
|
||||
return "", err
|
||||
}
|
||||
result = newFeed.Content
|
||||
|
||||
responseWriter.Header().Set("Content-type", "text/calendar")
|
||||
responseWriter.Header().Set("charset", "utf-8")
|
||||
responseWriter.Header().Set("Content-Disposition", "inline")
|
||||
responseWriter.Header().Set("filename", "calendar.ics")
|
||||
writeSuccess(result, responseWriter)
|
||||
c.Response().Writer = responseWriter
|
||||
return nil
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func createFeedForToken(app *pocketbase.PocketBase, modules map[string]model.FeedCollection) (*model.FeedModel, error) {
|
||||
@@ -60,14 +52,6 @@ func createFeedForToken(app *pocketbase.PocketBase, modules map[string]model.Fee
|
||||
return feed, nil
|
||||
}
|
||||
|
||||
func writeSuccess(message string, w http.ResponseWriter) {
|
||||
w.WriteHeader(http.StatusOK)
|
||||
_, err := w.Write([]byte(message))
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func CreateIndividualFeed(requestBody []byte, app *pocketbase.PocketBase) (string, error) {
|
||||
var modules []model.FeedCollection
|
||||
|
||||
|
Reference in New Issue
Block a user