added UserDefined Module Naming

backend/service/ical/ical.go

@@ -7,8 +7,8 @@ import (
 	"github.com/labstack/echo/v5"
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/apis"
-	model "htwkalender/model"
-	db "htwkalender/service/db"
+	"htwkalender/model"
+	"htwkalender/service/db"
 	"io"
 	"net/http"
 	"time"
@@ -28,10 +28,7 @@ func Feed(c echo.Context, app *pocketbase.PocketBase, token string) error {
 
 	created, _ := time.Parse(layout, feed.Created)
 
-	var modules []struct {
-		Name   string `db:"Name" json:"Name"`
-		Course string `db:"course" json:"Course"`
-	}
+	var modules []model.FeedCollection
 	_ = json.Unmarshal([]byte(feed.Modules), &modules)
 	if created.Add(time.Hour * 265).Before(time.Now()) {
 		newFeed, err := createFeedForToken(app, modules)
@@ -50,30 +47,26 @@ func Feed(c echo.Context, app *pocketbase.PocketBase, token string) error {
 	return nil
 }
 
-func createFeedForToken(app *pocketbase.PocketBase, modules []struct {
-	Name   string `db:"Name" json:"Name"`
-	Course string `db:"course" json:"Course"`
-}) (*model.FeedModel, error) {
+func createFeedForToken(app *pocketbase.PocketBase, modules []model.FeedCollection) (*model.FeedModel, error) {
 	res := db.GetPlanForModules(app, modules)
 	b := bytes.Buffer{}
-	goics.NewICalEncode(&b).Encode(res)
+	goics.NewICalEncode(&b).Encode(IcalModel{Events: res, Mapping: modules})
 	feed := &model.FeedModel{Content: b.String(), ExpiresAt: time.Now().Add(expirationTime)}
 	return feed, nil
 }
 
 func writeSuccess(message string, w http.ResponseWriter) {
 	w.WriteHeader(http.StatusOK)
-	w.Write([]byte(message))
+	_, err := w.Write([]byte(message))
+	if err != nil {
+		return
+	}
 }
 
 func CreateIndividualFeed(c echo.Context, app *pocketbase.PocketBase) error {
 
 	// read json from request body
-	var modules []struct {
-		Name   string `db:"Name" json:"Name"`
-		Course string `db:"course" json:"Course"`
-	}
-
+	var modules []model.FeedCollection
 	requestBodyBytes, err := io.ReadAll(c.Request().Body)
 	if err != nil {
 		return apis.NewApiError(400, "Could not bind request body", err)

backend/service/ical/icalFileGeneration.go

@@ -0,0 +1,67 @@
+package ical
+
+import (
+	"github.com/jordic/goics"
+	"htwkalender/model"
+	"htwkalender/service/functions"
+	"time"
+)
+
+// local type for EmitICal function
+type IcalModel struct {
+	Events  model.Events
+	Mapping []model.FeedCollection
+}
+
+// EmitICal implements the interface for goics
+func (icalModel IcalModel) EmitICal() goics.Componenter {
+	layout := "2006-01-02 15:04:05 -0700 MST"
+	c := goics.NewComponent()
+	c.SetType("VCALENDAR")
+	c.AddProperty("VERSION", "2.0")
+	c.AddProperty("CALSCAL", "GREGORIAN")
+	c.AddProperty("TZID", "Europe/Berlin")
+	c.AddProperty("X-WR-CALNAME", "HTWK Kalender")
+	c.AddProperty("X-WR-TIMEZONE", "Europe/Berlin")
+	c.AddProperty("X-LIC-LOCATION", "Europe/Berlin")
+	for _, event := range icalModel.Events {
+		s := goics.NewComponent()
+		s.SetType("VEVENT")
+		timeEnd, _ := time.Parse(layout, event.End)
+		timeStart, _ := time.Parse(layout, event.Start)
+		k, v := goics.FormatDateTime("DTEND;TZID=Europe/Berlin", timeEnd)
+		s.AddProperty(k, v)
+		k, v = goics.FormatDateTime("DTSTART;TZID=Europe/Berlin", timeStart)
+		s.AddProperty(k, v)
+		s.AddProperty("SUMMARY", replaceNameIfUserDefined(event.Name, icalModel.Mapping))
+		s.AddProperty("DESCRIPTION", generateDescription(event))
+		s.AddProperty("LOCATION", event.Rooms)
+		c.AddComponent(s)
+	}
+	return c
+}
+
+func replaceNameIfUserDefined(name string, mapping []model.FeedCollection) string {
+	for _, mapEntry := range mapping {
+		if mapEntry.Name == name {
+			return mapEntry.UserDefinedName
+		}
+	}
+	return name
+}
+
+func generateDescription(event *model.Event) string {
+	var description string
+
+	if !functions.CheckIfOnlyWhitespace(event.Notes) {
+		description += "Notizen: " + event.Notes + "\n"
+	}
+	if !functions.CheckIfOnlyWhitespace(event.Prof) {
+		description += "Prof: " + event.Prof + "\n"
+	}
+	if !functions.CheckIfOnlyWhitespace(event.Course) {
+		description += "Gruppe: " + event.Course + "\n"
+	}
+
+	return description
+}