fixed the eazy cases where connection handling can be added

TUM-Dev · Sep 19, 2023 · b29fbb4 · b29fbb4
1 parent 4e17351
commit b29fbb4
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 73 deletions.
diff --git a/server/backend/cafeteriaService.go b/server/backend/cafeteriaService.go
diff --git a/server/backend/canteenHeadCount.go b/server/backend/canteenHeadCount.go
@@ -12,9 +12,9 @@ import (
 )
 
 // GetCanteenHeadCount RPC Endpoint
-func (s *CampusServer) GetCanteenHeadCount(_ context.Context, input *pb.GetCanteenHeadCountRequest) (*pb.GetCanteenHeadCountReply, error) {
+func (s *CampusServer) GetCanteenHeadCount(ctx context.Context, input *pb.GetCanteenHeadCountRequest) (*pb.GetCanteenHeadCountReply, error) {
 	data := model.CanteenHeadCount{Count: 0, MaxCount: 0, Percent: -1} // Initialize with an empty (not found) value
-	err := s.db.Model(&model.CanteenHeadCount{}).Where(model.CanteenHeadCount{CanteenId: input.CanteenId}).FirstOrInit(&data).Error
+	err := s.db.WithContext(ctx).Model(&model.CanteenHeadCount{}).Where(model.CanteenHeadCount{CanteenId: input.CanteenId}).FirstOrInit(&data).Error
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		log.WithError(err).Error("while querying the canteen head count for: ", input.CanteenId)
 		return nil, errors.New("failed to query head count")

diff --git a/server/backend/news.go b/server/backend/news.go
@@ -19,7 +19,7 @@ func (s *CampusServer) GetNewsSources(ctx context.Context, _ *pb.GetNewsSourcesR
 	}
 
 	var sources []model.NewsSource
-	if err := s.db.Joins("Files").Find(&sources).Error; err != nil {
+	if err := s.db.WithContext(ctx).Joins("Files").Find(&sources).Error; err != nil {
 		log.WithError(err).Error("could not find newsSources")
 		return nil, status.Error(codes.Internal, "could not GetNewsSources")
 	}
@@ -42,7 +42,7 @@ func (s *CampusServer) GetNews(ctx context.Context, req *pb.GetNewsRequest) (*pb
 	}
 
 	var newsEntries []model.News
-	tx := s.db.Joins("Files")
+	tx := s.db.WithContext(ctx).Joins("Files")
 	if req.NewsSource != 0 {
 		tx = tx.Where("src = ?", req.NewsSource)
 	}

diff --git a/server/backend/newsAlerts.go b/server/backend/newsAlerts.go
@@ -19,7 +19,7 @@ func (s *CampusServer) GetTopNews(ctx context.Context, _ *pb.GetTopNewsRequest)
 	}
 
 	var res *model.NewsAlert
-	err := s.db.Joins("Files").Where("NOW() between `from` and `to`").First(&res).Error
+	err := s.db.WithContext(ctx).Joins("Files").Where("NOW() between `from` and `to`").First(&res).Error
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, status.Error(codes.NotFound, "no current active top news")
 	} else if err != nil {

diff --git a/server/backend/rpcserver.go b/server/backend/rpcserver.go
@@ -80,7 +80,7 @@ func (s *CampusServer) SearchRooms(ctx context.Context, req *pb.SearchRoomsReque
 		Campus string
 		Name   string
 	}
-	err := s.db.Raw("SELECT r.*, a.campus, a.name "+
+	err := s.db.WithContext(ctx).Raw("SELECT r.*, a.campus, a.name "+
 		"FROM roomfinder_rooms r "+
 		"LEFT JOIN roomfinder_building2area a ON a.building_nr = r.building_nr "+
 		"WHERE MATCH(room_code, info, address) AGAINST(?)", req.Query).Scan(&res).Error

diff --git a/server/backend/updateNote.go b/server/backend/updateNote.go
@@ -19,7 +19,7 @@ func (s *CampusServer) GetUpdateNote(ctx context.Context, req *pb.GetUpdateNoteR
 	}
 
 	res := model.UpdateNote{VersionCode: req.Version}
-	if err := s.db.First(&res).Error; errors.Is(err, gorm.ErrRecordNotFound) {
+	if err := s.db.WithContext(ctx).First(&res).Error; errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, status.Error(codes.NotFound, "No update note found")
 	} else if err != nil {
 		log.WithField("VersionCode", req.Version).WithError(err).Error("Failed to get update note")