feat:#26 added semester to fetched groups

This commit is contained in:
Elmar Kresse
2024-02-02 00:25:26 +01:00
parent 116a8dc37e
commit 25a7464e41
12 changed files with 5365 additions and 45 deletions

View File

@@ -14,7 +14,7 @@ func SaveGroups(seminarGroup []model.SeminarGroup, collection *models.Collection
var insertRecords []*models.Record
for _, group := range seminarGroup {
dbGroup, err := FindGroupByCourse(group.Course, app)
dbGroup, err := FindGroupByCourseAndSemester(group.Course, group.Semester, app)
if dbGroup == nil && err.Error() == "sql: no rows in result set" {
tobeSavedGroups = append(tobeSavedGroups, group)
@@ -32,6 +32,7 @@ func SaveGroups(seminarGroup []model.SeminarGroup, collection *models.Collection
record.Set("course", group.Course)
record.Set("faculty", group.Faculty)
record.Set("facultyId", group.FacultyId)
record.Set("semester", group.Semester)
insertRecords = append(insertRecords, record)
}
@@ -50,13 +51,13 @@ func SaveGroups(seminarGroup []model.SeminarGroup, collection *models.Collection
return savedRecords, nil
}
func FindGroupByCourse(course string, app *pocketbase.PocketBase) (*model.SeminarGroup, error) {
func FindGroupByCourseAndSemester(course string, semester string, app *pocketbase.PocketBase) (*model.SeminarGroup, error) {
var group model.SeminarGroup
err := app.Dao().DB().Select("*").From("groups").Where(dbx.NewExp("course = {:course}", dbx.Params{"course": course})).One(&group)
err := app.Dao().DB().Select("*").From("groups").Where(dbx.NewExp("course = {:course} AND semester = {:semester}", dbx.Params{"course": course, "semester": semester})).One(&group)
if err != nil {
return nil, err
}
return &group, err
return &group, nil
}
func GetAllCourses(app *pocketbase.PocketBase) []string {
@@ -80,3 +81,26 @@ func GetAllCourses(app *pocketbase.PocketBase) []string {
return courseArray
}
func GetAllCoursesForSemester(app *pocketbase.PocketBase, semester string) interface{} {
var courses []struct {
CourseShortcut string `db:"course" json:"course"`
}
// get all rooms from event records in the events collection
err := app.Dao().DB().Select("course").From("groups").Where(dbx.NewExp("semester = {:semester}", dbx.Params{"semester": semester})).All(&courses)
if err != nil {
slog.Error("Error while getting groups from database: ", err)
return []string{}
}
var courseArray []string
for _, course := range courses {
courseArray = append(courseArray, course.CourseShortcut)
}
return courseArray
}