HTWK/htwkalender
1
1
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git synced 2026-01-18 12:32:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/development' into 49-add-htwkarte-linkout-at-ics-event-info

Browse Source 
# Conflicts:
#	services/ical/main.go
#	services/ical/service/ical/ical.go
#	services/ical/service/routes.go
This commit is contained in:
Elmar Kresse
2024-10-17 10:54:29 +02:00
parent adcd5deda1 b2afdaec6c
commit 06b0fc9c5f
26 changed files with 883 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/ical/service/ical/ical.go
View File

@@ -21,6 +21,7 @@ import (
"htwkalender/ical/model"
"htwkalender/ical/service/connector"
htwkalenderGrpc "htwkalender/ical/service/connector/grpc"
"htwkalender/ical/service/functions"
"log/slog"
"time"
)
@@ -29,7 +30,7 @@ const expirationTime = 5 * time.Minute
var FeedDeletedError = fmt.Errorf("feed deleted")
func Feed(app model.AppType, token string, userAgent string) (string, error) {
func Feed(app model.AppType, token string, userAgent string) (string, string, error) {
var events model.Events
modules := map[string]model.FeedCollection{}
@@ -45,17 +46,17 @@ func Feed(app model.AppType, token string, userAgent string) (string, error) {
// get feed by token
feed, err := htwkalenderGrpc.GetFeed(token, app.GrpcClient)
if err != nil {
return "", err
return "", "", err
}
if feed.Deleted {
return "", FeedDeletedError
return "", "", FeedDeletedError
}
// Get all events for modules
events, err = htwkalenderGrpc.GetEvents(feed.Modules, app.GrpcClient)
if err != nil {
return "", err
return "", "", err
}
// Sort events by start date
@@ -66,10 +67,13 @@ func Feed(app model.AppType, token string, userAgent string) (string, error) {
}
}
// Generate one Hash for E-TAG from all events and modules
etag := functions.HashString(events.String() + fmt.Sprint(modules))
cal := GenerateIcalFeed(events, modules, userAgent)
icalFeed := &model.FeedModel{Content: cal.Serialize(), ExpiresAt: model.JSONTime(time.Now().Add(expirationTime))}
return icalFeed.Content, nil
return icalFeed.Content, etag, nil
}
func FeedRecord(app model.AppType, token string) (model.FeedRecord, error) {