Merge branch '26-multiple-bugs' into 'main'

Resolve "multiple bugs"

Closes #26

See merge request ekresse/htwkalender!15

backend/main.go

@@ -21,9 +21,7 @@ func main() {
 		// (the isGoRun check is to enable it only during development)
 		Automigrate: isGoRun,
 	})
-
 	service.AddRoutes(app)
-
 	service.AddSchedules(app)
 
 	if err := app.Start(); err != nil {

backend/openapi.yml

@@ -187,6 +187,20 @@ paths:
       responses:
         '200':
           description: Successful response
+  /api/courses/events:
+    get:
+      summary: Get Courses that have Events for specific semester
+      parameters:
+        - name: semester
+          in: query
+          description: semester
+          required: true
+          example: "ws"
+          schema:
+              type: string
+      responses:
+        '200':
+          description: Successful response
   /api/collections/feeds/records/{id}:
     get:
       summary: Get Modules selected for iCal feed

backend/service/addRoute.go

@@ -294,8 +294,14 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			Method: http.MethodGet,
 			Path:   "/api/courses",
 			Handler: func(c echo.Context) error {
-				courses := events.GetAllCourses(app)
+				semester := c.QueryParam("semester")
-				return c.JSON(200, courses)
+				if semester == "" {
+					courses := events.GetAllCourses(app)
+					return c.JSON(200, courses)
+				} else {
+					courses := events.GetAllCoursesForSemester(app, semester)
+					return c.JSON(200, courses)
+				}
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
@@ -307,14 +313,21 @@ func AddRoutes(app *pocketbase.PocketBase) {
 		return nil
 	})
 
+	// api end point to get all courses for a specific semester with courses that have events
 	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
 		_, err := e.Router.AddRoute(echo.Route{
 			Method: http.MethodGet,
-			Path:   "/api/courses",
+			Path:   "/api/courses/events",
 			Handler: func(c echo.Context) error {
 				semester := c.QueryParam("semester")
-				courses := events.GetAllCoursesForSemester(app, semester)
+				courses, err := events.GetAllCoursesForSemesterWithEvents(app, semester)
-				return c.JSON(200, courses)
+
+				if err != nil {
+					slog.Error("Failed to get courses for semester with events: %v", err)
+					return c.JSON(http.StatusBadRequest, "Failed to get courses for semester with events")
+				} else {
+					return c.JSON(200, courses)
+				}
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),

backend/service/db/dbGroups.go

@@ -82,13 +82,13 @@ func GetAllCourses(app *pocketbase.PocketBase) []string {
 	return courseArray
 }
 
-func GetAllCoursesForSemester(app *pocketbase.PocketBase, semester string) interface{} {
+func GetAllCoursesForSemester(app *pocketbase.PocketBase, semester string) []string {
 
 	var courses []struct {
 		CourseShortcut string `db:"course" json:"course"`
 	}
 
-	// get all rooms from event records in the events collection
+	// 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)
 	if err != nil {
 		slog.Error("Error while getting groups from database: ", err)
@@ -104,3 +104,25 @@ func GetAllCoursesForSemester(app *pocketbase.PocketBase, semester string) inter
 	return courseArray
 
 }
+
+func GetAllCoursesForSemesterWithEvents(app *pocketbase.PocketBase, semester string) ([]string, error) {
+
+	var courses []struct {
+		CourseShortcut string `db:"course" json:"course"`
+	}
+
+	// get all courses from events distinct for a specific semester
+	err := app.Dao().DB().Select("course").From("events").Where(dbx.NewExp("semester = {:semester}", dbx.Params{"semester": semester})).Distinct(true).All(&courses)
+	if err != nil {
+		slog.Error("Error while getting groups from database: ", err)
+		return nil, err
+	}
+
+	var courseArray []string
+
+	for _, course := range courses {
+		courseArray = append(courseArray, course.CourseShortcut)
+	}
+
+	return courseArray, nil
+}

backend/service/events/courseService.go

@@ -3,12 +3,35 @@ package events
 import (
 	"github.com/pocketbase/pocketbase"
 	"htwkalender/service/db"
+	"htwkalender/service/functions"
 )
 
 func GetAllCourses(app *pocketbase.PocketBase) []string {
 	return db.GetAllCourses(app)
 }
 
-func GetAllCoursesForSemester(app *pocketbase.PocketBase, semester string) interface{} {
+func GetAllCoursesForSemester(app *pocketbase.PocketBase, semester string) []string {
 	return db.GetAllCoursesForSemester(app, semester)
 }
+
+func GetAllCoursesForSemesterWithEvents(app *pocketbase.PocketBase, semester string) ([]string, error) {
+	courses, err := db.GetAllCoursesForSemesterWithEvents(app, semester)
+	if err != nil {
+		return nil, err
+	} else {
+		// remove empty courses
+		courses = removeEmptyCourses(courses)
+		return courses, nil
+	}
+}
+
+func removeEmptyCourses(courses []string) []string {
+	var filteredCourses []string
+
+	for index, course := range courses {
+		if functions.OnlyWhitespace(course) || len(course) == 0 {
+			filteredCourses = append(courses[:index], courses[index+1:]...)
+		}
+	}
+	return filteredCourses
+}

frontend/src/App.vue

@@ -12,6 +12,9 @@ const disabledPages = [
   "privacy-policy",
   "edit",
   "edit-calendar",
+  "rooms",
+  "free-rooms",
+  "room-schedule",
 ];
 
 const store = moduleStore();

frontend/src/api/createFeed.ts

@@ -53,7 +53,6 @@ export async function saveIndividualFeed(
       return feedResponse;
     })
     .then((response: FeedResponse) => {
-      console.debug("response", response);
       token = response.id;
     });
   return token;

frontend/src/api/fetchCourse.ts

@@ -24,7 +24,7 @@ export async function fetchCourseBySemester(
   semester: string,
 ): Promise<string[]> {
   const courses: string[] = [];
-  await fetch("/api/courses?semester=" + semester)
+  await fetch("/api/courses/events?semester=" + semester)
     .then((response) => {
       //check if response type is json
       const contentType = response.headers.get("content-type");
@@ -35,7 +35,7 @@ export async function fetchCourseBySemester(
       }
     })
     .then((coursesResponse) => {
-      coursesResponse.forEach((course: string) => courses.push(course));
+      coursesResponse?.forEach((course: string) => courses.push(course));
     });
   return courses;
 }
@@ -70,7 +70,7 @@ export async function fetchModulesByCourseAndSemester(
 }
 
 export async function fetchAllModules(): Promise<Module[]> {
-  let modules: Module[] = [];
+  const modules: Module[] = [];
   await fetch("/api/modules")
     .then((response) => {
       return response.json() as Promise<Module[]>;

frontend/src/api/requestFreeRooms.ts

@@ -4,7 +4,6 @@ export async function requestFreeRooms(
   from: string,
   to: string,
 ): Promise<string[]> {
-  console.debug("requestFreeRooms: from=" + from + ", to=" + to);
   const rooms: string[] = [];
   await fetch("/api/rooms/free?from=" + from + "&to=" + to)
     .then((response) => {

frontend/src/components/CalendarLink.vue

@@ -34,8 +34,7 @@ function rerouteIfTokenIsEmpty() {
 
 function copyToClipboard() {
   // Copy the text inside the text field
-  navigator.clipboard.writeText(getLink()).then(show, (err) => {
+  navigator.clipboard.writeText(getLink()).then(show, () => {
-    console.error("Could not copy text: ", err);
     toast.add({
       severity: "error",
       summary: t("calendarLink.copyToastError"),

frontend/src/components/RoomOccupation.vue

@@ -60,7 +60,7 @@ async function getOccupation() {
       calendar?.refetchEvents();
     })
     .catch((error) => {
-      console.log(error);
+      console.error(error);
     });
 }
 

frontend/src/view/editCalendar/EditModules.vue

@@ -45,7 +45,6 @@ const fetchedModules = async () => {
 };
 
 function deleteModule(module: Module) {
-  console.debug(module);
   moduleStore().removeModule(module);
 }