Feat/oidf 51 #19

jcmelati · 2024-07-29T09:24:07Z

No description provided.

* Added Spring boot with status API * chores: PR feedback * Updated the server name in gradle module * Added test for status endpoint and added README * Enabled test run on gradle build * Added Postgres and docker * Added environment file * Updated env variable * Fixed merge conflicts * Updated CI for GitHub secrets * Added docker in GitHub action * Added env variable for docker in GitHub action * Removed Windows in GitHub action * Added comment for removing Windows in CI * Removed hardcoded path from run script * fix: make admin server load env variables from root .env file (#10) * chore: fix project name * chore: extract ktor version * fix: temporarily hardcode db credentials * fix: import .env variables from file * fix: adjust ci file to new docker compose dir --------- Co-authored-by: sanderPostma <[email protected]> --------- Co-authored-by: John Melati <[email protected]> Co-authored-by: sanderPostma <[email protected]>

…on configuration

* Added Kermit logging * Added logger class and added dependency in admin-server * fix: adding env parameter for logging * chores: removed logger env

…/OpenID-Federation into feat/oidf-51

zoemaas · 2024-07-29T10:12:51Z

...in-server/src/main/kotlin/com/sphereon/oid/fed/server/admin/controllers/AccountController.kt

+    fun createAccount(@RequestBody account: CreateAccountDTO) {
+        return accountService.create(account)
+    }
+}


Add trailing new line

zoemaas · 2024-07-29T10:13:09Z

...es/admin-server/src/main/kotlin/com/sphereon/oid/fed/server/admin/services/AccountService.kt

+    fun findAll(): List<AccountDTO> {
+        return accountRepository.findAll().map { it.toDTO() }
+    }
+}


Add trailing new line

zoemaas · 2024-07-29T10:13:25Z

modules/persistence/build.gradle.kts

+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}


Add trailing new line

zoemaas · 2024-07-29T10:16:23Z

modules/persistence/build.gradle.kts

+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)


Will not work for multiplatform. It should be done in the jvm target. Ex:
kotlin { jvm { tasks { named<KotlinJvmCompile>("compileKotlinJvm") { dependsOn("fixOpenApiGeneratorIssue") compilerOptions { jvmTarget.set(JvmTarget.JVM_11) } } } } }

zoemaas · 2024-07-29T10:18:00Z

modules/persistence/build.gradle.kts

