split AuthenticationOriginalUserRepository and AuthenticationUserRepo…

…sitory

authentication-service/src/main/kotlin/com/saveourtool/save/authservice/repository/AuthenticationOriginalUserRepository.kt

@@ -0,0 +1,25 @@
+package com.saveourtool.save.authservice.repository
+
+import com.saveourtool.save.authservice.utils.toUserEntity
+import com.saveourtool.save.entities.User
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
+import org.springframework.stereotype.Component
+
+/**
+ * Repository for [com.saveourtool.save.entities.User]
+ */
+@Component
+class AuthenticationOriginalUserRepository(
+    private val namedParameterJdbcTemplate: NamedParameterJdbcTemplate,
+) {
+    /**
+     * @param name name of user
+     * @param source source of user
+     * @return user or null if no results have been found
+     */
+    fun findByNameAndSource(name: String, source: String): User? =
+        namedParameterJdbcTemplate.queryForList(
+            "SELECT * FROM save_cloud.user WHERE id = (select user_id from save_cloud.original_login where name = :name AND source = :source)",
+            mapOf("name" to name, "source" to source)
+        ).singleOrNull()?.toUserEntity()
+}

authentication-service/src/main/kotlin/com/saveourtool/save/authservice/repository/AuthenticationUserRepository.kt

@@ -10,45 +10,28 @@ import org.springframework.stereotype.Component
  */
 @Component
 class AuthenticationUserRepository(
-    private val namedParameterJdbcTemplate: NamedParameterJdbcTemplate,
+    protected val namedParameterJdbcTemplate: NamedParameterJdbcTemplate,
 ) {
     /**
      * @param name name of user
      * @param source source of user
      * @return user or null if no results have been found
      */
-    fun findByNameAndSource(name: String, source: String): User? {
-        val record = namedParameterJdbcTemplate.queryForList(
-            "SELECT * FROM save_cloud.user WHERE name = :name AND source = :source",
-            mapOf("name" to name, "source" to source)
-        ).singleOrNull()
-            ?: namedParameterJdbcTemplate.queryForList(
-                "SELECT * FROM save_cloud.user WHERE id = (select user_id from save_cloud.original_login where name = :name AND source = :source)",
-                mapOf("name" to name, "source" to source)
-            ).singleOrNull()
-                .orNotFound {
-                    "There is no user with name $name and source $source"
-                }
-        return record.toUserEntity()
+    fun findByNameAndSource(name: String): User? {
+        return namedParameterJdbcTemplate.queryForList(
+            "SELECT * FROM save_cloud.user WHERE name = :name",
+            mapOf("name" to name)
+        ).singleOrNull()?.toUserEntity()
     }
 
-    private fun Map<String, Any>.toUserEntity(): User {
-        val record = this
-        return User(
-            name = record["name"] as String,
-            password = record["password"] as String?,
-            role = record["role"] as String?,
-            email = record["email"] as String?,
-            avatar = record["avatar"] as String?,
-            company = record["company"] as String?,
-            location = record["location"] as String?,
-            linkedin = record["linkedin"] as String?,
-            gitHub = record["git_hub"] as String?,
-            twitter = record["twitter"] as String?,
-            isActive = record["is_active"] as Boolean,
-            rating = record["rating"] as Long,
-        ).apply {
-            this.id = record["id"] as Long
+    /**
+     * @param name name of user
+     * @return user or error if no results have been found
+     */
+    fun getByNameAndSource(name: String): User = findByNameAndSource(name)
+        .orNotFound {
+            "There is no user with name $name"
         }
-    }
+
+
 }

authentication-service/src/main/kotlin/com/saveourtool/save/authservice/utils/IdAwareUserDetails.kt

@@ -58,7 +58,7 @@ fun Mono<User>.getIdAwareUserDetails(username: String, source: String? = null) =
  */
 @Suppress("UnsafeCallOnNullableType")
 private fun User.toIdAwareUserDetails(): IdAwareUserDetails = IdAwareUserDetails(
-    username = this.name.orResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR),
+    username = this.name,
     password = this.password.orEmpty(),
     authorities = this.role,
     id = this.requiredId(),

authentication-service/src/main/kotlin/com/saveourtool/save/authservice/utils/SecurityUtils.kt

@@ -5,6 +5,7 @@
 package com.saveourtool.save.authservice.utils
 
 import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.User
 import org.springframework.security.access.hierarchicalroles.RoleHierarchy
 import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl
 import org.springframework.security.access.hierarchicalroles.RoleHierarchyUtils
@@ -48,3 +49,26 @@ fun roleHierarchy(): RoleHierarchy = mapOf(
     .let {
         RoleHierarchyImpl().apply { setHierarchy(it) }
     }
+
+/**
+ * @return Entity [User] created from provided [Map]
+ */
+internal fun Map<String, Any>.toUserEntity(): User {
+    val record = this
+    return User(
+        name = record["name"] as String,
+        password = record["password"] as String?,
+        role = record["role"] as String?,
+        email = record["email"] as String?,
+        avatar = record["avatar"] as String?,
+        company = record["company"] as String?,
+        location = record["location"] as String?,
+        linkedin = record["linkedin"] as String?,
+        gitHub = record["git_hub"] as String?,
+        twitter = record["twitter"] as String?,
+        isActive = record["is_active"] as Boolean,
+        rating = record["rating"] as Long,
+    ).apply {
+        this.id = record["id"] as Long
+    }
+}