fix:#46 updated fetcher and empty course issue

services/data-manager/service/db/dbGroups.go

@@ -20,6 +20,7 @@ import (
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/models"
+	"htwkalender/data-manager/model"
 	"log/slog"
 )
 
@@ -38,6 +39,31 @@ func (s *SeminarGroup) TableName() string {
 	return "groups"
 }
 
+// UniqueKey Should be same as unique constraint in the database
+func (s *SeminarGroup) UniqueKey() string {
+	return s.Course + s.Semester
+}
+
+func (s *SeminarGroup) toSeminarGroupModel() model.SeminarGroup {
+	return model.SeminarGroup{
+		University:    s.University,
+		GroupShortcut: s.GroupShortcut,
+		GroupId:       s.GroupId,
+		Course:        s.Course,
+		Faculty:       s.Faculty,
+		FacultyId:     s.FacultyId,
+		Semester:      s.Semester,
+	}
+}
+
+func (s *SeminarGroups) toSeminarGroupModels() []model.SeminarGroup {
+	var seminarGroups []model.SeminarGroup
+	for _, group := range *s {
+		seminarGroups = append(seminarGroups, group.toSeminarGroupModel())
+	}
+	return seminarGroups
+}
+
 type SeminarGroups []*SeminarGroup
 
 func SaveGroups(seminarGroups SeminarGroups, app *pocketbase.PocketBase) (SeminarGroups, error) {
@@ -84,26 +110,18 @@ func GetAllCourses(app *pocketbase.PocketBase) []string {
 	return courseArray
 }
 
-func GetAllCoursesForSemester(app *pocketbase.PocketBase, semester string) []string {
+func GetAllCoursesForSemester(app *pocketbase.PocketBase, semester string) []model.SeminarGroup {
 
-	var courses []struct {
-		CourseShortcut string `db:"course" json:"course"`
-	}
+	var courses SeminarGroups
 
 	// get all courses for a specific semester
-	err := app.Dao().DB().Select("course").From("groups").Where(dbx.NewExp("semester = {:semester}", dbx.Params{"semester": semester})).All(&courses)
+	err := app.Dao().DB().Select("*").From("groups").Where(dbx.NewExp("semester = {:semester}", dbx.Params{"semester": semester})).All(&courses)
 	if err != nil {
 		slog.Error("Error while getting groups from database: ", "error", err)
-		return []string{}
+		return nil
 	}
 
-	var courseArray []string
-
-	for _, course := range courses {
-		courseArray = append(courseArray, course.CourseShortcut)
-	}
-
-	return courseArray
+	return courses.toSeminarGroupModels()
 
 }