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

feat:#150 rewrote error handling for backend

Browse Source
This commit is contained in:
masterelmar
2023-12-27 18:20:17 +01:00
parent 0b31002914
commit a9e76ee3db
4 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
backend/service/db/dbRooms.go
View File

@@ -1,7 +1,6 @@
package db
import (
"fmt"
"htwkalender/model"
"htwkalender/service/functions"
"strings"
@@ -11,7 +10,7 @@ import (
"github.com/pocketbase/pocketbase"
)
func GetRooms(app *pocketbase.PocketBase) []string {
func GetRooms(app *pocketbase.PocketBase) ([]string, error) {
var events []struct {
Rooms string `db:"Rooms" json:"Rooms"`
@@ -20,8 +19,7 @@ func GetRooms(app *pocketbase.PocketBase) []string {
// get all rooms from event records in the events collection
err := app.Dao().DB().Select("Rooms").From("events").All(&events)
if err != nil {
print("Error while getting rooms from database: ", err)
return nil
return nil, err
}
var roomArray []string
@@ -38,10 +36,10 @@ func GetRooms(app *pocketbase.PocketBase) []string {
}
}
}
return roomArray
return roomArray, nil
}
func GetRoomScheduleForDay(app *pocketbase.PocketBase, room string, date string) []model.Event {
func GetRoomScheduleForDay(app *pocketbase.PocketBase, room string, date string) ([]model.Event, error) {
var events []model.Event
// get all events from event records in the events collection
@@ -51,24 +49,21 @@ func GetRoomScheduleForDay(app *pocketbase.PocketBase, room string, date string)
GroupBy("Week", "Start", "End", "Rooms").
All(&events)
if err != nil {
print("Error while getting events from database: ", err)
return nil
return nil, err
}
return events
return events, nil
}
func GetRoomSchedule(app *pocketbase.PocketBase, room string, from string, to string) []model.Event {
func GetRoomSchedule(app *pocketbase.PocketBase, room string, from string, to string) ([]model.Event, error) {
var events []model.Event
fromDate, err := time.Parse("2006-01-02", from)
if err != nil {
fmt.Println("Error parsing date 'from':", err)
return nil
return nil, err
}
toDate, err := time.Parse("2006-01-02", to)
if err != nil {
fmt.Println("Error parsing date 'to':", err)
return nil
return nil, err
}
// get all events from event records in the events collection
@@ -79,8 +74,7 @@ func GetRoomSchedule(app *pocketbase.PocketBase, room string, from string, to st
All(&events)
if err != nil {
print("Error while getting events from database: ", err)
return nil
return nil, err
}
return events
return events, nil
}