feat:#11 merge conflicts

backend/service/ical/ical.go

@@ -16,8 +16,6 @@ import (
 const expirationTime = 5 * time.Minute
 
 func Feed(c echo.Context, app *pocketbase.PocketBase, token string) error {
-	layout := "2006-01-02 15:04:05 -0700 MST"
-
 	var result string
 	var responseWriter = c.Response().Writer
 	feed, err := db.FindFeedByToken(token, app)
@@ -25,11 +23,11 @@ func Feed(c echo.Context, app *pocketbase.PocketBase, token string) error {
 		return c.JSON(http.StatusNotFound, err)
 	}
 
-	created, _ := time.Parse(layout, feed.Created)
+	created := feed.Created
 
 	var modules []model.FeedCollection
 	_ = json.Unmarshal([]byte(feed.Modules), &modules)
-	if created.Add(time.Hour * 265).Before(time.Now()) {
+	if created.Time().Add(time.Hour * 265).Before(time.Now()) {
 		newFeed, err := createFeedForToken(app, modules)
 		if err != nil {
 			return c.JSON(http.StatusInternalServerError, err)

backend/service/ical/icalJsonMigrate.go

@@ -0,0 +1,58 @@
+package ical
+
+import (
+	"encoding/json"
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase"
+	"htwkalender/model"
+)
+
+//update ical feed json
+//add uuid field
+//remove module name field
+
+func MigrateFeedJson(app *pocketbase.PocketBase) error {
+
+	records, err := app.Dao().FindRecordsByFilter("feeds", "1=1", "-created", 0, 0)
+	if err != nil {
+		return err
+	}
+
+	for _, feed := range records {
+
+		var modules []model.FeedCollection
+
+		err := json.Unmarshal([]byte(feed.GetString("modules")), &modules)
+		if err != nil {
+			return err
+		}
+
+		var uuidFeedCollections []model.FeedCollection
+
+		for _, module := range modules {
+			uuid := searchUUIDForModule(app, module)
+
+			if uuid != "" {
+				uuidFeedCollections = append(uuidFeedCollections, model.FeedCollection{UUID: uuid, Name: module.Name, Course: module.Course, UserDefinedName: module.UserDefinedName})
+			}
+		}
+
+		jsonModules, _ := json.Marshal(uuidFeedCollections)
+		feed.Set("modules", string(jsonModules))
+
+		err = app.Dao().SaveRecord(feed)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func searchUUIDForModule(app *pocketbase.PocketBase, module model.FeedCollection) string {
+	var event model.Event
+	err := app.Dao().DB().Select("*").From("events").Where(dbx.NewExp("Name = {:name} AND course = {:course}", dbx.Params{"name": module.Name, "course": module.Course})).One(&event)
+	if err != nil {
+		return ""
+	}
+	return event.UUID
+}