From 601dc1f2f7386ca6ddd151ea7260d570bef4f669 Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 10:55:13 +0800
Subject: [PATCH 01/11] Update CI.yml

Added generation of the HTML test report. Fixed syntax.
---
 .github/workflows/CI.yml | 43 ++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 4b801a8..1bcb628 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,58 +1,63 @@
-# This workflow will build a Java Spring Boot Application with Maven, and run test cases. 
+# This workflow will build a Java Spring Boot Application with Maven then run test cases.
 name: Build and Test Java Spring Boot Application
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
-  run-unit-tests:
+  build-and-run-tests:
     runs-on: ubuntu-latest
 
     services:
       postgres:
-        image: postgres:latest 
-        
+        image: postgres:latest
+
         env:
           POSTGRES_USER: postgres
           # POSTGRES_PASSWORD: postgres
           POSTGRES_HOST_AUTH_METHOD: trust
           POSTGRES_DB: smart_inventory
-          
-        # Set health checks to wait until postgres has started.   
+
+        # Set health checks to wait until Postgres has started.
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-          
+
         ports:
-          # Maps tcp port 5432 on service container to the host. 
+          # Maps the TCP port 5432 on the service container to the host.
           - 5432:5432
 
     steps:
       - name: Pull repository
         uses: actions/checkout@v4.1.2
-    
+
       - name: Set up JDK
         uses: actions/setup-java@v4.2.1
         with:
-          java-version: '21'
-          distribution: 'temurin'
-          # cache: maven      # Uncomment and configure if needed. 
-        
+          java-version: "21"
+          distribution: "temurin"
+          # Uncomment and configure if needed.
+          # cache: maven
+
       - name: Run unit tests
         run: mvn test
-      
-      # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive. 
+
+      - name: Generate HTML test report
+        run: mvn surefire-report:report
+
+      # Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive (Optional).
       # - name: Update dependency graph
       #   uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
 
       - name: Build Jar file
-        run: mvn package -DskipTests      # Skip tests since they were already run. 
-      
+        # Skip tests since they were already run.
+        run: mvn package -DskipTests
+
       - name: Save Jar file
         uses: actions/upload-artifact@v4.3.1
         with:

From 2298983eaa49bbbdb87d8b70b68e02a3a4e5d156 Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 10:57:19 +0800
Subject: [PATCH 02/11] Update CI.yml

Downgraded the Java JDK version to match the project.
---
 .github/workflows/CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 1bcb628..07e7d36 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4.2.1
         with:
-          java-version: "21"
+          java-version: "17"
           distribution: "temurin"
           # Uncomment and configure if needed.
           # cache: maven

From 9c3a5bad3578fb4b6ff6510a2b34533635dfdcf4 Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 11:00:32 +0800
Subject: [PATCH 03/11] Update pom.xml

Fixed the formatting syntax.
---
 pom.xml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1305c5c..4f23c01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>3.2.3</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>sg.com.smartinventory</groupId>
 	<artifactId>smart-inventory</artifactId>
@@ -21,7 +22,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -30,7 +30,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
-
 		<!-- <dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -39,25 +38,23 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-	</dependency>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
-
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-		</dependency>	</dependencies>
-
+		</dependency>
+	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
@@ -74,5 +71,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
-</project>
+</project>
\ No newline at end of file

From a04e5036962e120a8f188a249ada6da4c8c49457 Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 11:01:56 +0800
Subject: [PATCH 04/11] Added the SpringDoc module for automatic API
 documentation generation and basic API testing Web UI.

---
 pom.xml                                   |  5 +++++
 src/main/resources/application.properties | 21 ++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f23c01..7431aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+			<version>2.4.0</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index cb885c6..6e5d7d6 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,6 @@
 spring.application.name=smart-inventory
 
+# The default server port is 8080. 
 server.port=9090
 # PostgreSQL
 spring.datasource.url=jdbc:postgresql://localhost:5432/smart_inventory
@@ -9,7 +10,21 @@ spring.datasource.username=postgres
 # Password can be blank if we set it to trust in pg_hba.conf
 spring.datasource.password=
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
-# this will drop and create tables again
+# This will drop and create tables again. 
 spring.jpa.hibernate.ddl-auto=create
