From 1e3e48422d682257afc33943f8df4fdfd626d563 Mon Sep 17 00:00:00 2001 From: Elmar Kresse <18119527+masterElmar@users.noreply.github.com> Date: Wed, 25 Oct 2023 18:39:22 +0200 Subject: [PATCH] fix:#16 fixed database search for module in migration --- backend/service/ical/icalJsonMigrate.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/service/ical/icalJsonMigrate.go b/backend/service/ical/icalJsonMigrate.go index 17afdbf..94ac33d 100644 --- a/backend/service/ical/icalJsonMigrate.go +++ b/backend/service/ical/icalJsonMigrate.go @@ -30,7 +30,7 @@ func MigrateFeedJson(app *pocketbase.PocketBase) error { var uuidFeedCollections []model.FeedCollection for _, module := range modules { - uuid := searchUUIDForModule(app, module.Name) + uuid := searchUUIDForModule(app, module) if uuid != "" { uuidFeedCollections = append(uuidFeedCollections, model.FeedCollection{UUID: uuid, Name: module.Name, Course: module.Course, UserDefinedName: module.UserDefinedName}) @@ -48,9 +48,9 @@ func MigrateFeedJson(app *pocketbase.PocketBase) error { return nil } -func searchUUIDForModule(app *pocketbase.PocketBase, moduleName string) string { +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}", dbx.Params{"name": moduleName})).One(&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 "" }