fixed a few naming differences between Mensa and Cafeteria

TUM-Dev · Mar 13, 2024 · 1f67c0b · 1f67c0b
1 parent 8b7f232
commit 1f67c0b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/server/api/tumdev/campus_backend.pb.go b/server/api/tumdev/campus_backend.pb.go
diff --git a/server/api/tumdev/campus_backend.proto b/server/api/tumdev/campus_backend.proto
@@ -270,7 +270,8 @@ message ListCanteenRatingsReply {
 message GetDishRatingsRequest {
   // Mandatory Name of the canteen (EAT-API naming scheme "MENSA_GARCHING")
   string canteen_id = 1;
-  // Mandatory Name of the dish (EAT-API naming scheme) Must be available int the given mensa
+  // Mandatory Name of the dish (EAT-API naming scheme)
+  // Must be available in the given cafeteria
   string dish = 2;
   // Optional Parameter to define an interval for the ratings (Lower bound)
   google.protobuf.Timestamp from = 3;
@@ -323,9 +324,10 @@ message CreateDishRatingReply {}
 message CreateDishRatingRequest {
   // number in the range 1-5
   int32 points = 1;
-  // Mandatory Name of the dish (EAT-API naming scheme "MENSA_GARCHING") Must be available int the given mensa
+  // Mandatory Name of the dish (EAT-API naming scheme "MENSA_GARCHING") Must be available in the given cafeteria
   string canteen_id = 2;
-  // Mandatory Name of the dish (EAT-API naming scheme) Must be available int the given mensa
+  // Mandatory Name of the dish (EAT-API naming scheme)
+  // Must be available in the given cafeteria
   string dish = 3;
   // Optional JPEG image in Base64
   bytes image = 4;

diff --git a/server/api/tumdev/campus_backend.swagger.json b/server/api/tumdev/campus_backend.swagger.json
@@ -1009,11 +1009,11 @@
         },
         "canteenId": {
           "type": "string",
-          "title": "Mandatory Name of the dish (EAT-API naming scheme \"MENSA_GARCHING\") Must be available int the given mensa"
+          "title": "Mandatory Name of the dish (EAT-API naming scheme \"MENSA_GARCHING\") Must be available in the given cafeteria"
         },
         "dish": {
           "type": "string",
-          "title": "Mandatory Name of the dish (EAT-API naming scheme) Must be available int the given mensa"
+          "title": "Mandatory Name of the dish (EAT-API naming scheme)\nMust be available in the given cafeteria"
         },
         "image": {
           "type": "string",
@@ -1135,7 +1135,7 @@
         },
         "dish": {
           "type": "string",
-          "title": "Mandatory Name of the dish (EAT-API naming scheme) Must be available int the given mensa"
+          "title": "Mandatory Name of the dish (EAT-API naming scheme)\nMust be available in the given cafeteria"
         },
         "from": {
           "type": "string",

diff --git a/server/backend/cafeteria.go b/server/backend/cafeteria.go
@@ -400,27 +400,27 @@ func (s *CampusServer) CreateDishRating(ctx context.Context, input *pb.CreateDis
 		return nil, errorRes
 	}
 
-	var dishInMensa *model.Dish
-	if err := tx.First(&dishInMensa, "name LIKE ? AND cafeteriaID = ?", input.Dish, cafeteriaID).Error; err != nil || dishInMensa == nil {
-		log.WithError(err).Error("Error while creating a new dishInMensa rating.")
+	var dishInCafeteria *model.Dish
+	if err := tx.First(&dishInCafeteria, "name LIKE ? AND cafeteriaID = ?", input.Dish, cafeteriaID).Error; err != nil || dishInCafeteria == nil {
+		log.WithError(err).Error("Error while creating a new dishInCafeteria rating.")
 		return nil, status.Error(codes.InvalidArgument, "Dish is not offered in this week in this canteen. Rating has not been saved.")
 	}
 
-	resPath := imageWrapper(input.Image, "dishes", dishInMensa.Dish)
+	resPath := imageWrapper(input.Image, "dishes", dishInCafeteria.Dish)
 
 	rating := model.DishRating{
 		Comment:   input.Comment,
-		DishID:    dishInMensa.Dish,
+		DishID:    dishInCafeteria.Dish,
 		Points:    input.Points,
 		Timestamp: time.Now(),
 		Image:     resPath,
 	}
 	if err := tx.Create(&rating).Error; err != nil {
-		log.WithError(err).Error("while creating a new dishInMensa rating.")
+		log.WithError(err).Error("while creating a new dishInCafeteria rating.")
 		return nil, status.Error(codes.Internal, "Error while creating the new rating in the database. Rating has not been saved.")
 	}
 
-	assignDishNameTag(rating, dishInMensa.Dish, tx)
+	assignDishNameTag(rating, dishInCafeteria.Dish, tx)
 
 	if err := storeRatingTags(rating.DishRating, input.RatingTags, DISH, tx); err != nil {
 		return &pb.CreateDishRatingReply{}, err