-# this can be used to update tables
-# spring.jpa.hibernate.ddl-auto=update
\ No newline at end of file
+# This can be used to update tables. 
+# spring.jpa.hibernate.ddl-auto=update
+# SpringDoc Configuration. 
+# The OpenAPI descriptions are at /v3/api-docs, which is the default path: http://localhost:8080/v3/api-docs. 
+# For a custom path of the OpenAPI documentation in Json format, 
+# add the custom springdoc property /api-docs endpoint custom path to get the path: http://localhost:8080/api-docs. 
+springdoc.api-docs.path=/api-docs
+# The OpenAPI definitions are in JSON format by default. For yaml format, we can obtain the definitions at: http://localhost:8080/api-docs.yaml. 
+# To disable api-docs springdoc-openapi endpoints. 
+# springdoc.api-docs.enabled=false
+# The springdoc-openapi dependency already includes Swagger UI, to integrate springdoc-openapi with Swagger UI to interact with our API specification and exercise the endpoints.# We can access the API documentation at: http://localhost:8080/swagger-ui/index.html. 
+# Using swagger-ui properties, to customize the path of the swagger-ui API documentation swagger-ui-custom.html to get the path: http://localhost:8080/swagger-ui-custom.html. 
+# springdoc.swagger-ui.path=/swagger-ui-custom.html
+springdoc.swagger-ui.path=/swagger-ui.html
+# To sort the API paths according to their HTTP methods with the springdoc.swagger-ui.operationsSorter property. 
+# springdoc.swagger-ui.operationsSorter=method
\ No newline at end of file

From 825c0d144a6ba3ce48cec07116471d59c555f714 Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 11:44:45 +0800
Subject: [PATCH 05/11] Update pom.xml

Added dependencies for junit-jupiter-api and  maven-surefire-plugin. This might be optional.
---
 pom.xml | 44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7431aa2..f156b77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,16 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-surefire-plugin</artifactId>
+			<version>3.2.5</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
@@ -61,19 +71,25 @@
 		</dependency>
 	</dependencies>
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>
-							<groupId>org.projectlombok</groupId>
-							<artifactId>lombok</artifactId>
-						</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+					<configuration>
+						<excludes>
+							<exclude>
+								<groupId>org.projectlombok</groupId>
+								<artifactId>lombok</artifactId>
+							</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 </project>
\ No newline at end of file

From 59d225fe487a0ee67652b6c73e2550a3395b8f2a Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 11:45:33 +0800
Subject: [PATCH 06/11] Update CI.yml

Updated to run all basic phases till verify then generate HTML reports.
---
 .github/workflows/CI.yml | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 07e7d36..9f6b9f3 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -44,23 +44,31 @@ jobs:
           # Uncomment and configure if needed.
           # cache: maven
 
-      - name: Run unit tests
-        run: mvn test
+      # The Maven basic phases in order: Validate, Compile, Test, Package, Verify, Install, Deploy.
+      # The verify command executes each default lifecycle phase in order (validate, compile, package, etc.), before executing verify.
+      # In most cases the effect is the same as package. However, in case there are integration tests, these will be executed as well.
+      # During the verify phase some additional checks can be done, e.g. if your code is written according to the predefined checkstyle rules.
+      # If you want to run your integration tests and check it, use verify. If you only want to run unit tests, use test.
+      # This does not seem to generate HTML reports, just the normal text reports.
+      - name: Build and run unit tests
+        # run: mvn test
+        run: mvn verify
 
       - name: Generate HTML test report
+        # This does not rebuild, and uses the last successful build, to the test cases might not be updated.
         run: mvn surefire-report:report
 
       # Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive (Optional).
       # - name: Update dependency graph
       #   uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
 
-      - name: Build Jar file
-        # Skip tests since they were already run.
-        run: mvn package -DskipTests
+      # - name: Build Jar file
+      #   # Skip tests since they were already run.
+      #   run: mvn package -DskipTests
 
-      - name: Save Jar file
-        uses: actions/upload-artifact@v4.3.1
-        with:
-          name: smart-inventory-0.0.1-SNAPSHOT
-          path: target/smart-inventory-0.0.1-SNAPSHOT.jar
-          retention-days: 1
+      # - name: Save Jar file
+      #   uses: actions/upload-artifact@v4.3.1
+      #   with:
+      #     name: smart-inventory-0.0.1-SNAPSHOT
+      #     path: target/smart-inventory-0.0.1-SNAPSHOT.jar
+      #     retention-days: 1

From 88a8b16add157222caf3f80e723c6058bbdaab1f Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 12:14:09 +0800
Subject: [PATCH 07/11] Update CI.yml

Updated to save test artifacts and generate test report.
---
 .github/workflows/CI.yml | 48 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 9f6b9f3..18e2301 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -66,9 +66,45 @@ jobs:
       #   # Skip tests since they were already run.
       #   run: mvn package -DskipTests
 
-      # - name: Save Jar file
-      #   uses: actions/upload-artifact@v4.3.1
-      #   with:
-      #     name: smart-inventory-0.0.1-SNAPSHOT
-      #     path: target/smart-inventory-0.0.1-SNAPSHOT.jar
-      #     retention-days: 1
+      - name: Save Jar file
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: smart-inventory-0.0.1-SNAPSHOT
+          path: target/smart-inventory-0.0.1-SNAPSHOT.jar
+          retention-days: 7
+
+      - name: Upload test artifacts
+        uses: actions/upload-artifact@v4.3.1
+        if: ${{ always() }}
+        with:
+          name: test-report
+          # path: '**/target/*-reports/TEST*.xml'
+          path: "**/target/*-reports/**"
+          if-no-files-found: error
+          retention-days: 7
+
+      - name: Upload HTML report test artifacts
+        uses: actions/upload-artifact@v4.3.1
+        if: ${{ always() }}
+        with:
+          name: test-report
+          path: "**/target/site/**"
+          if-no-files-found: error
+          retention-days: 7
+
+  test-report:
+    runs-on: ubuntu-latest
+
+    needs:
+      - build-and-run-tests
+
+    steps:
+      - name: Publish Report
+        uses: turing85/publish-report@v1.0.11
+        with:
+          checkout: true
+          comment-header: my-test-report
+          download-artifact-name: test-report
+          report-path: "**/target/surefire-reports/TEST*.xml"
+          comment-message-recreate: "Reports will be posted here as they get available. "
+          recreate-comment: true

