chore: update codebase structure

sakethpathike · sakethpathike · commit 7b3636944df2 · 2025-02-01T22:44:38.000+05:30
diff --git a/src/main/kotlin/com/sakethh/linkora/Application.kt b/src/main/kotlin/com/sakethh/linkora/Application.kt
@@ -1,8 +1,11 @@
 package com.sakethh.linkora
 
+import com.sakethh.linkora.data.configureDatabase
 import com.sakethh.linkora.domain.model.ServerConfig
+import com.sakethh.linkora.presentation.routing.websocket.configureEventsWebSocket
+import com.sakethh.linkora.presentation.routing.configureRouting
 import com.sakethh.linkora.utils.SysEnvKey
-import com.sakethh.linkora.utils.hostedOnRemote
+import com.sakethh.linkora.utils.useSysEnvValues
 import io.ktor.server.application.*
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
@@ -75,12 +78,13 @@ object ServerConfiguration {
     }
 
     fun readConfig(): ServerConfig {
-        return if (hostedOnRemote()) {
+        return if (useSysEnvValues()) {
             ServerConfig(
                 databaseUrl = "jdbc:" + System.getenv(SysEnvKey.LINKORA_DATABASE_URL.name),
                 databaseUser = System.getenv(SysEnvKey.LINKORA_DATABASE_USER.name),
                 databasePassword = System.getenv(SysEnvKey.LINKORA_DATABASE_PASSWORD.name), hostAddress = try {
-                    System.getenv(SysEnvKey.LINKORA_HOST_ADDRESS.name)
+                    // manually throw the exception as `getenv` may return null, and no conversion is happening here to auto-throw
+                    System.getenv(SysEnvKey.LINKORA_HOST_ADDRESS.name) ?: throw NullPointerException()
                 } catch (_: Exception) {
                     "0.0.0.0"
                 }, serverPort = try {
diff --git a/src/main/kotlin/com/sakethh/linkora/data/Database.kt b/src/main/kotlin/com/sakethh/linkora/data/Database.kt
@@ -1,8 +1,9 @@
-package com.sakethh.linkora
+package com.sakethh.linkora.data
 
+import com.sakethh.linkora.ServerConfiguration
 import com.sakethh.linkora.domain.model.ServerConfig
 import com.sakethh.linkora.domain.tables.*
-import com.sakethh.linkora.utils.hostedOnRemote
+import com.sakethh.linkora.utils.useSysEnvValues
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.SchemaUtils
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -54,7 +55,7 @@ fun configureDatabase() {
             }
         } else if (e.message?.contains("Database driver not found for") == true || e.message?.contains("Access denied") == true) {
             println(e.message)
-            if (hostedOnRemote()) {
+            if (useSysEnvValues()) {
                 println("\nManually causing the crash since the correct values aren't provided through environment variables.")
                 throw e
             }
diff --git a/src/main/kotlin/com/sakethh/linkora/data/socket/manager/EventsWebSocketManager.kt b/src/main/kotlin/com/sakethh/linkora/data/socket/manager/EventsWebSocketManager.kt
@@ -1,4 +1,4 @@
-package com.sakethh.linkora
+package com.sakethh.linkora.data.socket.manager
 
 import com.sakethh.linkora.domain.model.WebSocketEvent
 import io.ktor.server.websocket.*
diff --git a/src/main/kotlin/com/sakethh/linkora/presentation/routing/Routing.kt b/src/main/kotlin/com/sakethh/linkora/presentation/routing/Routing.kt
@@ -1,5 +1,6 @@
-package com.sakethh.linkora
+package com.sakethh.linkora.presentation.routing
 
+import com.sakethh.linkora.Security
 import com.sakethh.linkora.data.repository.FoldersImplementation
 import com.sakethh.linkora.data.repository.LinksImplementation
 import com.sakethh.linkora.data.repository.PanelsRepoImpl
@@ -9,10 +10,10 @@ import com.sakethh.linkora.domain.repository.LinksRepository
 import com.sakethh.linkora.domain.repository.PanelsRepository
 import com.sakethh.linkora.domain.repository.SyncRepo
 import com.sakethh.linkora.domain.routes.SyncRoute
-import com.sakethh.linkora.routing.foldersRouting
-import com.sakethh.linkora.routing.linksRouting
-import com.sakethh.linkora.routing.panelsRouting
-import com.sakethh.linkora.routing.syncRouting
+import com.sakethh.linkora.presentation.routing.http.foldersRouting
+import com.sakethh.linkora.presentation.routing.http.linksRouting
+import com.sakethh.linkora.presentation.routing.http.panelsRouting
+import com.sakethh.linkora.presentation.routing.http.syncRouting
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.auth.*
diff --git a/src/main/kotlin/com/sakethh/linkora/presentation/routing/http/FoldersRouting.kt b/src/main/kotlin/com/sakethh/linkora/presentation/routing/http/FoldersRouting.kt
@@ -1,4 +1,4 @@
-package com.sakethh.linkora.routing
+package com.sakethh.linkora.presentation.routing.http
 
 import com.sakethh.linkora.Security
 import com.sakethh.linkora.domain.dto.IDBasedDTO
diff --git a/src/main/kotlin/com/sakethh/linkora/presentation/routing/http/LinksRouting.kt b/src/main/kotlin/com/sakethh/linkora/presentation/routing/http/LinksRouting.kt
@@ -1,7 +1,6 @@
-package com.sakethh.linkora.routing
+package com.sakethh.linkora.presentation.routing.http
 
 import com.sakethh.linkora.Security
-import com.sakethh.linkora.domain.Link
 import com.sakethh.linkora.domain.dto.IDBasedDTO
 import com.sakethh.linkora.domain.dto.link.*
 import com.sakethh.linkora.domain.repository.LinksRepository
diff --git a/src/main/kotlin/com/sakethh/linkora/presentation/routing/http/PanelsRouting.kt b/src/main/kotlin/com/sakethh/linkora/presentation/routing/http/PanelsRouting.kt
@@ -1,4 +1,4 @@
-package com.sakethh.linkora.routing
+package com.sakethh.linkora.presentation.routing.http
 
 import com.sakethh.linkora.Security
 import com.sakethh.linkora.domain.dto.IDBasedDTO
diff --git a/src/main/kotlin/com/sakethh/linkora/presentation/routing/http/SyncRouting.kt b/src/main/kotlin/com/sakethh/linkora/presentation/routing/http/SyncRouting.kt
@@ -1,4 +1,4 @@
-package com.sakethh.linkora.routing
+package com.sakethh.linkora.presentation.routing.http
 
 import com.sakethh.linkora.Security
 import com.sakethh.linkora.domain.repository.SyncRepo
diff --git a/src/main/kotlin/com/sakethh/linkora/presentation/routing/websocket/EventsWebSocketRouting.kt b/src/main/kotlin/com/sakethh/linkora/presentation/routing/websocket/EventsWebSocketRouting.kt
@@ -1,7 +1,8 @@
-package com.sakethh.linkora
+package com.sakethh.linkora.presentation.routing.websocket
 
-import com.sakethh.linkora.EventsWebSocketManager.closeWriteChannel
-import com.sakethh.linkora.EventsWebSocketManager.initializeWriteChannel
+import com.sakethh.linkora.data.socket.manager.EventsWebSocketManager.closeWriteChannel
+import com.sakethh.linkora.data.socket.manager.EventsWebSocketManager.initializeWriteChannel
+import com.sakethh.linkora.Security
 import com.sakethh.linkora.domain.dto.Correlation
 import io.ktor.server.application.*
 import io.ktor.server.auth.*
diff --git a/src/main/kotlin/com/sakethh/linkora/utils/RegularFunctions.kt b/src/main/kotlin/com/sakethh/linkora/utils/RegularFunctions.kt
@@ -1,6 +1,6 @@
 package com.sakethh.linkora.utils
 
-fun hostedOnRemote(): Boolean {
+fun useSysEnvValues(): Boolean {
     return try {
         System.getenv(SysEnvKey.LINKORA_SERVER_USE_ENV_VAL.name).toBooleanStrict()
     } catch (e: Exception) {
diff --git a/src/main/kotlin/com/sakethh/linkora/utils/ResultCallResponse.kt b/src/main/kotlin/com/sakethh/linkora/utils/ResultCallResponse.kt
@@ -1,6 +1,6 @@
 package com.sakethh.linkora.utils
 
-import com.sakethh.linkora.EventsWebSocketManager
+import com.sakethh.linkora.data.socket.manager.EventsWebSocketManager
 import io.ktor.http.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
diff --git a/src/test/kotlin/com/sakethh/linkora/ApplicationTest.kt b/src/test/kotlin/com/sakethh/linkora/ApplicationTest.kt
@@ -1,5 +1,6 @@
 package com.sakethh.linkora
 
+import com.sakethh.linkora.presentation.routing.configureRouting
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.sakethh.linkora`
	`1`	`+package com.sakethh.linkora.data.socket.manager`
`2`	`2`
`3`	`3`	`import com.sakethh.linkora.domain.model.WebSocketEvent`
`4`	`4`	`import io.ktor.server.websocket.*`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.sakethh.linkora.routing`
	`1`	`+package com.sakethh.linkora.presentation.routing.http`
`2`	`2`
`3`	`3`	`import com.sakethh.linkora.Security`
`4`	`4`	`import com.sakethh.linkora.domain.dto.IDBasedDTO`