+
+kotlin {
+    jvm{
+        withJava()


Do we want to mix Java code with Kotlin?

zoemaas · 2024-07-29T10:19:11Z

modules/persistence/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Thu Jul 25 12:58:25 CEST 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists


Use Unix carriage return. It should be \n and not \r\n.

zoemaas · 2024-07-29T10:19:24Z

modules/persistence/src/commonMain/kotlin/com.sphereon.oid.fed.persistence/Persistence.kt

+
+expect object Persistence {
+    val accountRepository: AccountRepository
+}


Add trailing new line

zoemaas · 2024-07-29T10:19:40Z

...rsistence/src/commonMain/kotlin/com.sphereon.oid.fed.persistence/database/DatabaseFactory.kt

+sealed class DatabaseConfig {
+    data class Postgres(val url: String, val username: String, val password: String) : DatabaseConfig()
+    data class Sqlite(val path: String) : DatabaseConfig()
+}


Add trailing new line

zoemaas · 2024-07-29T10:20:13Z

...rsistence/src/commonMain/kotlin/com.sphereon.oid.fed.persistence/database/DatabaseFactory.kt

+        return when (config) {
+            is DatabaseConfig.Postgres -> platformSqlDriver.createPostgresDriver(config.url, config.username, config.password)
+            is DatabaseConfig.Sqlite -> platformSqlDriver.createSqliteDriver(config.path)
+            else -> throw IllegalArgumentException("Unsupported database config")


Move the exception message to a constant in a specific
file

zoemaas · 2024-07-29T10:20:33Z

modules/persistence/src/commonMain/sqldelight/entities/Account.sq

+SELECT * FROM account WHERE id = ?;
+
+update:
+UPDATE account SET username = ? WHERE id = ?;


Add trailing new line

zoemaas · 2024-07-29T10:20:57Z

modules/persistence/src/jvmMain/kotlin/com.sphereon.oid.fed.persistence/Persistence.jvm.kt

+        val database = Database(driver)
+        accountRepository = AccountRepository(database)
+    }
+}


Add trailing new line

zoemaas · 2024-07-29T10:21:28Z

modules/persistence/src/jvmMain/kotlin/com.sphereon.oid.fed.persistence/Persistence.jvm.kt

+    actual val accountRepository: AccountRepository
+
+    init {
+        val driver = PlatformSqlDriver().createPostgresDriver(System.getenv("DB_URL"), System.getenv("DB_USER"), System.getenv("DB_PASSWORD"))


Extract a constant from strings and move them to a specific file

zoemaas · 2024-07-29T10:21:40Z

modules/persistence/src/jvmMain/kotlin/com.sphereon.oid.fed.persistence/PlatformSqlDriver.kt

+    actual fun createSqliteDriver(path: String): SqlDriver {
+        throw UnsupportedOperationException("Sqlite is not supported on JVM")
+    }
+}


Add trailing new line

zoemaas · 2024-07-29T10:22:04Z

modules/persistence/src/jvmMain/kotlin/com.sphereon.oid.fed.persistence/PlatformSqlDriver.kt

+    }
+
+    actual fun createSqliteDriver(path: String): SqlDriver {
+        throw UnsupportedOperationException("Sqlite is not supported on JVM")


Extract a constant from the exception message and move it a specific file

zoemaas

This implementation is creating tables, something that is already implemented using Flyway. Will Flyway be removed from the project?

zoemaas · 2024-07-29T10:33:17Z

modules/persistence/src/commonMain/sqldelight/entities/Account.sq

@@ -0,0 +1,29 @@
+CREATE TABLE account (


Is table creation sqldelight's responsibility?

I followed the "Fresh Schema" guide from here https://cashapp.github.io/sqldelight/2.0.2/jvm_postgresql/

Not sure if you can combine them both, but we should follow the migration approach, ensuring a consistent DB over time

sanderPostma and others added 14 commits July 27, 2024 14:46

chore: extract ktor version

bb4dc15

chore: Fixed versioning

4ac05a9

bugfix: Fixed Open Api specs file path

d5164af

refactor: Fixed the profiles section of the documentation

04e891b

refactor: Added fat jat and maven publication to local repository

d3807a8

refactor: changed to string the value of the dateTimeLibrary property

d3ff517

refactor: Upgraded OpenAPI generator and removed unneeded serializati…

bfa31b5

…on configuration

OIDF -31: Added Kermit logging library (#12)

4530670

* Added Kermit logging * Added logger class and added dependency in admin-server * fix: adding env parameter for logging * chores: removed logger env

feat: create persistence module strucure

e5663a2

feat: implement AccountController

fef4ab9

Merge branch 'develop' into feat/oidf-51

02f843a

fix: model reference path

cd34113

Merge branch 'feat/oidf-51' of https://github.com/Sphereon-Opensource…

dc47738

…/OpenID-Federation into feat/oidf-51

zoemaas reviewed Jul 29, 2024

View reviewed changes

modules/persistence/build.gradle.kts Outdated

kotlin {

jvm{

withJava()

Copy link

Contributor

zoemaas Jul 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to mix Java code with Kotlin?

zoemaas reviewed Jul 29, 2024

View reviewed changes

zoemaas requested changes Jul 29, 2024

View reviewed changes

zoemaas reviewed Jul 29, 2024

View reviewed changes

jcmelati added 3 commits July 29, 2024 13:44

fix: add missing return statements

5c6d82f

fix: coding styles

7f4f211

fix: coding styles

ecc9851

jcmelati closed this Jul 30, 2024

jcmelati reopened this Jul 30, 2024

jcmelati closed this Jul 30, 2024

jcmelati deleted the feat/oidf-51 branch July 30, 2024 19:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/oidf 51 #19

Feat/oidf 51 #19

jcmelati commented Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas Jul 29, 2024

zoemaas left a comment

zoemaas Jul 29, 2024 •

edited

Loading

jcmelati Jul 30, 2024

nklomp Jul 30, 2024

Feat/oidf 51 #19

Feat/oidf 51 #19

Conversation

jcmelati commented Jul 29, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zoemaas left a comment

Choose a reason for hiding this comment

zoemaas Jul 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zoemaas Jul 29, 2024 •

edited

Loading