From 1f52b28c4e06ea9c7143206275576995a1d303cf Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 12:16:57 +0800
Subject: [PATCH 08/11] Update CI.yml

Fixed duplicate artifact name.
---
 .github/workflows/CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 18e2301..24ef4d3 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -87,7 +87,7 @@ jobs:
         uses: actions/upload-artifact@v4.3.1
         if: ${{ always() }}
         with:
-          name: test-report
+          name: html-test-report
           path: "**/target/site/**"
           if-no-files-found: error
           retention-days: 7

From 0858b97f1919dc572c9e87af294cc340103be9b6 Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 12:22:23 +0800
Subject: [PATCH 09/11] Update CI.yml

Added saving the single file html report test artifact.
---
 .github/workflows/CI.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 24ef4d3..41b1be8 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -66,14 +66,14 @@ jobs:
       #   # Skip tests since they were already run.
       #   run: mvn package -DskipTests
 
-      - name: Save Jar file
+      - name: Save the Jar file test artifact
         uses: actions/upload-artifact@v4.3.1
         with:
           name: smart-inventory-0.0.1-SNAPSHOT
           path: target/smart-inventory-0.0.1-SNAPSHOT.jar
           retention-days: 7
 
-      - name: Upload test artifacts
+      - name: Upload the test artifacts
         uses: actions/upload-artifact@v4.3.1
         if: ${{ always() }}
         with:
@@ -83,15 +83,24 @@ jobs:
           if-no-files-found: error
           retention-days: 7
 
-      - name: Upload HTML report test artifacts
+      - name: Upload the full HTML report test artifacts
         uses: actions/upload-artifact@v4.3.1
         if: ${{ always() }}
         with:
-          name: html-test-report
+          name: full-html-test-report
           path: "**/target/site/**"
           if-no-files-found: error
           retention-days: 7
 
+      - name: Upload the HTML file report test artifact
+        uses: actions/upload-artifact@v4.3.1
+        if: ${{ always() }}
+        with:
+          name: html-test-report
+          path: "**/target/site/*-report.html"
+          if-no-files-found: error
+          retention-days: 7
+
   test-report:
     runs-on: ubuntu-latest
 

From 7ae34b73e2e3b0b3137a6f665fdbed43087ca6f9 Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 12:28:19 +0800
Subject: [PATCH 10/11] Update CI.yml

Removed the redundant saved test artifact.
---
 .github/workflows/CI.yml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 41b1be8..3676363 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -83,21 +83,12 @@ jobs:
           if-no-files-found: error
           retention-days: 7
 
-      - name: Upload the full HTML report test artifacts
-        uses: actions/upload-artifact@v4.3.1
-        if: ${{ always() }}
-        with:
-          name: full-html-test-report
-          path: "**/target/site/**"
-          if-no-files-found: error
-          retention-days: 7
-
-      - name: Upload the HTML file report test artifact
+      - name: Upload the HTML report test artifacts
         uses: actions/upload-artifact@v4.3.1
         if: ${{ always() }}
         with:
           name: html-test-report
-          path: "**/target/site/*-report.html"
+          path: "**/target/site/**"
           if-no-files-found: error
           retention-days: 7
 

From c9bb0945e75ad681023a212dbcb8597ecf294a44 Mon Sep 17 00:00:00 2001
From: nhkhai <nhkhai@gmail.com>
Date: Wed, 20 Mar 2024 12:35:30 +0800
Subject: [PATCH 11/11] Update CI.yml

Removed extension job as it is not working properly. Base functionality is intact.
---
 .github/workflows/CI.yml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 3676363..c7e66e1 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -91,20 +91,3 @@ jobs:
           path: "**/target/site/**"
           if-no-files-found: error
           retention-days: 7
-
-  test-report:
-    runs-on: ubuntu-latest
-
-    needs:
-      - build-and-run-tests
-
-    steps:
-      - name: Publish Report
-        uses: turing85/publish-report@v1.0.11
-        with:
-          checkout: true
-          comment-header: my-test-report
-          download-artifact-name: test-report
-          report-path: "**/target/surefire-reports/TEST*.xml"
-          comment-message-recreate: "Reports will be posted here as they get available. "
-          recreate-comment: true