Merge pull request #590 from lunatech-labs/dependabot/gradle/org.jlleitschuh.gradle-ktlint-gradle-12.1.1

chore(deps): bump org.jlleitschuh.gradle:ktlint-gradle from 11.3.2 to 12.1.1

Author: leo-bogastry

build.gradle

@@ -1,27 +1,16 @@
 // root-level build.gradle
-buildscript {
-    repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath "org.jlleitschuh.gradle:ktlint-gradle:11.3.2"
-    }
-}
-
 plugins {
-    id("org.jlleitschuh.gradle.ktlint-idea") version "11.6.1"
+    id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
     id 'org.jetbrains.kotlin.jvm' version '1.9.10'
     id 'com.github.autostyle' version '3.2'
     id 'application'
 }
 
-group 'com.lunatech'
-version '0.0.1'
-mainClassName = "io.ktor.server.netty.EngineMain"
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+base {
+    group 'com.lunatech'
+    version '0.0.1'
+    mainClassName = "io.ktor.server.netty.EngineMain"
+}
 
 sourceSets {
     main.kotlin.srcDirs = main.java.srcDirs = ['src/main']

src/main/com/lunatech/chef/api/Application.kt

@@ -81,6 +81,7 @@ import java.time.format.DateTimeParseException
 import java.util.Date
 
 fun main(args: Array<String>): Unit = io.ktor.server.netty.EngineMain.main(args)
+
 private val logger = KotlinLogging.logger {}
 
 @Suppress("unused") // Referenced in application.conf
@@ -148,7 +149,7 @@ fun Application.module() {
                 is IllegalArgumentException, is DateTimeParseException -> {
                     call.respond(
                         HttpStatusCode.BadRequest,
-                        "${throwable.message}"
+                        "${throwable.message}",
                     )
                 }
             }

src/main/com/lunatech/chef/api/auth/AuthorisedRouteSelector.kt

@@ -6,7 +6,6 @@ import io.ktor.server.application.ApplicationCall
  * https://medium.com/@shrikantjagtap99/role-based-authorization-feature-in-ktor-web-framework-in-kotlin-dda88262a86a
  */
 class RoleAuthorization internal constructor(config: Configuration) {
-
     constructor(provider: RoleBasedAuthorizer) : this(Configuration(provider))
 
     private var config = config.copy()
@@ -52,5 +51,17 @@ class RoleAuthorization internal constructor(config: Configuration) {
 
 enum class Role(val roleStr: String) {
     ADMIN("admin"),
-    USER("user")
+    USER("user"),
 }
+// class AuthorisedRouteSelector() : RouteSelector(RouteSelectorEvaluation.qualityConstant) {
+//     override fun evaluate(context: RoutingResolveContext, segmentIndex: Int): RouteSelectorEvaluation =
+//         RouteSelectorEvaluation.Constant
+// }
+//
+// fun Route.rolesAllowed(vararg roles: Role, build: Route.() -> Unit): Route {
+//     val authorisedRoute = createChild(AuthorisedRouteSelector())
+//     application.feature(RoleAuthorization).interceptPipeline(this.application, roles.toSet())
+//
+//     authorisedRoute.build()
+//     return authorisedRoute
+// }

src/main/com/lunatech/chef/api/auth/RoleAuthorization.kt

@@ -7,12 +7,13 @@ import org.ktorm.database.Database
 
 object Database {
     fun connect(config: FlywayConfig): Database {
-        val hikariConfig = HikariConfig().apply {
-            jdbcUrl = config.url
-            username = config.user
-            password = config.password
-            maximumPoolSize = config.maxPoolSize
-        }
+        val hikariConfig =
+            HikariConfig().apply {
+                jdbcUrl = config.url
+                username = config.user
+                password = config.password
+                maximumPoolSize = config.maxPoolSize
+            }
         val dataSource = HikariDataSource(hikariConfig)
         return Database.connect(dataSource)
     }

src/main/com/lunatech/chef/api/persistence/Database.kt

@@ -13,7 +13,10 @@ object Attendances : BaseTable<Attendance>("attendances") {
     val isAttending = boolean("is_attending")
     val isDeleted = boolean("is_deleted")
 
-    override fun doCreateEntity(row: QueryRowSet, withReferences: Boolean) = Attendance(
+    override fun doCreateEntity(
+        row: QueryRowSet,
+        withReferences: Boolean,
+    ) = Attendance(
         uuid = row[uuid] ?: DEFAULT_UUID,
         scheduleUuid = row[scheduleUuid] ?: DEFAULT_UUID,
         userUuid = row[userUuid] ?: DEFAULT_UUID,

src/main/com/lunatech/chef/api/persistence/schemas/Attendances.kt

@@ -21,7 +21,10 @@ object Dishes : BaseTable<Dish>("dishes") {
     val isLactoseFree = boolean("is_lactose_free")
     val isDeleted = boolean("is_deleted")
 
-    override fun doCreateEntity(row: QueryRowSet, withReferences: Boolean) = Dish(
+    override fun doCreateEntity(
+        row: QueryRowSet,
+        withReferences: Boolean,
+    ) = Dish(
         uuid = row[uuid] ?: DEFAULT_UUID,
         name = row[name] ?: DEFAULT_STRING,
         description = row[description] ?: DEFAULT_STRING,

src/main/com/lunatech/chef/api/persistence/schemas/Dishes.kt

@@ -9,7 +9,10 @@ object DishesOnMenus : BaseTable<DishOnMenu>("dishes_on_menus") {
     val menuUuid = uuid("menu_uuid")
     val dishUuid = uuid("dish_uuid")
 
-    override fun doCreateEntity(row: QueryRowSet, withReferences: Boolean) = DishOnMenu(
+    override fun doCreateEntity(
+        row: QueryRowSet,
+        withReferences: Boolean,
+    ) = DishOnMenu(
         menuUuid = row[menuUuid] ?: DEFAULT_UUID,
         dishUuid = row[dishUuid] ?: DEFAULT_UUID,
     )

src/main/com/lunatech/chef/api/persistence/schemas/DishesOnMenus.kt

@@ -14,13 +14,19 @@ object MenuNames : BaseTable<MenuName>("menus") {
     val name = varchar("name")
     val isDeleted = boolean("is_deleted")
 
-    override fun doCreateEntity(row: QueryRowSet, withReferences: Boolean) = MenuName(
+    override fun doCreateEntity(
+        row: QueryRowSet,
+        withReferences: Boolean,
+    ) = MenuName(
         uuid = row[uuid] ?: DEFAULT_UUID,
         name = row[name] ?: DEFAULT_STRING,
         isDeleted = row[isDeleted] ?: DEFAULT_FALSE,
     )
 
-    fun toMenuWithDishes(menuName: MenuName, dishes: List<Dish>) = MenuWithDishes(
+    fun toMenuWithDishes(
+        menuName: MenuName,
+        dishes: List<Dish>,
+    ) = MenuWithDishes(
         uuid = menuName.uuid,
         name = menuName.name,
         dishes = dishes,

src/main/com/lunatech/chef/api/persistence/schemas/MenuNames.kt

@@ -13,7 +13,10 @@ object Offices : BaseTable<Office>("offices") {
     val country = varchar("country")
     val isDeleted = boolean("is_deleted")
 
-    override fun doCreateEntity(row: QueryRowSet, withReferences: Boolean) = Office(
+    override fun doCreateEntity(
+        row: QueryRowSet,
+        withReferences: Boolean,
+    ) = Office(
         uuid = row[uuid] ?: DEFAULT_UUID,
         city = row[city] ?: DEFAULT_STRING,
         country = row[country] ?: DEFAULT_STRING,