Merge pull request #9 from nhkhai/main

SIS-22: Updated ER Diagram to change mobile_no to phone_no.
kiblykat · Mar 21, 2024 · a45dc54 · a45dc54
2 parents f7a1799 + 1e38657
commit a45dc54
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/Documentation/Diagrams/Entity Relationship Diagram.md b/Documentation/Diagrams/Entity Relationship Diagram.md
@@ -7,19 +7,10 @@ erDiagram
         string country
         string address
         int postal_code
-        int mobile_number
+        int phone_number
         string email
     }
 
-    Review {
-        long id PK
-        string category
-        string review_content
-        int rating
-        long customer_id FK
-        long product_id FK
-    }
-
     Product {
         long id PK
         string category
@@ -29,6 +20,15 @@ erDiagram
         int stock_quantity
     }
 
+    Review {
+        long id PK
+        string category
+        string review_content
+        int rating
+        long customer_id FK
+        long product_id FK
+    }
+
     Customer ||--O{ Review : "Has"
     Product ||--O{ Review : "Has"
 ```
diff --git a/src/main/java/sg/com/smartinventory/entities/Customer.java b/src/main/java/sg/com/smartinventory/entities/Customer.java
@@ -45,9 +45,9 @@ public class Customer {
   @Column(name = "postal_code")
   private int postalCode;
 
-  @Digits(fraction = 0, integer = 8, message = "Mobile no should be 8 digits. ")
-  @Column(name = "mobile_number")
-  private int mobileNumber;
+  @Digits(fraction = 0, integer = 8, message = "Phone no should be 8 digits. ")
+  @Column(name = "phone_number")
+  private int phoneNumber;
 
   @Email(message = "Email should be valid. ")
   @Column(name = "email")
@@ -57,7 +57,7 @@ public Customer() {
   }
 
   // Define Constructor for DataLoader.
-  public Customer(String firstName, String lastName, String country, String address, int postalCode, int mobileNumber,
+  public Customer(String firstName, String lastName, String country, String address, int postalCode, int phoneNumber,
       String email) {
     this();
 
@@ -66,7 +66,7 @@ public Customer(String firstName, String lastName, String country, String addres
     this.country = country;
     this.address = address;
     this.postalCode = postalCode;
-    this.mobileNumber = mobileNumber;
+    this.phoneNumber = phoneNumber;
     this.email = email;
   }
 }
diff --git a/src/main/java/sg/com/smartinventory/exceptions/ProductNotFoundException.java b/src/main/java/sg/com/smartinventory/exceptions/ProductNotFoundException.java
@@ -1,7 +1,7 @@
 package sg.com.smartinventory.exceptions;
 
 public class ProductNotFoundException extends RuntimeException {
-    public ProductNotFoundException(String id) {
+    public ProductNotFoundException(Long id) {
         super("Could not find product with id: " + id + ". ");
     }
 }
diff --git a/src/main/java/sg/com/smartinventory/exceptions/ReviewNotFoundException.java b/src/main/java/sg/com/smartinventory/exceptions/ReviewNotFoundException.java
@@ -1,7 +1,7 @@
 package sg.com.smartinventory.exceptions;
 
 public class ReviewNotFoundException extends RuntimeException {
-    public ReviewNotFoundException(String id) {
+    public ReviewNotFoundException(Long id) {
         super("Could not find review with id: " + id + ". ");
     }
 }
diff --git a/src/test/java/sg/com/smartinventory/controllers/CustomerControllerTest.java b/src/test/java/sg/com/smartinventory/controllers/CustomerControllerTest.java
@@ -42,7 +42,7 @@ public void createCustomerTest() throws Exception {
 
                 // Step 1: Create a Customer object
                 Customer newCustomer = Customer.builder().firstName("Jackie").lastName("Chan").country("Hong Kong")
-                                .address("123 HK St").postalCode(654321).mobileNumber(87654321)
+                                .address("123 HK St").postalCode(654321).phoneNumber(87654321)
                                 .email("[email protected]").build();
 
                 // Step 2: Convert the Java object to JSON using ObjectMapper.

diff --git a/src/test/java/sg/com/smartinventory/integration/IntegrationTest.java b/src/test/java/sg/com/smartinventory/integration/IntegrationTest.java
@@ -48,7 +48,7 @@ public class IntegrationTest {
         public void createCustomerTest() {
                 // 1. Setup.
                 Customer testObject1 = Customer.builder().firstName("Jackie").lastName("Chan").country("Hong Kong")
-                                .address("123 HK St").postalCode(654321).mobileNumber(87654321)
+                                .address("123 HK St").postalCode(654321).phoneNumber(87654321)
                                 .email("[email protected]").build();
 
                 // mock the save method of the customer repository
@@ -69,10 +69,10 @@ public void createCustomerTest() {
         public void runIntegratedTest() throws Exception {
                 // Step 1: Create the test objects.
                 Customer testObject1 = Customer.builder().firstName("Jackie").lastName("Chan").country("Hong Kong")
-                                .address("123 HK St").postalCode(654321).mobileNumber(87654321)
+                                .address("123 HK St").postalCode(654321).phoneNumber(87654321)
                                 .email("[email protected]").build();
                 Customer testObject2 = Customer.builder().firstName("Jackie").lastName("Chang").country("Hong Kong")
-                                .address("123 HK St").postalCode(654321).mobileNumber(87654321)
+                                .address("123 HK St").postalCode(654321).phoneNumber(87654321)
                                 .email("[email protected]").build();
 
                 // Step 2: Convert the Java objects to JSON using ObjectMapper.

diff --git a/src/test/java/sg/com/smartinventory/services/CustomerServiceImplTest.java b/src/test/java/sg/com/smartinventory/services/CustomerServiceImplTest.java
@@ -31,7 +31,7 @@ public void createCustomerTest() {
         // 1. SETUP
         // Create a new customer.
         Customer customer = Customer.builder().firstName("John").lastName("Wick").country("USA").address("123 Main St")
-                .postalCode(123456).mobileNumber(12345678).email("[email protected]").build();
+                .postalCode(123456).phoneNumber(12345678).email("[email protected]").build();
 
         // Mock the save method of the customer repository.
         when((customerRepository.save(customer))).thenReturn(customer);

diff --git a/src/test/java/sg/com/smartinventory/useCases/UseCaseTest.java b/src/test/java/sg/com/smartinventory/useCases/UseCaseTest.java
@@ -48,7 +48,7 @@ public class UseCaseTest {
         public void createCustomerTest() {
                 // 1. Setup.
                 Customer testObject1 = Customer.builder().firstName("Jackie").lastName("Chan").country("Hong Kong")
-                                .address("123 HK St").postalCode(654321).mobileNumber(87654321)
+                                .address("123 HK St").postalCode(654321).phoneNumber(87654321)
                                 .email("[email protected]").build();
 
                 // mock the save method of the customer repository
@@ -69,10 +69,10 @@ public void createCustomerTest() {
         public void runIntegratedTest() throws Exception {
                 // Step 1: Create the test objects.
                 Customer testObject1 = Customer.builder().firstName("Jackie").lastName("Chan").country("Hong Kong")
-                                .address("123 HK St").postalCode(654321).mobileNumber(87654321)
+                                .address("123 HK St").postalCode(654321).phoneNumber(87654321)
                                 .email("[email protected]").build();
                 Customer testObject2 = Customer.builder().firstName("Jackie").lastName("Chang").country("Hong Kong")
-                                .address("123 HK St").postalCode(654321).mobileNumber(87654321)
+                                .address("123 HK St").postalCode(654321).phoneNumber(87654321)
                                 .email("[email protected]").build();
 
                 // Step 2: Convert the Java objects to JSON using ObjectMapper.