Fix : #945

rajadilipkolli · Nov 2, 2023 · 22b7545 · 22b7545
1 parent 2b42c5e
commit 22b7545
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/...-elasticsearch/src/main/java/com/example/mongoes/web/controller/RestaurantController.java b/...-elasticsearch/src/main/java/com/example/mongoes/web/controller/RestaurantController.java
@@ -3,6 +3,7 @@
 import com.example.mongoes.document.Grades;
 import com.example.mongoes.document.Restaurant;
 import com.example.mongoes.response.GenericMessage;
+import com.example.mongoes.web.model.RestaurantRequest;
 import com.example.mongoes.web.service.RestaurantService;
 import io.micrometer.core.annotation.Timed;
 import jakarta.validation.Valid;
@@ -76,17 +77,19 @@ public Mono<ResponseEntity<Restaurant>> addNotesToRestaurant(
     }
 
     @PostMapping("/restaurant")
-    public ResponseEntity<Object> createRestaurant(@RequestBody Restaurant restaurant) {
+    public ResponseEntity<GenericMessage> createRestaurant(
+            @RequestBody RestaurantRequest restaurantRequest) {
         return ResponseEntity.created(
                         URI.create(
                                 String.format(
                                         "/restaurant/%s",
                                         this.restaurantService
-                                                .createRestaurant(restaurant)
+                                                .createRestaurant(restaurantRequest)
                                                 .map(Restaurant::getName))))
                 .body(
                         new GenericMessage(
                                 String.format(
-                                        "restaurant with name %s created", restaurant.getName())));
+                                        "restaurant with name %s created",
+                                        restaurantRequest.name())));
     }
 }
diff --git a/...-mongodb-elasticsearch/src/main/java/com/example/mongoes/web/model/RestaurantRequest.java b/...-mongodb-elasticsearch/src/main/java/com/example/mongoes/web/model/RestaurantRequest.java
@@ -0,0 +1,26 @@
+package com.example.mongoes.web.model;
+
+import com.example.mongoes.document.Address;
+import com.example.mongoes.document.Grades;
+import com.example.mongoes.document.Restaurant;
+import java.util.List;
+
+public record RestaurantRequest(
+        Long restaurantId,
+        String name,
+        String borough,
+        String cuisine,
+        Address address,
+        List<Grades> grades) {
+
+    public Restaurant toRestaurant() {
+        Restaurant restaurant = new Restaurant();
+        restaurant.setAddress(address);
+        restaurant.setBorough(borough);
+        restaurant.setCuisine(cuisine);
+        restaurant.setGrades(grades);
+        restaurant.setName(name);
+        restaurant.setRestaurantId(restaurantId);
+        return restaurant;
+    }
+}
diff --git a/...ongodb-elasticsearch/src/main/java/com/example/mongoes/web/service/RestaurantService.java b/...ongodb-elasticsearch/src/main/java/com/example/mongoes/web/service/RestaurantService.java
@@ -9,6 +9,7 @@
 import com.example.mongoes.mongodb.repository.RestaurantRepository;
 import com.example.mongoes.utils.AppConstants;
 import com.example.mongoes.utils.DateUtility;
+import com.example.mongoes.web.model.RestaurantRequest;
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.OperationType;
 import java.io.IOException;
@@ -208,8 +209,9 @@ public Mono<SearchPage<Restaurant>> findAllRestaurants(Integer offset, Integer l
         return this.restaurantESRepository.findAll(pageable);
     }
 
-    public Mono<Restaurant> createRestaurant(Restaurant restaurant) {
-        return save(restaurant);
+    public Mono<Restaurant> createRestaurant(RestaurantRequest restaurantRequest) {
+
+        return save(restaurantRequest.toRestaurant());
     }
 
     public Mono<Void> deleteAll() {