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

fix:#34 refactored function to intended service

Browse Source
This commit is contained in:
Elmar Kresse
2024-06-04 00:14:46 +02:00
parent e3b3e891b5
commit 8d28bbdb96
4 changed files with 18 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/service/fetch/sport/sportFetcher.go
View File

@@ -82,13 +82,13 @@ func FetchAndUpdateSportEvents(app *pocketbase.PocketBase) ([]model.Event, error
}
// @TODO: delete and save events in one transaction and it only should delete events that are not in the new events list and save events that are not in the database
err = db.DeleteAllEventsByCourse(app, "Sport", functions.GetCurrentSemesterString(clock.RealClock{}))
err = db.DeleteAllEventsByCourse(app.Dao(), "Sport", functions.GetCurrentSemesterString(clock.RealClock{}))
if err != nil {
return nil, err
}
// save events to database
savedEvents, err := db.SaveEvents(events, app)
savedEvents, err := db.SaveEvents(events, app.Dao())
if err != nil {
return nil, err

12
backend/service/fetch/v2/fetcher.go
View File

@@ -17,10 +17,8 @@
package v2
import (
"database/sql"
"fmt"
"github.com/google/uuid"
"github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase"
"github.com/pocketbase/pocketbase/daos"
"golang.org/x/net/html"
@@ -109,18 +107,12 @@ func updateDatabase(app *pocketbase.PocketBase, eventsToBeAdded []model.Event, c
// to in transaction the events will be added and deleted
err = app.Dao().RunInTransaction(func(txDao *daos.Dao) error {
var execute sql.Result
execute, err = txDao.DB().Delete("events",
dbx.NewExp("course != {:course} AND semester = {:semester}",
dbx.Params{"course": course, "semester": semester})).Execute()
err = db.DeleteAllEventsRatherThenCourse(txDao, course, semester)
if err != nil {
return err
}
var rows int64
rows, err = execute.RowsAffected()
slog.Info("Deleted events: ", "events", rows)
addedEvents, err = db.SaveEventsTxDao(eventsToBeAdded, txDao)
addedEvents, err = db.SaveEvents(eventsToBeAdded, txDao)
if err != nil {
return err
}