Refactor ProjectEntity to use UUID as primary key and update related database migrations and repository

Author: jorge-romero

Makefile

@@ -394,7 +394,7 @@ db-port-forward:
 
 db-docker-build-db:
 	@echo "$(BLUE)Building Docker image for database...$(NC)"
-	@docker build --file ../../ods-core/ods-api-service/docker/Dockerfile.database --tag $(PROJECT_NAME)-db:18 ../../ods-core/ods-api-service/docker/ 	
+	@docker build --file ../ods-core/ods-api-service/docker/Dockerfile.database --tag $(PROJECT_NAME)-db:18 ../ods-core/ods-api-service/docker/ 	
 	@echo "$(GREEN)✓ Database Docker image built: $(PROJECT_NAME)-db:$(DOCKER_TAG)$(NC)"
 
 db-docker-run-db: db-docker-build-db

persistence/src/main/java/org/opendevstack/apiservice/persistence/entity/ProjectEntity.java

@@ -9,6 +9,7 @@
 import jakarta.persistence.PreUpdate;
 import jakarta.persistence.Table;
 import java.time.OffsetDateTime;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -41,9 +42,9 @@
 public class ProjectEntity {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@GeneratedValue(strategy = GenerationType.UUID)
 	@Column(name = "id", nullable = false, updatable = false)
-	private Long id;
+	private UUID id;
 
 	/**
 	 * Human-readable unique identifier (e.g. {@code MY-PROJECT}). Maps to the

persistence/src/main/java/org/opendevstack/apiservice/persistence/repository/ProjectRepository.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 import org.opendevstack.apiservice.persistence.entity.ProjectEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -18,7 +19,7 @@
  * </p>
  */
 @Repository
-public interface ProjectRepository extends JpaRepository<ProjectEntity, Long> {
+public interface ProjectRepository extends JpaRepository<ProjectEntity, UUID> {
 
 	/**
 	 * Finds a project by its unique business key regardless of soft-delete status. Use

persistence/src/main/resources/db/changelog/migrations/001_create_projects_table.sql

@@ -4,8 +4,10 @@
 -- Description: Creates the `projects` table, which is the central entity of the
 --   ods-api-service.  Each row represents a managed project identified by
 --   a unique, Atlassian project key (e.g. "MY-PROJECT").
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
+
 CREATE TABLE IF NOT EXISTS projects (
-    id                      BIGSERIAL       PRIMARY KEY,
+    id                      UUID            NOT NULL DEFAULT gen_random_uuid() PRIMARY KEY,
     project_key             VARCHAR(100)    NOT NULL,
     project_name            VARCHAR(255),
     description             VARCHAR(255),

persistence/src/main/resources/db/changelog/migrations/002_create_client_apps_table.sql

@@ -3,8 +3,10 @@
 --changeset ods:002-create-client-apps
 -- Description: Creates the `client_apps` table, representing registered Azure AD
 --   clients that are authorised to call the service APIs.
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
+
 CREATE TABLE IF NOT EXISTS client_apps (
-    id          BIGSERIAL       PRIMARY KEY,
+    id          UUID            NOT NULL DEFAULT gen_random_uuid() PRIMARY KEY,
     client_id   VARCHAR(36)     NOT NULL,
     client_name VARCHAR(255),
     permissions TEXT[]          NOT NULL DEFAULT '{}',
@@ -32,8 +34,8 @@ COMMENT ON COLUMN client_apps.enabled     IS 'When FALSE the client is denied ac
 -- Description: Each API client can be configured with one or more project flavors
 --   that control how projects are created (key pattern, template, owner, etc.).
 CREATE TABLE IF NOT EXISTS client_app_project_flavors (
-    id                   BIGSERIAL       PRIMARY KEY,
-    client_app_id        BIGINT          NOT NULL,
+    id                   UUID            NOT NULL DEFAULT gen_random_uuid() PRIMARY KEY,
+    client_app_id        UUID            NOT NULL,
     name                 VARCHAR(50)     NOT NULL,
     project_key_pattern  VARCHAR(100)    NOT NULL,
     template_id          INT,
@@ -53,7 +55,7 @@ CREATE INDEX IF NOT EXISTS idx_client_app_project_flavors_client_app_id
     ON client_app_project_flavors (client_app_id);
 
 COMMENT ON TABLE  client_app_project_flavors                      IS 'Project flavor configurations per API client';
-COMMENT ON COLUMN client_app_project_flavors.client_app_id        IS 'FK to client_apps.id';
+COMMENT ON COLUMN client_app_project_flavors.client_app_id        IS 'FK to client_apps.id (UUID)';
 COMMENT ON COLUMN client_app_project_flavors.name                 IS 'Flavor name (e.g. DLSS, AMP)';
 COMMENT ON COLUMN client_app_project_flavors.project_key_pattern  IS 'printf-style pattern used to generate the project key (e.g. DLSS%06d)';
 COMMENT ON COLUMN client_app_project_flavors.template_id          IS 'ODS/Jira template identifier';

persistence/src/test/java/org/opendevstack/apiservice/persistence/repository/ProjectRepositoryTest.java

@@ -37,7 +37,7 @@
 class ProjectRepositoryTest {
 
 	@Container
-	static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:16-alpine")
+	static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:18-alpine")
 		.withDatabaseName("devstack_test")
 		.withUsername("test")
 		.withPassword("test");
@@ -47,8 +47,11 @@ static void postgresProperties(DynamicPropertyRegistry registry) {
 		registry.add("spring.datasource.url", postgres::getJdbcUrl);
 		registry.add("spring.datasource.username", postgres::getUsername);
 		registry.add("spring.datasource.password", postgres::getPassword);
-		// Override ddl-auto for tests: let Hibernate create the schema from entities
-		registry.add("spring.jpa.hibernate.ddl-auto", () -> "create-drop");
+		registry.add("spring.datasource.hikari.maximum-pool-size", () -> "2");
+		registry.add("spring.datasource.hikari.minimum-idle", () -> "0");
+		// Let Hibernate create the schema once for the container lifecycle and avoid
+		// delayed drop-on-close work during JVM shutdown.
+		registry.add("spring.jpa.hibernate.ddl-auto", () -> "create");
 	}
 
 	@Autowired

persistence/src/test/resources/application-local.properties

@@ -4,5 +4,7 @@ spring.datasource.username=ods_api_service
 spring.datasource.password=ods_api_service
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.maximum-pool-size=2
+spring.datasource.hikari.minimum-idle=0
 spring.datasource.hikari.idle-timeout=600000
 spring.datasource.hikari.max-lifetime=1800000