fixed wrong naming

TUM-Dev · Sep 18, 2023 · 07cb675 · 07cb675
1 parent 54f1cf8
commit 07cb675
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/server/backend/news.go b/server/backend/news.go
@@ -14,9 +14,9 @@ import (
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
-func (s *CampusServer) GetNewsSources(ctx context.Context, _ *emptypb.Empty) (newsSources *pb.NewsSourceReply, err error) {
-	if err = s.checkDevice(ctx); err != nil {
-		return
+func (s *CampusServer) GetNewsSources(ctx context.Context, _ *emptypb.Empty) (*pb.NewsSourceReply, error) {
+	if err := s.checkDevice(ctx); err != nil {
+		return nil, err
 	}
 
 	var sources []model.NewsSource
@@ -37,12 +37,12 @@ func (s *CampusServer) GetNewsSources(ctx context.Context, _ *emptypb.Empty) (ne
 	return &pb.NewsSourceReply{Sources: resp}, nil
 }
 
-func (s *CampusServer) GetNews(ctx context.Context, req *pb.GetNewsRequest) (newsSources *pb.GetNewsReply, err error) {
-	if err = s.checkDevice(ctx); err != nil {
-		return
+func (s *CampusServer) GetNews(ctx context.Context, req *pb.GetNewsRequest) (*pb.GetNewsReply, error) {
+	if err := s.checkDevice(ctx); err != nil {
+		return nil, err
 	}
 
-	var sources []model.News
+	var newsEntries []model.News
 	// preloading files as the news images can be null
 	// I could not get outer joins to work => we are currently doing unnecessary db calls
 	tx := s.db.Preload("Files")
@@ -52,13 +52,13 @@ func (s *CampusServer) GetNews(ctx context.Context, req *pb.GetNewsRequest) (new
 	if req.LastNewsId != 0 {
 		tx = tx.Where("news > ?", req.LastNewsId)
 	}
-	if err := tx.Find(&sources).Error; err != nil {
+	if err := tx.Find(&newsEntries).Error; err != nil {
 		log.WithError(err).Error("could not find news item")
 		return nil, status.Error(codes.Internal, "could not GetNews")
 	}
 
-	resp := make([]*pb.NewsItem, len(sources))
-	for i, item := range sources {
+	resp := make([]*pb.NewsItem, len(newsEntries))
+	for i, item := range newsEntries {
 		log.WithField("title", item.Title).Trace("sending news")
 		resp[i] = &pb.NewsItem{
 			Id:       item.News,