feature:#150 added slog and changed signatures

This commit is contained in:
Elmar Kresse
2024-01-21 17:53:49 +01:00
parent a9e76ee3db
commit 031fa717d7
9 changed files with 77 additions and 60 deletions

View File

@@ -1,7 +1,9 @@
package db
import (
"fmt"
"htwkalender/model"
"log/slog"
"time"
"github.com/pocketbase/dbx"
@@ -187,8 +189,8 @@ func GetAllModulesForCourse(app *pocketbase.PocketBase, course string, semester
// get all events from event records in the events collection
err := app.Dao().DB().Select("*").From("events").Where(dbx.NewExp("course = {:course} AND semester = {:semester}", dbx.Params{"course": course, "semester": semester})).GroupBy("Name").Distinct(true).All(&events)
if err != nil {
print("Error while getting events from database: ", err)
return nil, err
slog.Error("Error while getting events from database: ", err)
return nil, fmt.Errorf("error while getting events from database for course %s and semester %s", course, semester)
}
return events, nil
@@ -199,7 +201,8 @@ func GetAllModulesDistinctByNameAndCourse(app *pocketbase.PocketBase) (model.Eve
err := app.Dao().DB().Select("*").From("events").GroupBy("Name").Distinct(true).All(&events)
if err != nil {
return nil, err
slog.Error("Error while getting events from database: ", err)
return nil, fmt.Errorf("error while getting events distinct by name and course from data")
}
return events, nil