Merge branch 'development' into 'main'

Development

See merge request htwk-software/htwkalender!23

backend/service/addCalDavRoutes.go

@@ -60,18 +60,17 @@ func addFeedRoutes(app *pocketbase.PocketBase) {
 				if err != nil {
 					return c.JSON(http.StatusInternalServerError, "Failed to get feed")
 				}
-				var responseWriter = c.Response().Writer
-				responseWriter.Header().Set("Content-type", "text/calendar")
-				responseWriter.Header().Set("charset", "utf-8")
-				responseWriter.Header().Set("Content-Disposition", "inline")
-				responseWriter.Header().Set("filename", "calendar.ics")
 
-				responseWriter.WriteHeader(http.StatusOK)
+				c.Response().Header().Set("Content-type", "text/calendar")
-				_, err = responseWriter.Write([]byte(result))
+				c.Response().Header().Set("charset", "utf-8")
+				c.Response().Header().Set("Content-Disposition", "inline")
+				c.Response().Header().Set("filename", "calendar.ics")
+
+				_, err = c.Response().Write([]byte(result))
+
 				if err != nil {
-					return c.JSON(http.StatusInternalServerError, "Failed to write feed")
+					return err
 				}
-				c.Response().Writer = responseWriter
 				return nil
 			},
 			Middlewares: []echo.MiddlewareFunc{

backend/service/db/dbEvents.go

@@ -18,6 +18,7 @@ package db
 
 import (
 	"fmt"
+	"github.com/pocketbase/pocketbase/daos"
 	"github.com/pocketbase/pocketbase/tools/types"
 	"htwkalender/model"
 	"log/slog"
@@ -34,7 +35,7 @@ func SaveSeminarGroupEvents(seminarGroup model.SeminarGroup, app *pocketbase.Poc
 	// check if event is already in database and add to toBeSavedEvents if not
 	for _, event := range seminarGroup.Events {
 		event = event.SetCourse(seminarGroup.Course)
-		existsInDatabase, err := findEventByDayWeekStartEndNameCourse(event, seminarGroup.Course, app)
+		existsInDatabase, err := findEventByDayWeekStartEndNameCourse(event, seminarGroup.Course, app.Dao())
 		alreadyAddedToSave := toBeSavedEvents.Contains(event)
 
 		if err != nil {
@@ -61,13 +62,13 @@ func SaveSeminarGroupEvents(seminarGroup model.SeminarGroup, app *pocketbase.Poc
 	return savedRecords, nil
 }
 
-func SaveEvents(events []model.Event, app *pocketbase.PocketBase) ([]model.Event, error) {
+func SaveEvents(events []model.Event, txDao *daos.Dao) ([]model.Event, error) {
 	var toBeSavedEvents model.Events
 	var savedRecords model.Events
 
 	// check if event is already in database and add to toBeSavedEvents if not
 	for _, event := range events {
-		existsInDatabase, err := findEventByDayWeekStartEndNameCourse(event, event.Course, app)
+		existsInDatabase, err := findEventByDayWeekStartEndNameCourse(event, event.Course, txDao)
 		alreadyAddedToSave := toBeSavedEvents.Contains(event)
 
 		if err != nil {
@@ -78,12 +79,11 @@ func SaveEvents(events []model.Event, app *pocketbase.PocketBase) ([]model.Event
 			toBeSavedEvents = append(toBeSavedEvents, event)
 		}
 	}
-
 	// create record for each event that's not already in the database
 	for _, event := range toBeSavedEvents {
 		event.MarkAsNew()
 		// auto mapping for event fields to record fields
-		err := app.Dao().Save(&event)
+		err := txDao.Save(&event)
 		if err != nil {
 			return nil, err
 		} else {
@@ -94,11 +94,11 @@ func SaveEvents(events []model.Event, app *pocketbase.PocketBase) ([]model.Event
 }
 
 // check if event is already in database and return true if it is and false if it's not
-func findEventByDayWeekStartEndNameCourse(event model.Event, course string, app *pocketbase.PocketBase) (bool, error) {
+func findEventByDayWeekStartEndNameCourse(event model.Event, course string, dao *daos.Dao) (bool, error) {
 
 	var dbEvent model.Event
 
-	err := app.Dao().DB().Select("*").From("events").
+	err := dao.DB().Select("*").From("events").
 		Where(dbx.NewExp(
 			"Day = {:day} AND "+
 				"Week = {:week} AND "+
@@ -230,8 +230,8 @@ func GetAllModulesDistinctByNameAndCourse(app *pocketbase.PocketBase) ([]model.M
 	return modules, nil
 }
 
-func DeleteAllEventsByCourse(app *pocketbase.PocketBase, course string, semester string) error {
+func DeleteAllEventsByCourse(dao *daos.Dao, course string, semester string) error {
-	_, err := app.Dao().DB().Delete("events", dbx.NewExp("course = {:course} AND semester = {:semester}", dbx.Params{"course": course, "semester": semester})).Execute()
+	_, err := dao.DB().Delete("events", dbx.NewExp("course = {:course} AND semester = {:semester}", dbx.Params{"course": course, "semester": semester})).Execute()
 
 	if err != nil {
 		return err
@@ -239,8 +239,8 @@ func DeleteAllEventsByCourse(app *pocketbase.PocketBase, course string, semester
 	return nil
 }
 
-func DeleteAllEventsBySemesterWithoutCourse(app *pocketbase.PocketBase, course string, semester string) error {
+func DeleteAllEventsRatherThenCourse(dao *daos.Dao, course string, semester string) error {
-	_, err := app.Dao().DB().Delete("events", dbx.NewExp("course != {:course} AND semester = {:semester}", dbx.Params{"course": course, "semester": semester})).Execute()
+	_, err := dao.DB().Delete("events", dbx.NewExp("course != {:course} AND semester = {:semester}", dbx.Params{"course": course, "semester": semester})).Execute()
 
 	if err != nil {
 		return err

backend/service/events/eventService.go

@@ -95,7 +95,7 @@ func GetModuleByUUID(app *pocketbase.PocketBase, uuid string) (model.Module, err
 // If the deletion was successful, nil is returned
 // If the deletion was not successful, an error is returned
 func DeleteAllEventsByCourseAndSemester(app *pocketbase.PocketBase, course string, semester string) error {
-	err := db.DeleteAllEventsByCourse(app, course, semester)
+	err := db.DeleteAllEventsByCourse(app.Dao(), course, semester)
 	if err != nil {
 		return err
 	} else {
@@ -174,7 +174,7 @@ func UpdateModulesForCourse(app *pocketbase.PocketBase, course string) (model.Ev
 	}
 
 	// save all events that are in the insertList
-	savedEvents, err := db.SaveEvents(insertList, app)
+	savedEvents, err := db.SaveEvents(insertList, app.Dao())
 	if err != nil {
 		slog.Error("Failed to save events: ", "error", err)
 		return nil, err

backend/service/fetch/sport/sportFetcher.go

@@ -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

backend/service/fetch/v2/fetcher.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"github.com/google/uuid"
 	"github.com/pocketbase/pocketbase"
+	"github.com/pocketbase/pocketbase/daos"
 	"golang.org/x/net/html"
 	"htwkalender/model"
 	"htwkalender/service/db"
@@ -89,21 +90,44 @@ func fetchAndSaveAllEventsForSemester(
 	var savedRecords []model.Event
 	url := stubUrl[0] + semester + stubUrl[1]
 	events, err := parseEventForOneSemester(url)
+
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse events for "+semester+": %w", err)
 	}
-	err = db.DeleteAllEventsBySemesterWithoutCourse(app, "Sport", semester)
+
-	if err != nil {
+	err = updateDatabase(app, events, "Sport", semester)
-		return nil, fmt.Errorf("failed to delete all events for "+semester+": %w", err)
+
-	}
-	savedEvents, dbError := db.SaveEvents(events, app)
-	if dbError != nil {
-		return nil, fmt.Errorf("failed to save events for "+semester+": %w", dbError)
-	}
-	savedRecords = append(savedRecords, savedEvents...)
 	return savedRecords, err
 }
 
+func updateDatabase(app *pocketbase.PocketBase, eventsToBeAdded []model.Event, course string, semester string) error {
+
+	var addedEvents []model.Event
+	var err error
+
+	// to in transaction the events will be added and deleted
+	err = app.Dao().RunInTransaction(func(txDao *daos.Dao) error {
+		err = db.DeleteAllEventsRatherThenCourse(txDao, course, semester)
+		if err != nil {
+			return err
+		}
+
+		addedEvents, err = db.SaveEvents(eventsToBeAdded, txDao)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	slog.Info("Added events: ", "events", len(addedEvents))
+
+	return nil
+}
+
 func parseEventForOneSemester(url string) ([]model.Event, error) {
 	// Fetch Webpage from URL
 	webpage, err := fetch.GetHTML(url)

docker-compose.yml

@@ -14,8 +14,6 @@
 #You should have received a copy of the GNU Affero General Public License
 #along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-version: "3.9"
-
 services:
   htwkalender-backend:
     build: