Merge remote-tracking branch 'origin/feature/2-dataaccess' into feature/2-dataaccess-repositories

Piotr Kubicki · Piotr Kubicki · commit 0a0e3da6a8d7 · 2025-10-21T11:53:30.000+02:00
# Conflicts:
#	pom.xml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,4 +9,10 @@ updates:
     directory: "/"  # Root directory where pom.xml is located
     schedule:
       interval: "weekly"  # Dependabot will check for updates every week
-    open-pull-requests-limit: 5  # Optional: Limit the number of open PRs from Dependabot
+    target-branch: "main"
+
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "feature/5-security"   # 👈 second branch config
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,4 +37,4 @@ jobs:
         with:
           name: surefire-failsafe-html-report
           path: target/reports/surefire.html
-          retention-days: 90
+          retention-days: 20
diff --git a/HELP.md b/HELP.md
@@ -1,8 +1,3 @@
-# Read Me First
-The following was discovered as part of building this project:
-
-* The original package name 'com.capgemini.training.appointment-booking-app' is invalid and this project uses 'com.capgemini.training.appointment_booking_app' instead.
-
 # Getting Started
 
 ### Reference Documentation
diff --git a/README.md b/README.md
@@ -16,8 +16,8 @@ The repository grows in complexity and functionality across branches:
 
 | Branch | Description                                                            |
 |--------|------------------------------------------------------------------------|
-| `main` | Base Spring Boot setup with basic health and H2 endpoints              |
-| `feature/1-create-new-application` | Same as main                                                           |
+| `main` | Base Spring Boot setup with basic health endpoints                     |
+| `feature/1-create-new-application` | (Almost) same as main                                                  |
 | `feature/2-dataaccess` | Persistence layer with Spring Data JPA and H2, part 1                  |
 | `feature/2-dataaccess-repositories` | Persistence layer with Spring Data JPA and H2, part 2                  |
 | `feature/3-business-logic` | Service layer and business logic introduced                            |
@@ -31,7 +31,7 @@ After starting the application, you can access the following in your browser:
 | URL | Available from | Description |
 |-----|----------------|-------------|
 | [http://localhost:8080/actuator/health](http://localhost:8080/actuator/health) | `main` | Basic application health check |
-| [http://localhost:8080/h2-console](http://localhost:8080/h2-console) | `main` | In-memory H2 database console |
+| [http://localhost:8080/h2-console](http://localhost:8080/h2-console) | `feature/2-dataaccess` | In-memory H2 database console |
 | [http://localhost:8080/swagger-ui/index.html](http://localhost:8080/swagger-ui/index.html) | `feature/4-services` | OpenAPI UI for testing and exploring REST API |
 
 ## 🛠 Tech Stack
diff --git a/pom.xml b/pom.xml
@@ -5,53 +5,48 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.4</version>
+		<version>3.5.6</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.capgemini.training</groupId>
-	<artifactId>appointment-booking-app</artifactId>
+	<artifactId>appointment-booking</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>appointment-booking-app</name>
+	<name>appointment-booking</name>
 	<description>Demo project for Spring Boot</description>
-	<url/>
-	<licenses>
-		<license/>
-	</licenses>
-	<developers>
-		<developer/>
-	</developers>
-	<scm>
-		<connection/>
-		<developerConnection/>
-		<tag/>
-		<url/>
-	</scm>
+
 	<properties>
 		<java.version>21</java.version>
 	</properties>
 	<dependencies>
+        <!-- 1) Dependencies to run the application on web-server + features to help monitor and manage a Spring Boot application: -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+
+        <!-- 2) Dependencies to provide data access layer and H2 in-memory database: -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 		<dependency>
 			<groupId>org.flywaydb</groupId>
 			<artifactId>flyway-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<version>2.2.224</version>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -79,13 +74,15 @@
 
 	<build>
 		<plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <release>${java.version}</release>
-                </configuration>
-            </plugin>
+			<!--
+			  Not strictly mandatory, but in most Maven-based Spring Boot projects, it's highly recommended,
+			  because it simplifies packaging and deployment.
+			  The spring-boot-maven-plugin enables packaging the application as an executable JAR,
+			  which includes all dependencies and a manifest pointing to the main class.
+			  It simplifies running the app via `java -jar` and integrates with Maven's lifecycle.
+			  This plugin is essential for deploying Spring Boot applications and supports features
+			  like layered JARs for Docker and custom packaging.
+			-->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -108,15 +105,28 @@
 					<cleanDisabled>false</cleanDisabled>
 				</configuration>
 			</plugin>
+
+			<!-- Unit tests -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.3</version>
+				<configuration>
+					<includes>
+						<include>**/*Test.java</include>
+						<include>**/*Tests.java</include>
+					</includes>
+				</configuration>
 			</plugin>
+
+			<!-- Integration tests -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.5.3</version>
+				<configuration>
+					<includes>
+						<include>**/*IT.java</include>
+					</includes>
+				</configuration>
 				<executions>
 					<execution>
 						<goals>
@@ -126,10 +136,12 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<!-- Test reports (for CI pipeline) -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>3.5.3</version>
+				<version>3.5.4</version>
 				<executions>
 					<execution>
 						<phase>verify</phase>
@@ -158,6 +170,8 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<!-- Spotless -->
 			<plugin>
 				<groupId>com.diffplug.spotless</groupId>
 				<artifactId>spotless-maven-plugin</artifactId>
diff --git a/src/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingApplication.java b/src/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingApplication.java
@@ -4,10 +4,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class AppointmentBookingAppApplication {
+public class AppointmentBookingApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppointmentBookingAppApplication.class, args);
+		SpringApplication.run(AppointmentBookingApplication.class, args);
 	}
 
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,21 +1,28 @@
 application.title=Appointment Booking Application
 
-spring.application.name=appointment-booking-app
+management.endpoint.health.show-components=always
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+
+spring.application.name=appointment-booking
 
 spring.h2.console.enabled=true
 
 spring.datasource.url=jdbc:h2:mem:appointmentbooking
 spring.datasource.username=sa
 spring.datasource.password=password
 
-management.endpoint.health.show-components=always
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=*
-
-spring.flyway.locations=classpath:db/migration
 spring.flyway.enabled=true
-spring.flyway.clean-on-validation-error=true
 
+# Hibernate DDL-auto is recommended as 'none' when using Flyway for migrations
 spring.jpa.hibernate.ddl-auto=none
 
+# To avoid potential lazy loading issues in the view layer, disable OSIV (Open Session in View) which is enabled by default in Spring Boot:
+spring.jpa.open-in-view=false
+
+# Show SQL queries in logs for easier debugging (just for development purposes)
+spring.jpa.show-sql=true
+# To beautify or pretty-print the logged SQL (see above), we can add:
+spring.jpa.properties.hibernate.format_sql=true
+
 spring.banner.location=classpath:/banner/jbd_banner.txt
diff --git a/src/main/resources/db/migration/1.0/V0001__Create_schema.sql b/src/main/resources/db/migration/1.0/V0001__Create_schema.sql
@@ -1,58 +1,58 @@
 CREATE TABLE USER_TABLE (
-    ID NUMBER(19,0) NOT NULL,
+    ID BIGINT NOT NULL,
     VERSION INTEGER NOT NULL,
-    EMAIL VARCHAR(128) NOT NULL,
+    EMAIL VARCHAR(254) NOT NULL,
     PASSWORD_HASH VARCHAR(128) NOT NULL,
-    FIRST_NAME VARCHAR(128) NOT NULL,
-    LAST_NAME VARCHAR(128) NOT NULL,
+    FIRST_NAME VARCHAR(255) NOT NULL,
+    LAST_NAME VARCHAR(255) NOT NULL,
     CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     LAST_UPDATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (ID),
     CONSTRAINT UNIQUE_USER_EMAIL UNIQUE (EMAIL)
 );
 
 CREATE TABLE CLIENT (
-    ID NUMBER(19,0) NOT NULL,
+    ID BIGINT NOT NULL,
     VERSION INTEGER NOT NULL,
-    USER_ID NUMBER(19,0) NOT NULL,
+    USER_ID BIGINT NOT NULL,
     CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     LAST_UPDATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (ID),
     FOREIGN KEY (USER_ID) REFERENCES USER_TABLE(ID) ON DELETE CASCADE
 );
 
 CREATE TABLE SPECIALIST (
-    ID NUMBER(19,0) NOT NULL,
+    ID BIGINT NOT NULL,
     VERSION INTEGER NOT NULL,
     SPECIALIZATION VARCHAR(128) NOT NULL,
-    USER_ID NUMBER(19,0) NOT NULL,
+    USER_ID BIGINT NOT NULL,
     CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     LAST_UPDATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (ID),
     FOREIGN KEY (USER_ID) REFERENCES USER_TABLE(ID) ON DELETE CASCADE
 );
 
 CREATE TABLE TREATMENT (
-    ID NUMBER(19,0) NOT NULL,
+    ID BIGINT NOT NULL,
     VERSION INTEGER NOT NULL,
-    NAME VARCHAR(256) NOT NULL,
-    DESCRIPTION VARCHAR(1024),
+    NAME VARCHAR(512) NOT NULL,
+    DESCRIPTION TEXT,
     DURATION_MINUTES INTEGER NOT NULL,
-    SPECIALIST_ID NUMBER(19,0) NOT NULL,
+    SPECIALIST_ID BIGINT NOT NULL,
     CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     LAST_UPDATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (ID),
     FOREIGN KEY (SPECIALIST_ID) REFERENCES SPECIALIST(ID) ON DELETE CASCADE
 );
 
 CREATE TABLE APPOINTMENT (
-    ID NUMBER(19,0) NOT NULL,
+    ID BIGINT NOT NULL,
     VERSION INTEGER NOT NULL,
     DATE_TIME TIMESTAMP NOT NULL,
     END_DATE_TIME TIMESTAMP NOT NULL,
     STATUS VARCHAR(128) NOT NULL DEFAULT 'SCHEDULED',
-    CLIENT_ID NUMBER(19,0) NOT NULL,
-    TREATMENT_ID NUMBER(19,0) NOT NULL,
+    CLIENT_ID BIGINT NOT NULL,
+    TREATMENT_ID BIGINT NOT NULL,
     CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     LAST_UPDATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (ID),
diff --git a/src/test/java/com/capgemini/training/appointmentbooking/AppointmentBookingApplicationIT.java b/src/test/java/com/capgemini/training/appointmentbooking/AppointmentBookingApplicationIT.java
@@ -4,10 +4,11 @@
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class AppointmentBookingAppApplicationIT {
+class AppointmentBookingApplicationIT {
 
 	@Test
 	void contextLoads() {
+		// loads application context
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`
`5`	`5`
`6`	`6`	`@SpringBootApplication`
`7`		`-public class AppointmentBookingAppApplication {`
	`7`	`+public class AppointmentBookingApplication {`
`8`	`8`
`9`	`9`	`public static void main(String[] args) {`
`10`		`- SpringApplication.run(AppointmentBookingAppApplication.class, args);`
	`10`	`+ SpringApplication.run(AppointmentBookingApplication.class, args);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,11 @@`
`4`	`4`	`import org.springframework.boot.test.context.SpringBootTest;`
`5`	`5`
`6`	`6`	`@SpringBootTest`
`7`		`-class AppointmentBookingAppApplicationIT {`
	`7`	`+class AppointmentBookingApplicationIT {`
`8`	`8`
`9`	`9`	`@Test`
`10`	`10`	`void contextLoads() {`
	`11`	`+ // loads application context`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`}`