[SERVER] BookingService: return rating's ID on createNewRating

huynhthanhbinh · Aug 29, 2020 · 14a0c92 · 14a0c92
1 parent 10724ad
commit 14a0c92
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/api/booking-api/src/main/proto/Booking.proto b/api/booking-api/src/main/proto/Booking.proto
@@ -304,8 +304,8 @@ service BookingService {
      *      ++ bookingId: uuid of booking
      *      ++ rating: rating star (min = 1, max = 5)
      *      ++ comment: can be an empty string or a comment string
-     *  + response: Empty value if succeed, otherwise, throw exception */
-    rpc createBookingRating (CreateBookingRatingRequest) returns (google.protobuf.Empty);
+     *  + response: new booking rating's ID if succeed, otherwise, throw exception */
+    rpc createBookingRating (CreateBookingRatingRequest) returns (google.protobuf.Int64Value);
 
     /** PUBLIC - for customer only
      * use-case: customer get existed rating of a finished booking to parking lot

diff --git a/.../main/java/com/bht/saigonparking/service/booking/service/grpc/BookingServiceGrpcImpl.java b/.../main/java/com/bht/saigonparking/service/booking/service/grpc/BookingServiceGrpcImpl.java
@@ -547,13 +547,13 @@ public void getCustomerOnGoingBooking(Empty request, StreamObserver<Booking> res
     }
 
     @Override
-    public void createBookingRating(CreateBookingRatingRequest request, StreamObserver<Empty> responseObserver) {
+    public void createBookingRating(CreateBookingRatingRequest request, StreamObserver<Int64Value> responseObserver) {
         Long customerId = serverInterceptor.getUserIdContext().get();
         try {
             serverInterceptor.validateUserRole("CUSTOMER");
-            bookingService.createBookingRating(customerId, request.getBookingId(), request.getRating(), request.getComment());
+            Long newRatingId = bookingService.createBookingRating(customerId, request.getBookingId(), request.getRating(), request.getComment());
 
-            responseObserver.onNext(Empty.getDefaultInstance());
+            responseObserver.onNext(Int64Value.of(newRatingId));
             responseObserver.onCompleted();
 
             LoggingUtil.log(Level.INFO, "SERVICE", "Success",

diff --git a/...vice/src/main/java/com/bht/saigonparking/service/booking/service/main/BookingService.java b/...vice/src/main/java/com/bht/saigonparking/service/booking/service/main/BookingService.java
@@ -101,7 +101,7 @@ Map<Tuple, String> getAllRatingsOfParkingLot(@NotNull Long parkingLotId,
 
     Map<Integer, Long> getParkingLotRatingCountGroupByRating(@NotNull Long parkingLotId);
 
-    void createBookingRating(@NotNull Long customerId,
+    Long createBookingRating(@NotNull Long customerId,
                              @NotEmpty String bookingUuidString,
                              @NotNull Integer rating,
                              @NotEmpty String comment);

diff --git a/...main/java/com/bht/saigonparking/service/booking/service/main/impl/BookingServiceImpl.java b/...main/java/com/bht/saigonparking/service/booking/service/main/impl/BookingServiceImpl.java
@@ -281,7 +281,7 @@ public Map<Integer, Long> getParkingLotRatingCountGroupByRating(@NotNull Long pa
     }
 
     @Override
-    public void createBookingRating(@NotNull Long customerId,
+    public Long createBookingRating(@NotNull Long customerId,
                                     @NotNull String bookingUuidString,
                                     @NotNull Integer rating,
                                     @NotEmpty String comment) {
@@ -297,9 +297,7 @@ public void createBookingRating(@NotNull Long customerId,
                             .rating(rating.shortValue())
                             .comment(comment)
                             .build();
-
-                    bookingRatingRepository.saveAndFlush(bookingRatingEntity);
-                    return;
+                    return bookingRatingRepository.saveAndFlush(bookingRatingEntity).getId();
                 }
                 throw new BookingAlreadyRatedException();
             }