Fix for aggregate course

Author: Nasruddin

.idea/workspace.xml

@@ -0,0 +1,23 @@
+echo "Building Docker images for Kubernetes using Minikube..."
+
+# Define an array of services
+SERVICES=(
+  "microservices/course-composite-service:course-composite-service"
+  "microservices/course-service:course-service"
+  "microservices/review-service:review-service"
+  "spring-cloud/gateway-service:gateway-service"
+)
+
+eval $(minikube docker-env --profile microservice-deployment)
+
+# Iterate over services and build each one
+for SERVICE in "${SERVICES[@]}"; do
+  IFS=":" read -r DIR IMAGE <<< "$SERVICE"
+  echo "Building $IMAGE..."
+  cd "$DIR" || { echo "Failed to enter directory $DIR"; exit 1; }
+  docker build -t "$IMAGE" .
+  cd - >/dev/null || exit 1
+  echo "$IMAGE built successfully!"
+done
+
+echo "All images built successfully!"

build-images.sh

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: course-composite-service
-          image: spring-boot-based-microservices-course-composite-service # Please rename these while building docker image
+          image: course-composite-service # Please rename these while building docker image
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:
@@ -25,5 +25,7 @@ spec:
           ports:
             - containerPort: 5000
           env:
-          #  - name: SPRING_DATASOURCE_URL
-          #    value: jdbc:postgresql://course-postgres/course_db
+            - name: COURSE_SERVICE_URL
+              value: http://course-service
+            - name: REVIEW_SERVICE_URL
+              value: http://review-service

microservices/course-composite-service/kubernetes/deployment.yml

@@ -4,7 +4,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
@@ -13,27 +12,27 @@
 @Service
 public class CourseCompositeIntegration {
 
-    private static final Logger LOG = LoggerFactory.getLogger(CourseCompositeIntegration.class);
+    private static final Logger logger = LoggerFactory.getLogger(CourseCompositeIntegration.class);
 
     private final String courseServiceUrl;
     private final String reviewServiceUrl;
     private final WebClient webClient;
 
     public CourseCompositeIntegration(
-            @Value("${app.course-service.host}") String courseServiceHost,
-            @Value("${app.course-service.port}") String courseServicePort,
-            @Value("${app.review-service.host}") String reviewServiceHost,
-            @Value("${app.review-service.port}") String reviewServicePort,
+            @Value("${app.course-service.uri}") String courseServiceUrl,
+            @Value("${app.review-service.uri}") String reviewServiceUrl,
             WebClient.Builder webClient
     ) {
         this.webClient = webClient.build();
-        courseServiceUrl = "http://" + courseServiceHost + ":" + courseServicePort;
-        reviewServiceUrl = "http://" + reviewServiceHost + ":" + reviewServicePort;
+        this.courseServiceUrl = courseServiceUrl;
+        this.reviewServiceUrl = reviewServiceUrl;
     }
 
     public Mono<CourseAggregate> getCourseDetails(Long id) {
         String courseUrl = courseServiceUrl + "/api/courses/" + id;
         String reviewUrl = reviewServiceUrl + "/api/reviews?course=" + id;
+        logger.info("Course URL ===> {}", courseUrl);
+        logger.info("Review URL ===> {}", reviewUrl);
         Mono<Course> courseMono = webClient.get()
                 .uri(courseUrl)
                 .retrieve()

microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseCompositeIntegration.java

@@ -1,10 +1,10 @@
 app:
+
   course-service:
-    host: localhost
-    port: 9001
+    uri: ${COURSE_SERVICE_URL:http://localhost:9001}
+
   review-service:
-    host: localhost
-    port: 9002
+    uri: ${REVIEW_SERVICE_URL:http://localhost:9002}
 spring:
   application:
     name: course-composite-service
@@ -23,8 +23,6 @@ server:
   port: 8080
 app:
   course-service:
-    host: course
-    port: 8080
+    uri: http://course:8080
   review-service:
-    host: review
-    port: 8080
+    uri: http://review:8080

microservices/course-composite-service/src/main/resources/application.yml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: course-service
-          image: spring-boot-based-microservices-course
+          image: course-service
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:

microservices/course-service/kubernetes/deployment.yml

@@ -44,7 +44,8 @@ public Course getById(@PathVariable Long id) {
     }
 
     /*
-    * http POST :9001/api/courses title="Microservices with Spring Boot" author="John Doe" price:=29.79 publisher="Manning"
+    * http POST :9001/api/courses title="Microservices with Spring Boot" author="John Doe" price:=29.79 publisher="GitHub"
+    * http POST :9001/api/courses title="Spring Boot in Action" author="John Doe" price:=69.45 publisher="GitHub"
     * */
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)

microservices/course-service/src/main/java/io/javatab/microservices/core/course/web/CourseController.java

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: review-service
-          image: spring-boot-based-microservices-review
+          image: review-service
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:

microservices/review-service/kubernetes/deployment.yml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: gateway-service
-          image: spring-boot-based-spring-cloud-gateway-service
+          image: gateway-service
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop: