Conditional staff visibility

Author: rokeppen

src/main/kotlin/be/sgl/backend/entity/setting/SettingId.kt

@@ -5,5 +5,6 @@ enum class SettingId {
     REPRESENTATIVE_TITLE,
     REPRESENTATIVE_USERNAME,
     REPRESENTATIVE_SIGNATURE,
-    CALENDAR_NAME
+    CALENDAR_NAME,
+    STAFF_VISIBLE
 }

src/main/kotlin/be/sgl/backend/service/BranchService.kt

@@ -3,6 +3,8 @@ package be.sgl.backend.service
 import be.sgl.backend.dto.BranchBaseDTO
 import be.sgl.backend.dto.BranchDTO
 import be.sgl.backend.entity.branch.Branch
+import be.sgl.backend.entity.branch.BranchStatus
+import be.sgl.backend.entity.setting.SettingId
 import be.sgl.backend.repository.BranchRepository
 import be.sgl.backend.repository.user.UserRepository
 import be.sgl.backend.service.exception.BranchNotFoundException
@@ -22,10 +24,14 @@ class BranchService {
     private lateinit var mapper: BranchMapper
     @Autowired
     private lateinit var imageService: ImageService
+    @Autowired
+    private lateinit var settingService: SettingService
 
     fun getBranchDTOById(id: Int): BranchDTO {
         val branch = getBranchById(id)
-        branch.staff = userRepository.getStaffForBranch(branch)
+        if (branch.status != BranchStatus.ACTIVE || settingService.getOrDefault(SettingId.STAFF_VISIBLE, true)) {
+            branch.staff = userRepository.getStaffForBranch(branch)
+        }
         return mapper.toDto(branch)
     }
 

src/main/kotlin/be/sgl/backend/service/SettingService.kt

@@ -25,6 +25,10 @@ class SettingService {
         return get(id)?.toDouble() ?: default
     }
 
+    fun getOrDefault(id: SettingId, default: Boolean): Boolean {
+        return get(id)?.toBoolean() ?: default
+    }
+
     fun update(id: SettingId, value: Any?) {
         value ?: return settingRepository.deleteById(id.name)
         val setting = settingRepository.findByIdOrNull(id.name) ?: Setting(id, value)