HTWK/htwkalender-pwa
1
0
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender-pwa.git synced 2025-07-16 17:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

added modules in combi with course

Browse Source
This commit is contained in:
Elmar Kresse
2023-09-15 09:02:45 +02:00
parent 53d8b7f970
commit af7d9e73bf
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
service/db/dbEvents.go
View File

@ -114,16 +114,19 @@ func GetPlanForCourseAndSemester(app *pocketbase.PocketBase, course string, seme
return events return events
} }
func GetPlanForModules(app *pocketbase.PocketBase, modules []string) Events { func GetPlanForModules(app *pocketbase.PocketBase, modules []struct {
Name string `db:"Name" json:"Name"`
Course string `db:"course" json:"Course"`
}) Events {
// build query string with name equals elements in modules for dbx query // build query string with name equals elements in modules for dbx query
var queryString string var queryString string
for i, module := range modules { for i, module := range modules {
if i == 0 { if i == 0 {
queryString = "Name = '" + module + "'" queryString = "Name = '" + module.Name + "'"
} else { } else {
queryString = queryString + " OR Name = '" + module + "'" queryString = queryString + " OR Name = '" + module.Name + "'"
} }
} }

16
service/ical/ical.go
View File

@ -28,7 +28,10 @@ func Feed(c echo.Context, app *pocketbase.PocketBase, token string) error {
created, _ := time.Parse(layout, feed.Created) created, _ := time.Parse(layout, feed.Created)
var modules []string var modules []struct {
Name string `db:"Name" json:"Name"`
Course string `db:"course" json:"Course"`
}
_ = json.Unmarshal([]byte(feed.Modules), &modules) _ = json.Unmarshal([]byte(feed.Modules), &modules)
if created.Add(time.Hour * 265).Before(time.Now()) { if created.Add(time.Hour * 265).Before(time.Now()) {
newFeed, err := createFeedForToken(app, modules) newFeed, err := createFeedForToken(app, modules)
@ -47,7 +50,10 @@ func Feed(c echo.Context, app *pocketbase.PocketBase, token string) error {
return nil return nil
} }
func createFeedForToken(app *pocketbase.PocketBase, modules []string) (*model.FeedModel, error) { func createFeedForToken(app *pocketbase.PocketBase, modules []struct {
Name string `db:"Name" json:"Name"`
Course string `db:"course" json:"Course"`
}) (*model.FeedModel, error) {
res := db.GetPlanForModules(app, modules) res := db.GetPlanForModules(app, modules)
b := bytes.Buffer{} b := bytes.Buffer{}
goics.NewICalEncode(&b).Encode(res) goics.NewICalEncode(&b).Encode(res)
@ -63,7 +69,11 @@ func writeSuccess(message string, w http.ResponseWriter) {
func CreateIndividualFeed(c echo.Context, app *pocketbase.PocketBase) error { func CreateIndividualFeed(c echo.Context, app *pocketbase.PocketBase) error {
// read json from request body // read json from request body
var modules []string var modules []struct {
Name string `db:"Name" json:"Name"`
Course string `db:"course" json:"Course"`
}
requestBodyBytes, err := io.ReadAll(c.Request().Body) requestBodyBytes, err := io.ReadAll(c.Request().Body)
if err != nil { if err != nil {
return apis.NewApiError(400, "Could not bind request body", err) return apis.NewApiError(400, "Could not bind request body", err)