Move services from Save and COSV into a common module (#2920)

* Move services from Save and COSV into a common module

Author: Cheshiriks

save-backend/src/main/kotlin/com/saveourtool/save/backend/SaveApplication.kt

@@ -10,7 +10,14 @@ import org.springframework.context.annotation.Import
 /**
  * An entrypoint for spring for save-backend
  */
-@SpringBootApplication(scanBasePackages = ["com.saveourtool.save.backend", "com.saveourtool.save.repository"])
+@SpringBootApplication(scanBasePackages = [
+    "com.saveourtool.save.backend",
+    "com.saveourtool.save.service",
+    "com.saveourtool.save.storage",
+    "com.saveourtool.save.security",
+    "com.saveourtool.save.utils",
+    "com.saveourtool.save.repository",
+])
 @EnableConfigurationProperties(ConfigProperties::class)
 @Import(
     DefaultS3Configuration::class,

save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/ApplicationConfiguration.kt

@@ -2,7 +2,6 @@ package com.saveourtool.save.backend.configs
 
 import com.saveourtool.save.service.LogService
 import com.saveourtool.save.service.LokiLogService
-import com.saveourtool.save.utils.BlockingBridge
 import org.springframework.boot.actuate.autoconfigure.metrics.orm.jpa.HibernateMetricsAutoConfiguration
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration
 import org.springframework.boot.autoconfigure.domain.EntityScan
@@ -24,10 +23,4 @@ class ApplicationConfiguration {
      */
     @Bean
     fun logService(configProperties: ConfigProperties): LogService = LokiLogService.createOrStub(configProperties.loki)
-
-    /**
-     * @return [BlockingBridge]
-     */
-    @Bean
-    fun blockingBridge(): BlockingBridge = BlockingBridge.default
 }

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/AvatarController.kt

@@ -1,11 +1,11 @@
 package com.saveourtool.save.backend.controllers
 
 import com.saveourtool.save.authservice.utils.username
-import com.saveourtool.save.backend.service.OrganizationService
-import com.saveourtool.save.backend.service.UserDetailsService
-import com.saveourtool.save.backend.storage.AvatarStorage
 import com.saveourtool.save.configs.ApiSwaggerSupport
+import com.saveourtool.save.service.OrganizationService
+import com.saveourtool.save.service.UserService
 import com.saveourtool.save.storage.AvatarKey
+import com.saveourtool.save.storage.AvatarStorage
 import com.saveourtool.save.utils.*
 import com.saveourtool.save.utils.ByteBufferFluxResponse
 import com.saveourtool.save.v1
@@ -43,7 +43,7 @@ import kotlin.time.toJavaDuration
 internal class AvatarController(
     private val avatarStorage: AvatarStorage,
     private val organizationService: OrganizationService,
-    private val userDetailsService: UserDetailsService,
+    private val userDetailsService: UserService,
 ) {
     @Operation(
         method = "POST",

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/CommentController.kt

@@ -1,11 +1,11 @@
 package com.saveourtool.save.backend.controllers
 
-import com.saveourtool.save.backend.security.CommentPermissionEvaluator
-import com.saveourtool.save.backend.service.CommentService
 import com.saveourtool.save.configs.ApiSwaggerSupport
 import com.saveourtool.save.entities.Comment
 import com.saveourtool.save.entities.CommentDto
 import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.security.CommentPermissionEvaluator
+import com.saveourtool.save.service.CommentService
 import com.saveourtool.save.utils.StringResponse
 import com.saveourtool.save.utils.blockingToMono
 import com.saveourtool.save.utils.switchIfEmptyToNotFound

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ContestController.kt

@@ -1,6 +1,5 @@
 package com.saveourtool.save.backend.controllers
 
-import com.saveourtool.save.backend.security.OrganizationPermissionEvaluator
 import com.saveourtool.save.backend.service.*
 import com.saveourtool.save.backend.storage.TestsSourceSnapshotStorage
 import com.saveourtool.save.configs.ApiSwaggerSupport
@@ -11,6 +10,8 @@ import com.saveourtool.save.entities.contest.ContestDto
 import com.saveourtool.save.entities.contest.ContestStatus
 import com.saveourtool.save.permission.Permission
 import com.saveourtool.save.request.TestFilesRequest
+import com.saveourtool.save.security.OrganizationPermissionEvaluator
+import com.saveourtool.save.service.OrganizationService
 import com.saveourtool.save.test.TestFilesContent
 import com.saveourtool.save.utils.*
 import com.saveourtool.save.v1

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/DemoManagerController.kt

@@ -1,16 +1,16 @@
 package com.saveourtool.save.backend.controllers
 
 import com.saveourtool.save.backend.configs.ConfigProperties
-import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
 import com.saveourtool.save.backend.service.LnkProjectGithubService
-import com.saveourtool.save.backend.service.ProjectService
 import com.saveourtool.save.configs.ApiSwaggerSupport
 import com.saveourtool.save.configs.RequiresAuthorizationSourceHeader
 import com.saveourtool.save.demo.DemoCreationRequest
 import com.saveourtool.save.entities.FileDto
 import com.saveourtool.save.entities.Project
 import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.security.ProjectPermissionEvaluator
 import com.saveourtool.save.service.LogService
+import com.saveourtool.save.service.ProjectService
 import com.saveourtool.save.spring.utils.applyAll
 import com.saveourtool.save.utils.*
 import com.saveourtool.save.v1

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ExecutionController.kt

@@ -1,9 +1,6 @@
 package com.saveourtool.save.backend.controllers
 
-import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
 import com.saveourtool.save.backend.service.ExecutionService
-import com.saveourtool.save.backend.service.OrganizationService
-import com.saveourtool.save.backend.service.ProjectService
 import com.saveourtool.save.backend.storage.ExecutionInfoStorage
 import com.saveourtool.save.backend.utils.toMonoOrNotFound
 import com.saveourtool.save.core.utils.runIf
@@ -14,6 +11,9 @@ import com.saveourtool.save.execution.ExecutionUpdateDto
 import com.saveourtool.save.execution.TestingType
 import com.saveourtool.save.filters.ExecutionFilter
 import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.security.ProjectPermissionEvaluator
+import com.saveourtool.save.service.OrganizationService
+import com.saveourtool.save.service.ProjectService
 import com.saveourtool.save.utils.blockingMap
 import com.saveourtool.save.utils.orNotFound
 import com.saveourtool.save.utils.switchIfEmptyToNotFound

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/FileController.kt

@@ -1,11 +1,11 @@
 package com.saveourtool.save.backend.controllers
 
-import com.saveourtool.save.backend.service.ProjectService
 import com.saveourtool.save.backend.storage.FileStorage
 import com.saveourtool.save.configs.ApiSwaggerSupport
 import com.saveourtool.save.entities.FileDto
 import com.saveourtool.save.entities.Project
 import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.service.ProjectService
 import com.saveourtool.save.utils.*
 import com.saveourtool.save.utils.ByteBufferFluxResponse
 import com.saveourtool.save.v1

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/LnkContestProjectController.kt

@@ -15,6 +15,8 @@ import com.saveourtool.save.entities.LnkContestProject
 import com.saveourtool.save.entities.contest.ContestResult
 import com.saveourtool.save.execution.ExecutionDto
 import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.service.LnkUserProjectService
+import com.saveourtool.save.service.ProjectService
 import com.saveourtool.save.utils.*
 import com.saveourtool.save.v1
 

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/LnkOrganizationTestSuiteController.kt

@@ -7,10 +7,8 @@
 
 package com.saveourtool.save.backend.controllers
 
-import com.saveourtool.save.backend.security.OrganizationPermissionEvaluator
 import com.saveourtool.save.backend.security.TestSuitePermissionEvaluator
 import com.saveourtool.save.backend.service.LnkOrganizationTestSuiteService
-import com.saveourtool.save.backend.service.OrganizationService
 import com.saveourtool.save.backend.service.TestSuitesService
 import com.saveourtool.save.backend.service.TestsSourceVersionService
 import com.saveourtool.save.configs.ApiSwaggerSupport
@@ -23,6 +21,8 @@ import com.saveourtool.save.filters.TestSuiteFilter
 import com.saveourtool.save.permission.Permission
 import com.saveourtool.save.permission.Rights
 import com.saveourtool.save.permission.SetRightsRequest
+import com.saveourtool.save.security.OrganizationPermissionEvaluator
+import com.saveourtool.save.service.OrganizationService
 import com.saveourtool.save.testsuite.TestSuiteVersioned
 import com.saveourtool.save.utils.StringResponse
 import com.saveourtool.save.utils.switchIfEmptyToNotFound