Display introduction rejection reason

kir-dev · Sep 5, 2024 · 3723bf3 · 3723bf3
1 parent 5368366
commit 3723bf3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/team/TeamService.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/team/TeamService.kt
@@ -243,15 +243,21 @@ open class TeamService(
         val members = if (teamComponent.showTeamMembersPublicly.isValueTrue() || ownTeam) mapMembers(team, user?.id) else null
         val requests = if (user != null && user.role.value >= RoleType.PRIVILEGED.value && ownTeam) mapRequests(team) else null
 
-        val introduction = teamIntroductionRepository.findIntroductionsForGroup(team.id)
-            .firstOrNull { it.approved }
+        val introductions = teamIntroductionRepository.findIntroductionsForGroup(team.id)
+        val latestIntro = introductions.firstOrNull { it.approved }
+        val latestRejectedIntro = introductions.firstOrNull { it.rejected }
 
+        // if there is a newer introduction that is rejected than the latest accepted, we should display the reason
+        val descriptionRejected = (latestRejectedIntro?.creationDate ?: 0) > (latestIntro?.creationDate ?: 0)
+        val rejectionReason = if (descriptionRejected) latestRejectedIntro?.rejectionReason else null
         return TeamView(
             id = team.id,
             name = team.name,
             coverUrl = team.coverImageUrl,
-            description = introduction?.introduction ?: "",
-            logo = introduction?.logo ?: "",
+            description = latestIntro?.introduction ?: "",
+            descriptionRejected = if (ownTeam) descriptionRejected else false,
+            descriptionRejectionReason = if (ownTeam) rejectionReason else null,
+            logo = latestIntro?.logo ?: "",
             points = score,
             members = members,
             applicants = requests,

diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/team/TeamView.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/team/TeamView.kt
@@ -37,6 +37,8 @@ data class TeamView(
     var name: String = "",
     val coverUrl: String = "",
     val description: String = "",
+    var descriptionRejected: Boolean,
+    val descriptionRejectionReason: String?,
     val logo: String? = null,
     var points: Int? = null,
     var members: List<TeamMemberView>? = null,

diff --git a/frontend/src/pages/teams/components/TeamDetailsCore.tsx b/frontend/src/pages/teams/components/TeamDetailsCore.tsx
@@ -99,6 +99,16 @@ export function TeamDetailsCore({ team, isLoading, error, myTeam = false, refetc
           </Box>
         </Box>
       </Box>
+      {team.descriptionRejected && (
+        <Box backgroundImage={team.coverUrl} mt={5} backgroundPosition="center" backgroundSize="cover" borderRadius="lg" overflow="hidden">
+          <Box p={4} bg={bannerBlanket}>
+            <Heading fontSize={25} my={0}>
+              A csapat leírása elutasításra került
+            </Heading>
+            <Text>Az adminisztrátor üzenete: {team.descriptionRejectionReason ?? ''}</Text>
+          </Box>
+        </Box>
+      )}
       <Flex flex={1} gap={5} justify="space-between" flexDirection={['column', null, 'row']} align="flex-start">
         <VStack align="flex-start" w="full">
           <Grid mt={5} gridAutoRows="auto" w="full" gridTemplateColumns={['full', 'repeat(2, 1fr)', 'repeat(3, 1fr)']} gap={5}>

diff --git a/frontend/src/util/views/team.view.ts b/frontend/src/util/views/team.view.ts
@@ -30,6 +30,8 @@ export enum TeamStatus {
 export type TeamView = {
   coverUrl: string
   description: string
+  descriptionRejected: boolean
+  descriptionRejectionReason?: String
   leaderNotes: string
   points: number
   members: TeamMemberView[]