HTWK/htwkalender-pwa
1
0
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender-pwa.git synced 2025-08-10 21:53:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat:#53 added merge events for ical feed

Browse Source
This commit is contained in:
Elmar Kresse
2024-04-08 00:16:27 +02:00
parent c05dbc423c
commit e6f35845d2
4 changed files with 163 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
backend/service/ical/ical.go
View File

@@ -33,22 +33,22 @@ const expirationTime = 5 * time.Minute
func Feed(app *pocketbase.PocketBase, token string) (string, error) {
var result string
feed, err := db.FindFeedByToken(token, app)
if feed == nil && err != nil {
icalFeed, err := db.FindFeedByToken(token, app)
if icalFeed == nil && err != nil {
return "", err
}
modules := make(map[string]model.FeedCollection)
var modulesArray []model.FeedCollection
_ = json.Unmarshal([]byte(feed.Modules), &modulesArray)
_ = json.Unmarshal([]byte(icalFeed.Modules), &modulesArray)
for _, module := range modulesArray {
modules[module.UUID] = module
}
newFeed, err := createFeedForToken(app, modules)
if err != nil {
return "", err
newFeed, createFeedErr := createFeedForToken(app, modules)
if createFeedErr != nil {
return "", createFeedErr
}
result = newFeed.Content
@@ -56,16 +56,18 @@ func Feed(app *pocketbase.PocketBase, token string) (string, error) {
}
func createFeedForToken(app *pocketbase.PocketBase, modules map[string]model.FeedCollection) (*model.FeedModel, error) {
res, err := db.GetPlanForModules(app, modules)
events, err := db.GetPlanForModules(app, modules)
if err != nil {
return nil, apis.NewNotFoundError("Could not fetch events", err)
}
// Combine Events
//events = feed.CombineEventsInFeed(events)
b := bytes.Buffer{}
goics.NewICalEncode(&b).Encode(IcalModel{Events: res, Mapping: modules})
feed := &model.FeedModel{Content: b.String(), ExpiresAt: time.Now().Add(expirationTime)}
return feed, nil
goics.NewICalEncode(&b).Encode(IcalModel{Events: events, Mapping: modules})
icalFeed := &model.FeedModel{Content: b.String(), ExpiresAt: time.Now().Add(expirationTime)}
return icalFeed, nil
}
func CreateIndividualFeed(requestBody []byte, app *pocketbase.PocketBase) (string, error) {
@@ -76,16 +78,16 @@ func CreateIndividualFeed(requestBody []byte, app *pocketbase.PocketBase) (strin
return "", apis.NewNotFoundError("Could not parse request body", err)
}
var feed model.Feed
var icalFeed model.Feed
jsonModules, _ := json.Marshal(modules)
feed.Modules = string(jsonModules)
icalFeed.Modules = string(jsonModules)
collection, dbError := db.FindCollection(app, "feeds")
if dbError != nil {
return "", apis.NewNotFoundError("Collection could not be found", dbError)
}
record, err := db.SaveFeed(feed, collection, app)
record, err := db.SaveFeed(icalFeed, collection, app)
if err != nil {
return "", apis.NewNotFoundError("Could not save feed", err)
}

10
backend/service/ical/icalFileGeneration.go
View File

@@ -156,18 +156,18 @@ func addPropertyIfNotEmpty(component *goics.Component, key string, value string)
func generateDescription(event model.Event) string {
var description string
if !functions.OnlyWhitespace(event.Notes) {
description += "Notizen: " + event.Notes + "\n"
}
if !functions.OnlyWhitespace(event.Prof) {
description += "Prof: " + event.Prof + "\n"
description += "Profs: " + event.Prof + "\n"
}
if !functions.OnlyWhitespace(event.Course) {
description += "Gruppe: " + event.Course + "\n"
description += "Gruppen: " + event.Course + "\n"
}
if !functions.OnlyWhitespace(event.EventType) {
description += "Typ: " + event.EventType + event.Compulsory + "\n"
}
if !functions.OnlyWhitespace(event.Notes) {
description += "Notizen: " + event.Notes + "\n"
}
return description
}