AdminRepo: UserService: Returns single AdminUserDTO with multiple cid (…

…#8) Fixes #7 where same user entity is returned with different cid in case the user is admin of multiple clubs.
CC-MNNIT · Oct 2, 2023 · 2821ab7 · 2821ab7
2 parents 19f5ba5 + 5e131ee
commit 2821ab7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/src/main/kotlin/com/mnnit/moticlubs/dto/response/AdminUserDTO.kt b/src/main/kotlin/com/mnnit/moticlubs/dto/response/AdminUserDTO.kt
@@ -8,7 +8,7 @@ data class AdminUserDTO(
     val uid: Long,
 
     @JsonProperty("cid")
-    val clubId: Long,
+    val clubId: List<Long>,
 
     @JsonProperty("regNo")
     val regno: String,
@@ -31,7 +31,7 @@ data class AdminUserDTO(
     @JsonProperty("contact")
     val contact: String,
 ) {
-    constructor(clubId: Long, user: User) : this(
+    constructor(clubId: List<Long>, user: User) : this(
         uid = user.uid,
         clubId = clubId,
         regno = user.regno,

diff --git a/src/main/kotlin/com/mnnit/moticlubs/repository/AdminRepository.kt b/src/main/kotlin/com/mnnit/moticlubs/repository/AdminRepository.kt
@@ -2,7 +2,6 @@ package com.mnnit.moticlubs.repository
 
 import com.mnnit.moticlubs.dao.Admin
 import com.mnnit.moticlubs.dao.User
-import com.mnnit.moticlubs.dto.response.AdminUserDTO
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate
 import org.springframework.data.relational.core.query.Criteria
 import org.springframework.data.relational.core.query.Query
@@ -21,17 +20,21 @@ class AdminRepository(
         .flatMap { if (it) Mono.just(admin) else db.insert(admin) }
 
     @Transactional
-    fun findAll(): Flux<AdminUserDTO> = db
+    fun findAllAdmins(): Flux<User> = db
         .databaseClient
-        .sql("SELECT admin.cid, user.* FROM admin INNER JOIN user ON admin.uid = user.uid ORDER BY user.name")
+        .sql("SELECT user.* FROM user INNER JOIN (SELECT DISTINCT (admin.uid) FROM admin) as ad ON ad.uid = user.uid;")
         .fetch()
         .all()
-        .map {
-            AdminUserDTO(
-                clubId = it[Admin::cid.name].toString().toLong(),
-                user = User(it),
-            )
-        }
+        .map { User(it) }
+
+    @Transactional
+    fun findAllByUid(uid: Long): Mono<List<Long>> = db
+        .select(
+            Query.query(Criteria.where(Admin::uid.name).`is`(uid)),
+            Admin::class.java,
+        )
+        .map { it.cid }
+        .collectList()
 
     @Transactional
     fun findAllByCid(cid: Long): Flux<Admin> = db

diff --git a/src/main/kotlin/com/mnnit/moticlubs/service/UserService.kt b/src/main/kotlin/com/mnnit/moticlubs/service/UserService.kt
@@ -49,9 +49,11 @@ class UserService(
 
     @Cacheable("admins")
     fun getAllAdminUsers(): Mono<List<AdminUserDTO>> = adminRepository
-        .findAll()
+        .findAllAdmins()
+        .flatMap { user ->
+            adminRepository.findAllByUid(user.uid).map { AdminUserDTO(it, user) }
+        }
         .collectList()
-        .storeCache()
 
     @CacheEvict(cacheNames = ["user", "admins", "all_users", "members"], allEntries = true)
     fun updateAvatar(uid: Long, avatar: String): Mono<User> = userRepository.updateAvatar(uid, avatar)