fixed application.properties of booking-service and fixed feignClient in booking-service, and X-user-id returning username

Author: Yash-vs9

booking-service/src/main/java/com/streamseat/bookingservice/client/EventClient.java

@@ -8,16 +8,15 @@
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-// NAME must match the name in Eureka (EVENT-SERVICE)
 @FeignClient(name = "event-service")
 public interface EventClient {
 
-    // We are "mapping" the call to the Event Service's existing endpoint
-    // GET http://event-service/api/events/{id}
-    // (Note: We need to go add this endpoint to Event Service later if it's missing!)
     @GetMapping("/api/events/{id}")
+        // Added ("id") here
     EventDTO getEventById(@PathVariable("id") Long id);
 
     @PutMapping("/api/events/{id}/reserve")
-    boolean reserveSeat(@PathVariable("id") Long id, @RequestParam SeatType seatType);
+        // Added ("id") and ("seatType") here
+    boolean reserveSeat(@PathVariable("id") Long id,
+                        @RequestParam("seatType") SeatType seatType);
 }

booking-service/src/main/java/com/streamseat/bookingservice/controller/BookingController.java

@@ -21,9 +21,10 @@ public BookingController(BookingRepository bookingRepository, EventClient eventC
     }
 
     @PostMapping
-    public String bookTicket(@RequestBody Booking bookingRequest) {
+    public String bookTicket(@RequestBody Booking bookingRequest,@RequestHeader("X-User-Id") String userId) {
         Long eventId = bookingRequest.getEventId();
 
+
         // 1. TALK to Event Service: "Does this event exist?"
         EventDTO event = eventClient.getEventById(eventId);
         if (event == null) {
@@ -39,6 +40,8 @@ public String bookTicket(@RequestBody Booking bookingRequest) {
         // 3. BOOK IT
         bookingRequest.setStatus(Status.valueOf("CONFIRMED"));
         bookingRequest.setBookingTime(LocalDateTime.now());
+        bookingRequest.setUserId(userId);
+        System.out.println(userId);
         bookingRepository.save(bookingRequest);
 
         return "Success! Ticket booked for event: " + event.getTitle();

booking-service/src/main/java/com/streamseat/bookingservice/model/Booking.java

@@ -21,7 +21,7 @@ public class Booking {
     private Long id;
 
     private Long eventId;    // Which event?
-    private Long userId;     // Who booked it? (We'll hardcode this for now)
+    private String userId;     // Who booked it? (We'll hardcode this for now)
     @Enumerated(EnumType.STRING)
     private SeatType seatType;
     private Status status;   // CONFIRMED, CANCELLED

booking-service/src/main/java/com/streamseat/bookingservice/service/BookingService.java

@@ -17,7 +17,7 @@
 public class BookingService {
     public final EventClient eventClient;
     private final BookingRepository bookingRepository;
-    public String bookTicket(Long eventId, SeatType seat,Long userId){
+    public String bookTicket(Long eventId, SeatType seat,String userId){
         EventDTO event=eventClient.getEventById(eventId);
         Booking booking=new Booking();
         booking.setBookingTime(event.getEventDateTime());

booking-service/src/main/resources/application.properties

@@ -4,17 +4,18 @@ spring.application.name=booking-service
 server.port=8080
 
 # 1. Eureka Fix: Use the service name 'discovery-server'
-eureka.client.service-url.defaultZone=${EUREKA_URL:http://discovery-server:8761/eureka/}
+eureka.client.service-url.defaultZone=http://localhost:8761/eureka/
 
 # 2. Database Fix: Use the service name 'mysqldb'
-spring.datasource.url=${SPRING_DATASOURCE_URL:jdbc:mysql://mysqldb:3306/stream_seat_db?createDatabaseIfNotExist=true}
-spring.datasource.username=${SPRING_DATASOURCE_USERNAME:root}
-spring.datasource.password=${SPRING_DATASOURCE_PASSWORD:root}
+spring.datasource.url=jdbc:mysql://localhost:3306/stream_seat_db?createDatabaseIfNotExist=true
+spring.datasource.username=root
+spring.datasource.password=kesh@v123
+spring.jpa.hibernate.ddl-auto=create
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
+event.service.url=http://localhost:8081
 # 3. Networking Fix: Crucial for Docker
 eureka.instance.prefer-ip-address=true
 
-spring.jpa.hibernate.ddl-auto=update
+
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect