Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven...

Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into product-page-users-can-add-one-or-more-item-to-cart-with-a-button

ecom-service/src/main/java/com/nisum/ecomservice/config/AppConfig.java

@@ -2,9 +2,19 @@ package com.nisum.ecomservice.config;
 
 
 public class AppConfig {
-    private static String orderManagementAPI = "http://localhost:8084/api";
+    private static final String orderManagementUrl = "http://localhost:8084";
+    private static final String productsManagementUrl = "http://localhost:8083";
+    private static final String promoManagementUrl = "http://localhost:8082";
 
-    public static String getOrderManagementAPI() {
-        return orderManagementAPI;
+    public static String getOrderManagementUrl() {
+        return orderManagementUrl;
+    }
+
+    public static String getProductsManagementUrl() {
+        return productsManagementUrl;
+    }
+
+    public static String getPromoManagementUrl() {
+        return promoManagementUrl;
     }
 }

ecom-service/src/main/java/com/nisum/ecomservice/service/OrderService.java

@@ -72,7 +72,7 @@ public class OrderService {
     }
 
     public Mono<Order> postOrderToAPI(OrderSubmission orderSubmission){
-        return WebClient.create(String.format("%s/orders", AppConfig.getOrderManagementAPI()))
+        return WebClient.create(String.format("%s/api/orders", AppConfig.getOrderManagementUrl()))
                 .post()
                 .bodyValue(orderSubmission)
                 .retrieve()
@@ -80,7 +80,7 @@ public class OrderService {
     }
 
     public Flux<Order> getOrderFromOmsAPI(String userId){
-        return WebClient.create(String.format("%s/orders/byCustomer/%s", AppConfig.getOrderManagementAPI(),userId))
+        return WebClient.create(String.format("%s/api/orders/byCustomer/%s", AppConfig.getOrderManagementUrl(),userId))
                 .get()
                 .retrieve()
                 .bodyToFlux(Order.class);

ecom-service/src/main/java/com/nisum/ecomservice/service/ProductService.java

 package com.nisum.ecomservice.service;
 
+import com.nisum.ecomservice.config.AppConfig;
 import com.nisum.ecomservice.model.Product;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -11,7 +12,7 @@ import reactor.core.publisher.Flux;
 @Service
 public class ProductService {
     public Mono<Product> getProductBySku(String sku){
-        return WebClient.create(String.format("http://localhost:8083/api/products/%s",sku))
+        return WebClient.create(String.format("%s/api/products/%s", AppConfig.getProductsManagementUrl(),sku))
                 .get()
                 .retrieve()
                 .bodyToMono(Product.class);
@@ -20,7 +21,7 @@ public class ProductService {
     public Flux<Product> getAllProducts() {
         return WebClient
                 .builder()
-                .baseUrl("http://localhost:8083")
+                .baseUrl(AppConfig.getProductsManagementUrl())
                 .build()
                 .get()
                 .uri("/api/products")
@@ -31,7 +32,7 @@ public class ProductService {
     public Flux<Promotion> getAllPromotions() {
         return WebClient
                 .builder()
-                .baseUrl("http://localhost:8082")
+                .baseUrl(AppConfig.getPromoManagementUrl())
                 .build()
                 .get()
                 .uri("/api/promos")

ecom-web/src/config.js

 class Config {
-    static baseApiUrl = "http://localhost:8080/api"; //env file
-    static orderHistoryApiUrlMethod = (userId) => `${this.baseApiUrl}/orders/byUser/${userId}`;
+    static baseApiUrl = "http://localhost:8080"; //env file
+    static orderHistoryApiUrlMethod = (userId) => `${this.baseApiUrl}/api/orders/byUser/${userId}`;
 
 
 }

ecom-web/src/util/product_api_util.js

 import axios from 'axios';
+import Config from '../config';
 
 export const fetchProducts = () => {
-    return axios.get("http://localhost:8080/api/products")
+    return axios.get(`${Config.baseApiUrl}/api/products`)
 }
 
 export const fetchPromotions = () => {
-    return axios.get("http://localhost:8080/api/promos")
+    return axios.get(`${Config.baseApiUrl}/api/promos`)
 }
 
 export const fetchProductsAndPromotions = () => {
-    return axios.get("http://localhost:8080/api/products-and-promos")
+    return axios.get(`${Config.baseApiUrl}/api/products-and-promos`)
 }
\ No newline at end of file

ecom-web/src/util/session-api-util.js

 import axios from 'axios';
+import Config from '../config';
 
 export const postUser = (user) => {
-    return axios.post("http://localhost:8080/api/users", user)
+    return axios.post(`${Config.baseApiUrl}/api/users`, user)
 }
 
 // export const postUser = (user) => {