840 short description for each video

api/courses.go

@@ -344,7 +344,14 @@ func (r coursesRoutes) getCourseBySlug(c *gin.Context) {
 		Streams []model.StreamDTO
 	}
 
-	course, err := r.CoursesDao.GetCourseBySlugYearAndTerm(c, uri.Slug, query.Term, query.Year)
+	var userId uint
+	user := tumLiveContext.User
+	if user != nil {
+		userId = user.ID
+	}
+	var course model.Course
+	var err error
+	course, err = r.CoursesDao.GetCourseBySlugYearAndTerm(c, uri.Slug, query.Term, query.Year, userId)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			_ = c.Error(tools.RequestError{
@@ -367,7 +374,6 @@ func (r coursesRoutes) getCourseBySlug(c *gin.Context) {
 		return
 	}
 
-	user := tumLiveContext.User
 	var streams []model.Stream
 	for _, stream := range course.Streams {
 		if !stream.Private || (user != nil && user.IsAdminOfCourse(course)) {
@@ -389,6 +395,10 @@ func (r coursesRoutes) getCourseBySlug(c *gin.Context) {
 			return
 		}
 		streamsDTO[i] = s.ToDTO()
+		// Double check that custom lecture title has the right userId and add it to the streamDTO
+		if len(s.CustomLectureTitles) > 0 && s.CustomLectureTitles[0].UserID == userId {
+			streamsDTO[i].CustomName = s.CustomLectureTitles[0].Title
+		}
 	}
 
 	isAdmin := course.UserID == query.UserID
@@ -1377,7 +1387,7 @@ func (r coursesRoutes) createCourse(c *gin.Context) {
 	} else {
 		semester = "S"
 	}
-	_, err = r.CoursesDao.GetCourseBySlugYearAndTerm(c, req.Slug, semester, year)
+	_, err = r.CoursesDao.GetCourseBySlugYearAndTerm(c, req.Slug, semester, year, 0)
 	if err == nil {
 		_ = c.Error(tools.RequestError{
 			Status:        http.StatusConflict,
@@ -1420,7 +1430,7 @@ func (r coursesRoutes) createCourse(c *gin.Context) {
 		})
 		return
 	}
-	courseWithID, err := r.CoursesDao.GetCourseBySlugYearAndTerm(context.Background(), req.Slug, semester, year)
+	courseWithID, err := r.CoursesDao.GetCourseBySlugYearAndTerm(context.Background(), req.Slug, semester, year, 0)
 	if err != nil {
 		_ = c.Error(tools.RequestError{
 			Status:        http.StatusInternalServerError,

api/courses_test.go

@@ -367,7 +367,7 @@ func TestCoursesCRUD(t *testing.T) {
 							mock := mock_dao.NewMockCoursesDao(gomock.NewController(t))
 							mock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseTensNet.Slug, "S", 2023).
+								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseTensNet.Slug, "S", 2023, testutils.TUMLiveContextStudent.User.ID).
 								Return(model.Course{}, gorm.ErrRecordNotFound).
 								AnyTimes()
 							return mock
@@ -385,7 +385,7 @@ func TestCoursesCRUD(t *testing.T) {
 							mock := mock_dao.NewMockCoursesDao(gomock.NewController(t))
 							mock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseTensNet.Slug, "S", 2023).
+								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseTensNet.Slug, "S", 2023, testutils.TUMLiveContextStudent.User.ID).
 								Return(model.Course{}, errors.New("")).
 								AnyTimes()
 							return mock
@@ -403,7 +403,7 @@ func TestCoursesCRUD(t *testing.T) {
 							mock := mock_dao.NewMockCoursesDao(gomock.NewController(t))
 							mock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseTensNet.Slug, "S", 2023).
+								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseTensNet.Slug, "S", 2023, testutils.TUMLiveContextAdmin.User.ID).
 								Return(testutils.CourseTensNet, nil).
 								AnyTimes()
 							return mock
@@ -442,7 +442,7 @@ func TestCoursesCRUD(t *testing.T) {
 								AnyTimes()
 							coursesMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, testutils.TUMLiveContextStudent.User.ID).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							return coursesMock
@@ -468,7 +468,7 @@ func TestCoursesCRUD(t *testing.T) {
 								AnyTimes()
 							coursesMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, testutils.TUMLiveContextAdmin.User.ID).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -622,7 +622,7 @@ func TestCoursesCRUD(t *testing.T) {
 							coursesMock := mock_dao.NewMockCoursesDao(ctrl)
 							coursesMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), request.Slug, "S", 2020).
+								GetCourseBySlugYearAndTerm(gomock.Any(), request.Slug, "S", 2020, gomock.Any()).
 								Return(model.Course{}, nil).
 								AnyTimes()
 							return coursesMock
@@ -642,7 +642,7 @@ func TestCoursesCRUD(t *testing.T) {
 							coursesMock := mock_dao.NewMockCoursesDao(ctrl)
 							coursesMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), request.Slug, "S", 2020).
+								GetCourseBySlugYearAndTerm(gomock.Any(), request.Slug, "S", 2020, gomock.Any()).
 								Return(model.Course{}, errors.New("")).
 								AnyTimes()
 							coursesMock.
@@ -667,11 +667,11 @@ func TestCoursesCRUD(t *testing.T) {
 							coursesMock := mock_dao.NewMockCoursesDao(ctrl)
 							first := coursesMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), request.Slug, "S", 2020).
+								GetCourseBySlugYearAndTerm(gomock.Any(), request.Slug, "S", 2020, gomock.Any()).
 								Return(model.Course{}, errors.New("")).Times(1)
 							second := coursesMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), request.Slug, "S", 2020).
+								GetCourseBySlugYearAndTerm(gomock.Any(), request.Slug, "S", 2020, gomock.Any()).
 								Return(newCourse, errors.New("")).Times(1)
 
 							gomock.InOrder(first, second)
@@ -780,7 +780,7 @@ func TestCoursesCRUD(t *testing.T) {
 								AnyTimes()
 							coursesMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -818,7 +818,7 @@ func TestCoursesCRUD(t *testing.T) {
 								AnyTimes()
 							coursesMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -927,7 +927,7 @@ func TestCoursesLectureActions(t *testing.T) {
 								AnyTimes()
 							coursesMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -970,7 +970,7 @@ func TestCoursesLectureActions(t *testing.T) {
 								AnyTimes()
 							coursesMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+								GetCourseBySlugYearAndTerm(gomock.Any(), testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -1822,7 +1822,7 @@ func TestAdminFunctions(t *testing.T) {
 								EXPECT().
 								GetCourseBySlugYearAndTerm(gomock.Any(),
 									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm,
-									testutils.CourseFPV.Year).
+									testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -1926,7 +1926,7 @@ func TestAdminFunctions(t *testing.T) {
 							coursesMock.
 								EXPECT().
 								GetCourseBySlugYearAndTerm(gomock.Any(),
-									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -1957,7 +1957,7 @@ func TestAdminFunctions(t *testing.T) {
 							coursesMock.
 								EXPECT().
 								GetCourseBySlugYearAndTerm(gomock.Any(),
-									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -2015,7 +2015,7 @@ func TestAdminFunctions(t *testing.T) {
 							coursesMock.
 								EXPECT().
 								GetCourseBySlugYearAndTerm(gomock.Any(),
-									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -2102,7 +2102,7 @@ func TestAdminFunctions(t *testing.T) {
 							coursesMock.
 								EXPECT().
 								GetCourseBySlugYearAndTerm(gomock.Any(),
-									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -2131,7 +2131,7 @@ func TestAdminFunctions(t *testing.T) {
 							coursesMock.
 								EXPECT().
 								GetCourseBySlugYearAndTerm(gomock.Any(),
-									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -2160,7 +2160,7 @@ func TestAdminFunctions(t *testing.T) {
 							coursesMock.
 								EXPECT().
 								GetCourseBySlugYearAndTerm(gomock.Any(),
-									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.
@@ -2190,7 +2190,7 @@ func TestAdminFunctions(t *testing.T) {
 							coursesMock.
 								EXPECT().
 								GetCourseBySlugYearAndTerm(gomock.Any(),
-									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year).
+									testutils.CourseFPV.Slug, testutils.CourseFPV.TeachingTerm, testutils.CourseFPV.Year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							coursesMock.

api/download_ics.go

@@ -39,7 +39,7 @@ func (r downloadICSRoutes) downloadICS(c *gin.Context) {
 		return
 	}
 
-	course, err := r.CoursesDao.GetCourseBySlugYearAndTerm(c, slug, term, year)
+	course, err := r.CoursesDao.GetCourseBySlugYearAndTerm(c, slug, term, year, 0)
 	if err != nil {
 		_ = c.Error(tools.RequestError{
 			Status:        http.StatusBadRequest,

api/download_ics_test.go

@@ -49,7 +49,7 @@ func TestDownloadICS(t *testing.T) {
 							courseMock := mock_dao.NewMockCoursesDao(gomock.NewController(t))
 							courseMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), slug, term, year).
+								GetCourseBySlugYearAndTerm(gomock.Any(), slug, term, year, gomock.Any()).
 								Return(model.Course{}, errors.New("")).
 								AnyTimes()
 							return courseMock
@@ -67,7 +67,7 @@ func TestDownloadICS(t *testing.T) {
 							courseMock := mock_dao.NewMockCoursesDao(gomock.NewController(t))
 							courseMock.
 								EXPECT().
-								GetCourseBySlugYearAndTerm(gomock.Any(), slug, term, year).
+								GetCourseBySlugYearAndTerm(gomock.Any(), slug, term, year, gomock.Any()).
 								Return(testutils.CourseFPV, nil).
 								AnyTimes()
 							return courseMock

api/search.go

@@ -262,7 +262,7 @@ func checkAndFillResponse(c *gin.Context, user *model.User, limit int64, daoWrap
 			}
 
 			for _, meiliCourse := range meiliCourses {
-				course, err := daoWrapper.CoursesDao.GetCourseBySlugYearAndTerm(c, meiliCourse.Slug, meiliCourse.TeachingTerm, meiliCourse.Year)
+				course, err := daoWrapper.CoursesDao.GetCourseBySlugYearAndTerm(c, meiliCourse.Slug, meiliCourse.TeachingTerm, meiliCourse.Year, 0)
 				if err == nil && user.IsEligibleToSearchForCourse(course) {
 					res.Hits = append(res.Hits, meiliCourse)
 				}
@@ -543,7 +543,7 @@ func parseCourses(c *gin.Context, daoWrapper dao.DaoWrapper, urlParamCourse stri
 		}
 		length := len(courseString)
 		year, _ := strconv.Atoi(courseString[length-5 : length-1])
-		course, err := daoWrapper.CoursesDao.GetCourseBySlugYearAndTerm(c, courseString[:length-5], courseString[length-1:], year)
+		course, err := daoWrapper.CoursesDao.GetCourseBySlugYearAndTerm(c, courseString[:length-5], courseString[length-1:], year, 0)
 		if err != nil {
 			return nil, 1
 		}

api/search_test.go

@@ -331,10 +331,10 @@ func getCoursesMock(t *testing.T) *mock_dao.MockCoursesDao {
 	mock := mock_dao.NewMockCoursesDao(gomock.NewController(t))
 	for _, course := range testutils.AllCoursesForSearchTests {
 		mock.EXPECT().GetCourseById(gomock.Any(), course.ID).Return(course, nil).AnyTimes()
-		mock.EXPECT().GetCourseBySlugYearAndTerm(gomock.Any(), course.Slug, course.TeachingTerm, course.Year).Return(course, nil).AnyTimes()
+		mock.EXPECT().GetCourseBySlugYearAndTerm(gomock.Any(), course.Slug, course.TeachingTerm, course.Year, gomock.Any()).Return(course, nil).AnyTimes()
 	}
 	mock.EXPECT().GetCourseById(gomock.Any(), gomock.Any()).Return(model.Course{}, errors.New("whoops")).AnyTimes()
-	mock.EXPECT().GetCourseBySlugYearAndTerm(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(model.Course{}, errors.New("whoops")).AnyTimes()
+	mock.EXPECT().GetCourseBySlugYearAndTerm(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(model.Course{}, errors.New("whoops")).AnyTimes()
 	return mock
 }
 

api/stream.go

@@ -45,6 +45,11 @@ func configGinStreamRestRouter(router *gin.Engine, daoWrapper dao.DaoWrapper) {
 
 			streamById.GET("/playlist", routes.getStreamPlaylist)
 
+			withUser := streamById.Use(tools.LoggedIn)
+			{
+				withUser.PUT("/personalLectureName", routes.changePersonalLectureName)
+			}
+
 			thumbs := streamById.Group("/thumbs")
 			{
 				thumbs.GET(":fid", routes.getThumbs)
@@ -894,3 +899,63 @@ func (r streamRoutes) updateChatEnabled(c *gin.Context) {
 		return
 	}
 }
+
+type changePersonalLectureNameRequest struct {
+	PersonalLectureName string `json:"personalLectureName"`
+}
+
+func (r streamRoutes) changePersonalLectureName(c *gin.Context) {
+	ctx := c.MustGet("TUMLiveContext").(tools.TUMLiveContext)
+
+	streamIdAsString := c.Param("streamID")
+	streamId, err := strconv.ParseUint(streamIdAsString, 10, 32)
+	if err != nil {
+		logger.Error("can not parse stream id in request url", "err", err)
+		_ = c.Error(tools.RequestError{
+			Status:        http.StatusBadRequest,
+			CustomMessage: "can not parse stream id in request url",
+			Err:           err,
+		})
+		return
+	}
+
+	var update changePersonalLectureNameRequest
+	err = c.BindJSON(&update)
+	if err != nil {
+		logger.Error("failed to bind personal lecture name JSON", "err", err)
+		_ = c.Error(tools.RequestError{
+			Status:        http.StatusBadRequest,
+			CustomMessage: "can not bind body",
+			Err:           err,
+		})
+		return
+	}
+
+	if update.PersonalLectureName == "" {
+		err = r.UserDefinedLectureTitlesDao.Delete(ctx.User.ID, uint(streamId))
+		if err != nil {
+			logger.Error("failed to delete personal lecture name", "err", err)
+			_ = c.Error(tools.RequestError{
+				Status:        http.StatusInternalServerError,
+				CustomMessage: "can not delete personal lecture name",
+				Err:           err,
+			})
+		}
+		return
+	}
+
+	err = r.UserDefinedLectureTitlesDao.Save(&model.UserDefinedLectureTitle{
+		UserID:   ctx.User.ID,
+		StreamID: uint(streamId),
+		Title:    update.PersonalLectureName,
+	})
+	if err != nil {
+		logger.Error("failed to save personal lecture name", "err", err)
+		_ = c.Error(tools.RequestError{
+			Status:        http.StatusInternalServerError,
+			CustomMessage: "can not save personal lecture name",
+			Err:           err,
+		})
+		return
+	}
+}

apiv2/helpers/parser.go

@@ -130,6 +130,10 @@ func ParseStreamToProto(stream model.Stream, downloads []model.DownloadableVod)
 		s.Downloads = append(s.Downloads, ParseDownloadToProto(download))
 	}
 
+	if len(stream.CustomLectureTitles) > 0 {
+		s.CustomLectureTitle = stream.CustomLectureTitles[0].Title
+	}
+
 	return s
 }