Allow tutors to monitor channels as moderator for course wide channels.

ls1intum · Nov 26, 2024 · 1138b94 · 1138b94
1 parent e3ed347
commit 1138b94
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/...n/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java b/...n/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java
@@ -143,7 +143,9 @@ public Optional<Conversation> isMemberOrCreateForCourseWideElseThrow(Long conver
 
         if (conversation instanceof Channel channel && channel.getIsCourseWide()) {
             ConversationParticipant conversationParticipant = ConversationParticipant.createWithDefaultValues(user, channel);
-            conversationParticipant.setIsModerator(authorizationCheckService.isAtLeastInstructorInCourse(channel.getCourse(), user));
+            boolean canBecomeModerator = (channel.getIsAnnouncementChannel() ? authorizationCheckService.isAtLeastInstructorInCourse(channel.getCourse(), user)
+                    : authorizationCheckService.isAtLeastTeachingAssistantInCourse(channel.getCourse(), user));
+            conversationParticipant.setIsModerator(canBecomeModerator);
             lastReadDate.ifPresent(conversationParticipant::setLastRead);
             conversationParticipantRepository.saveAndFlush(conversationParticipant);
         }

diff --git a/...is/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts b/...is/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts
@@ -69,10 +69,11 @@ export class AnswerPostReactionsBarComponent extends PostingsReactionsBarDirecti
         this.isAuthorOfOriginalPost = this.metisService.metisUserIsAuthorOfPosting(this.posting.post!);
         this.isAnswerOfAnnouncement = getAsChannelDTO(this.posting.post?.conversation)?.isAnnouncementChannel ?? false;
         const isCourseWideChannel = getAsChannelDTO(this.posting.post?.conversation)?.isCourseWide ?? false;
-        const isAtLeastInstructorInCourse = this.metisService.metisUserIsAtLeastInstructorInCourse();
+        const isAtLeastTutorInCourse = this.metisService.metisUserIsAtLeastTutorInCourse();
+        const canDeleteAndEditAnnouncement = this.isAnswerOfAnnouncement ? this.metisService.metisUserIsAtLeastInstructorInCourse() : true;
         const mayEditOrDeleteOtherUsersAnswer =
-            (isCourseWideChannel && isAtLeastInstructorInCourse) || (getAsChannelDTO(this.metisService.getCurrentConversation())?.hasChannelModerationRights ?? false);
-        this.mayEditOrDelete = !this.isReadOnlyMode && (this.isAuthorOfPosting || mayEditOrDeleteOtherUsersAnswer);
+            (isCourseWideChannel && isAtLeastTutorInCourse) || (getAsChannelDTO(this.metisService.getCurrentConversation())?.hasChannelModerationRights ?? false);
+        this.mayEditOrDelete = !this.isReadOnlyMode && (this.isAuthorOfPosting || mayEditOrDeleteOtherUsersAnswer) && canDeleteAndEditAnnouncement;
         this.mayEditOrDeleteOutput.emit(this.mayEditOrDelete);
     }
 

diff --git a/...app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts b/...app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts
@@ -86,7 +86,7 @@ export class PostReactionsBarComponent extends PostingsReactionsBarDirective<Pos
      */
     private setCanPin(currentConversation: ConversationDTO | undefined) {
         if (!currentConversation) {
-            this.canPin = this.metisService.metisUserIsAtLeastInstructorInCourse();
+            this.canPin = this.metisService.metisUserIsAtLeastTutorInCourse();
             return;
         }
 
@@ -186,11 +186,13 @@ export class PostReactionsBarComponent extends PostingsReactionsBarDirective<Pos
     }
 
     setMayEditOrDelete(): void {
-        this.isAtLeastInstructorInCourse = this.metisService.metisUserIsAtLeastInstructorInCourse();
+        this.isAtLeastTutorInCourse = this.metisService.metisUserIsAtLeastTutorInCourse();
         const isCourseWideChannel = getAsChannelDTO(this.posting.conversation)?.isCourseWide ?? false;
+        const isAnswerOfAnnouncement = getAsChannelDTO(this.posting.conversation)?.isAnnouncementChannel ?? false;
         const mayEditOrDeleteOtherUsersAnswer =
-            (isCourseWideChannel && this.isAtLeastInstructorInCourse) || (getAsChannelDTO(this.metisService.getCurrentConversation())?.hasChannelModerationRights ?? false);
-        this.mayEditOrDelete = !this.readOnlyMode && !this.previewMode && (this.isAuthorOfPosting || mayEditOrDeleteOtherUsersAnswer);
+            (isCourseWideChannel && this.isAtLeastTutorInCourse) || (getAsChannelDTO(this.metisService.getCurrentConversation())?.hasChannelModerationRights ?? false);
+        const canDeleteAndEditAnnouncement = isAnswerOfAnnouncement ? this.metisService.metisUserIsAtLeastInstructorInCourse() : true;
+        this.mayEditOrDelete = !this.readOnlyMode && !this.previewMode && (this.isAuthorOfPosting || mayEditOrDeleteOtherUsersAnswer) && canDeleteAndEditAnnouncement;
         this.mayEditOrDeleteOutput.emit(this.mayEditOrDelete);
     }
 }