Delisting unavailable pinned courses

api/courses.go

@@ -286,6 +286,15 @@ func (r coursesRoutes) getPinned(c *gin.Context) {
 	user := tumLiveContext.User
 	resp := make([]model.CourseDTO, 0, len(pinnedCourses))
 	for _, course := range pinnedCourses {
+		// todo: check if user is allowed to see the course
+		// -> Get full course from database
+		enrolled, err := r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID)
+		if err != nil {
+			enrolled = false
+		}
+		if course.Visibility == "enrolled" && !enrolled {
+			continue
+		}
 		if !course.IsHidden() {
 			resp = append(resp, course.ToDTO(user))
 		}

cmd/tumlive/tumlive.go

@@ -83,7 +83,7 @@ func GinServer() (err error) {
 	router.Use(gzip.Gzip(gzip.DefaultCompression))
 	api.ConfigGinRouter(router)
 	web.ConfigGinRouter(router)
-	err = router.Run(":8081")
+	err = router.Run(":8083")
 	// err = router.RunTLS(":443", tools.Cfg.Saml.Cert, tools.Cfg.Saml.Privkey)
 	if err != nil {
 		sentry.CaptureException(err)

dao/courses.go

@@ -44,6 +44,8 @@ type CoursesDao interface {
 
 	RemoveAdminFromCourse(userID uint, courseID uint) error
 	DeleteCourse(course model.Course)
+
+	IsUserEnrolledInCourse(userID uint, courseID uint) (bool, error)
 }
 
 type coursesDao struct {
@@ -338,3 +340,12 @@ func (d coursesDao) DeleteCourse(course model.Course) {
 		logger.Error("Can't delete course", "err", err)
 	}
 }
+
+func (d coursesDao) IsUserEnrolledInCourse(user uint, course uint) (bool, error) {
+	var nRows int64
+	err := DB.Table("course_users").Where("user_id = ? AND course_id = ?", user, course).Count(&nRows).Error
+	if err != nil {
+		return false, err
+	}
+	return nRows == 1, nil
+}

docker-compose.yml

@@ -62,6 +62,8 @@ services:
   db:
     container_name: mariadb_container
     image: mariadb
+    ports:
+      - "3306:3306"
     environment:
       MYSQL_ROOT_USER: root
       MYSQL_ROOT_PASSWORD: example
@@ -71,6 +73,8 @@ services:
       - ./init.sql:/data/application/init.sql
       - mariadb-data:/var/lib/mysql
     restart: always
+    ports:
+      - "3306:3306"
 # Omitted for local development due to size. Comment out to use voice-service
 #  voice-service:
 #    container_name: tum-live-voice-service

web/template/home.gohtml

@@ -13,6 +13,7 @@
 
     {{if and .VersionTag (eq .VersionTag "development")}}
     <script defer src="/static/node_modules/alpinejs/dist/cdn.js"></script>
+    <script defer src="/static/node_modules/alpinejs/dist/cdn.js"></script>
     {{else}}
     <script defer src="/static/node_modules/alpinejs/dist/cdn.min.js"></script>
     {{end}}

web/template/index.gohtml

@@ -27,7 +27,7 @@
     {{if .PinnedCourses}}
         <h2 class="text-2xl text-1 mt-2">Pinned Courses</h2>
         {{range $course := .PinnedCourses}}
-            {{if not $course.IsHidden}}
+            {{if $user.IsEligibleToWatchCourse $course}}
                 {{template "course-card" (dict "course" $course "user" $user)}}
             {{end}}
         {{end}}