feat(JAQPOT-2): flyway integration (#7)

* feat(JAQPOT-2): flyway integration * feat: add model table creation script * fix: make openapi work again
ntua-unit-of-control-and-informatics · May 15, 2024 · 3d9d4ca · 3d9d4ca
1 parent 6c79496
commit 3d9d4ca
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 3 deletions.
diff --git a/.jpb/jpb-settings.xml b/.jpb/jpb-settings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DatabaseMigrationSettings" lastSelectedDirectory="src/main/resources/db/migration" flywayMigrationDescription="" useFlywayForce="true" />
+  <component name="JpaPluginProjectSettings">
+    <option name="lastSelectedLanguage" value="Kotlin" />
+  </component>
+  <component name="PersistenceUnitSettings">
+    <persistence-units>
+      <persistence-unit name="Default">
+        <packages>
+          <package value="org.jaqpot.api" />
+        </packages>
+      </persistence-unit>
+    </persistence-units>
+  </component>
+</project>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,6 +6,8 @@ plugins {
     id("org.jetbrains.kotlin.plugin.spring") version "1.9.23"
 
     id("org.openapi.generator") version "7.5.0"
+
+    id("org.flywaydb.flyway") version "10.13.0"
 }
 
 group = "org.jaqpot"
@@ -50,6 +52,10 @@ dependencies {
     compileOnly("org.projectlombok:lombok")
     annotationProcessor("org.projectlombok:lombok")
 
+    // flyway
+    implementation("org.flywaydb:flyway-core:10.12.0")
+    runtimeOnly("org.flywaydb:flyway-database-postgresql:10.12.0")
+
     runtimeOnly("org.postgresql:postgresql")
 }
 
@@ -89,7 +95,9 @@ openApiGenerate {
 sourceSets {
     main {
         kotlin {
-            srcDirs("${buildDir}/openapi")
+            srcDir("${buildDir}/openapi")
         }
     }
 }
+
+
diff --git a/src/main/kotlin/org/jaqpot/api/config/SecurityConfig.kt b/src/main/kotlin/org/jaqpot/api/config/SecurityConfig.kt
@@ -15,7 +15,15 @@ class SecurityConfig {
         http.authorizeHttpRequests { a ->
             a
                 // allow swagger for everyone
-                .requestMatchers("/v3/**", "/swagger/**", "/swagger-ui/**", "/models/**").permitAll()
+                .requestMatchers(
+                    "/", "/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs/**"
+                )
+                .permitAll()
+
+                .requestMatchers(
+                    "/models/**"
+                )
+                .permitAll()
 
                 .anyRequest()
                 .authenticated()

diff --git a/src/main/resources/application-local.yml → src/main/resources/application.yml b/src/main/resources/application-local.yml → src/main/resources/application.yml
@@ -5,15 +5,21 @@ spring:
     url: jdbc:postgresql://localhost:5432/jaqpot
     username: user
     password: password
+    driverClassName: org.postgresql.Driver
   jpa:
     hibernate:
-      ddl-auto: create-drop
+      ddl-auto: validate
     properties:
       hibernate:
         dialect: org.hibernate.dialect.PostgreSQLDialect
+        format_sql: true
+    show-sql: true
   security:
     oauth2:
       resourceserver:
         jwt:
           issuer-uri: http://localhost:8070/realms/jaqpot-local
+  flyway:
+    enabled: true
+    baseline-on-migrate: true
 
diff --git a/src/main/resources/db/migration/V2__model_table.sql b/src/main/resources/db/migration/V2__model_table.sql
@@ -0,0 +1,11 @@
+CREATE SEQUENCE IF NOT EXISTS model_seq START WITH 1 INCREMENT BY 50;
+
+CREATE TABLE model
+(
+    id         INTEGER NOT NULL,
+    created_at TIMESTAMP WITHOUT TIME ZONE,
+    updated_at TIMESTAMP WITHOUT TIME ZONE,
+    is_public  BOOLEAN NOT NULL,
+    CONSTRAINT pk_model PRIMARY KEY (id)
+);
+