Dev (#156)

* Update Search Product and use API Provinces * validation form * Testing service (#117) * update category service test * update product service test * update user service test * update user address service test * update authenticate service test * update order service test * update order detail service test * update rating service test * Shipping api (#118) * add role shipper and update permission * update database attribute * update and implement order service logic for shipping * implement shipping API * implement statistic API * add get by role user API for order statistic * clean code * update get refund api * update-validation-phone * tt * update * update * FIX: FIX Bu User and UI Dashboard Admin * updatechangePassword * test code * updateRegister * u * t * update * completed split into 2 status * FEAT: Handle Order and Style Step shipping * Search product User and Back to Top * Update search Client * updateN * ud * FEAT: Handle Roles Shipper * User address * Update search both user admin Fix bug view User * FEAT * Feature/modify add product (#132) * Update Search Product and use API Provinces * Search product User and Back to Top * Update search Client * User address * Update search both user admin Fix bug view User --------- Co-authored-by: Dinh Quang Huy <dinhquanghuy0809@gmail.com> * add * LoginAdmin * UpdateLoginAdmin * add get shipper with order asc API * update service test and directory * update api * Update Shipper * Shipper rolse * FIX CSS TABLE * Update Refund UI * TEST BUG * Fix validate and redirect * Validate fullname * update profile (#150) * Ci cd 1 (#151) * update profile * Ci cd 1 (#152) * update profile * update profile * fix cors * Ci cd 1 (#155) * update profile * update profile * fix cors * Bump guava from 31.1-jre to 32.0.0-jre --------- Co-authored-by: Dinh Quang Huy <dinhquanghuy0809@gmail.com> Co-authored-by: Nguyễn Trung Quốc <113247967+qnt078@users.noreply.github.com> Co-authored-by: Dinh Quang Huy <71219472+quanghuy89@users.noreply.github.com> Co-authored-by: tdnbao281001 <61140987+trandangnguyenbao@users.noreply.github.com> Co-authored-by: trandangnguyenbao <trandangnguyenbao2810@gmail.com>
letiendat1002 · Jun 26, 2023 · ec0ea93 · ec0ea93
1 parent 22cade0
commit ec0ea93
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 20 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>32.0.0-jre</version>
         </dependency>
 
         <dependency>

diff --git a/backend/src/main/java/com/ecommerce/backend/shared/config/OpenApiConfig.java b/backend/src/main/java/com/ecommerce/backend/shared/config/OpenApiConfig.java
@@ -3,6 +3,7 @@
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Info;
+import io.swagger.v3.oas.annotations.servers.Server;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
@@ -15,7 +16,17 @@
         info = @Info(
                 title = "Ecommerce Application API",
                 version = "1.0"
-        )
+        ),
+        servers = {
+                @Server(
+                        description = "Local Server",
+                        url = "http://localhost:8080"
+                ),
+                @Server(
+                        description = "Railway Server",
+                        url = "https://e-commerce-production-0d6c.up.railway.app"
+                )
+        }
 )
 public class OpenApiConfig {
     @Bean

diff --git a/backend/src/main/resources/application-dev.yml b/backend/src/main/resources/application-dev.yml
@@ -3,6 +3,10 @@ spring:
     url: jdbc:mysql://localhost:3333/myecommerce
     username: root
     password: root
+  jpa:
+    show-sql: true
+    hibernate:
+      ddl-auto: update
 
 env-variable:
   url: http://localhost:8080

diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml
@@ -0,0 +1,15 @@
+server:
+  port: 5000
+
+spring:
+  datasource:
+    url: jdbc:mysql://containers-us-west-195.railway.app:6254/myecommerce
+    username: root
+    password: 7VP7XGaoGdd30qvSYf3T
+  jpa:
+    show-sql: false
+    hibernate:
+      ddl-auto: none
+
+env-variable:
+  url: https://e-commerce-production-0d6c.up.railway.app
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
@@ -10,7 +10,6 @@ spring:
     web-application-type: servlet
   jpa:
     hibernate:
-      ddl-auto: update
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
     properties:
@@ -22,7 +21,6 @@ spring:
         order_updates: true
         format_sql: true
         dialect: org.hibernate.dialect.MySQLDialect
-    show-sql: true
     open-in-view: true
   mail:
     host: smtp.gmail.com
@@ -41,7 +39,7 @@ spring:
           starttls:
             enable: true
   profiles:
-    active: dev
+    active: prod
 
 springdoc:
   api-docs:

diff --git a/...d/src/test/java/com/ecommerce/backend/service/orderdetail/OrderDetailServiceImplTest.java b/...d/src/test/java/com/ecommerce/backend/service/orderdetail/OrderDetailServiceImplTest.java
@@ -131,21 +131,6 @@ void fetchOrderDetailByOrderIDAndProductID() {
         assertThat(actual).isEqualTo(orderDetail);
     }
 
-    @Test
-    void whenFetchOrderDetailByOrderIDAndProductID_butNotExistOrderDetailID_thenThrowException() {
-        // Given
-        var id = BigInteger.valueOf(1);
-
-        // When
-        when(orderDetailDAO.selectOrderDetailByID(new OrderDetailID(id, id)))
-                .thenReturn(Optional.empty());
-
-        // Then
-        assertThatThrownBy(() -> orderDetailService
-                .fetchOrderDetailByOrderIDAndProductID(new OrderDetailID(id, id)))
-                .isInstanceOf(ResourceNotFoundException.class);
-    }
-
     @Test
     void addOrderDetail() {
         // Given

diff --git a/backend/src/test/java/com/ecommerce/backend/service/product/ProductServiceImplTest.java b/backend/src/test/java/com/ecommerce/backend/service/product/ProductServiceImplTest.java
@@ -48,6 +48,7 @@ void fetchAllProducts() {
     }
 
     @Test
+    // TODO: refactor this test
     void fetchAllProductsByCategoryID() {
         // Given
         var id = BigInteger.valueOf(1);
@@ -86,6 +87,7 @@ void whenFetchAllProductsByCategoryID_butCategoryNotFound_thenThrowException() {
     }
 
     @Test
+    // TODO: refactor product hold category id only
     void fetchProductByProductID() {
         // Given
         var id = BigInteger.valueOf(1);