Communication: Allow tutors to monitor channels as moderator

src/main/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);
         }

src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts

@@ -74,10 +74,10 @@ 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 mayEditOrDeleteOtherUsersAnswer =
-            (isCourseWideChannel && isAtLeastInstructorInCourse) || (getAsChannelDTO(this.metisService.getCurrentConversation())?.hasChannelModerationRights ?? false);
-        this.mayDelete = !this.isReadOnlyMode && (this.isAuthorOfPosting || mayEditOrDeleteOtherUsersAnswer);
+        const canDeletePost = this.isAnswerOfAnnouncement ? this.metisService.metisUserIsAtLeastInstructorInCourse() : this.metisService.metisUserIsAtLeastTutorInCourse();
+        const mayDeleteOtherUsersAnswer =
+            (isCourseWideChannel && canDeletePost) || (getAsChannelDTO(this.metisService.getCurrentConversation())?.hasChannelModerationRights ?? false);
+        this.mayDelete = !this.isReadOnlyMode && (this.isAuthorOfPosting || (mayDeleteOtherUsersAnswer && canDeletePost));
         this.mayDeleteOutput.emit(this.mayDelete);
     }
 

src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts

@@ -100,7 +100,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;
         }
 
@@ -203,9 +203,12 @@ export class PostReactionsBarComponent extends PostingsReactionsBarDirective<Pos
     setMayDelete(): void {
         this.isAtLeastInstructorInCourse = this.metisService.metisUserIsAtLeastInstructorInCourse();
         const isCourseWideChannel = getAsChannelDTO(this.posting.conversation)?.isCourseWide ?? false;
+        const isAnswerOfAnnouncement = getAsChannelDTO(this.posting.conversation)?.isAnnouncementChannel ?? false;
+        const isAtLeastTutorInCourse = this.metisService.metisUserIsAtLeastTutorInCourse();
+        const canDeleteAnnouncement = isAnswerOfAnnouncement ? this.metisService.metisUserIsAtLeastInstructorInCourse() : true;
         const mayDeleteOtherUsersAnswer =
-            (isCourseWideChannel && this.isAtLeastInstructorInCourse) || (getAsChannelDTO(this.metisService.getCurrentConversation())?.hasChannelModerationRights ?? false);
-        this.mayDelete = !this.readOnlyMode && !this.previewMode && (this.isAuthorOfPosting || mayDeleteOtherUsersAnswer);
+            (isCourseWideChannel && isAtLeastTutorInCourse) || (getAsChannelDTO(this.metisService.getCurrentConversation())?.hasChannelModerationRights ?? false);
+        this.mayDelete = !this.readOnlyMode && !this.previewMode && (this.isAuthorOfPosting || mayDeleteOtherUsersAnswer) && canDeleteAnnouncement;
         this.mayDeleteOutput.emit(this.mayDelete);
     }
 

src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts

@@ -131,6 +131,7 @@ describe('AnswerPostReactionsBarComponent', () => {
     it('should display the delete option to instructor if posting is in course-wide channel from a student', () => {
         metisServiceUserIsAtLeastInstructorMock.mockReturnValue(true);
         metisServiceUserPostingAuthorMock.mockReturnValue(false);
+        metisServiceUserIsAtLeastTutorMock.mockReturnValue(true);
         component.posting = { ...metisResolvingAnswerPostUser1, post: { ...metisPostInChannel } };
         component.posting.authorRole = UserRole.USER;
         component.ngOnInit();
@@ -158,7 +159,7 @@ describe('AnswerPostReactionsBarComponent', () => {
         expect(getEditButton()).not.toBeNull();
     });
 
-    it('should not display edit and delete options to tutor if posting is in course-wide channel from a student', () => {
+    it('should display edit and delete options to tutor if posting is in course-wide channel from a student', () => {
         metisServiceUserIsAtLeastInstructorMock.mockReturnValue(false);
         metisServiceUserIsAtLeastTutorMock.mockReturnValue(true);
         metisServiceUserPostingAuthorMock.mockReturnValue(false);
@@ -167,7 +168,7 @@ describe('AnswerPostReactionsBarComponent', () => {
         component.ngOnInit();
         fixture.detectChanges();
         expect(getEditButton()).toBeNull();
-        expect(getDeleteButton()).toBeNull();
+        expect(getDeleteButton()).not.toBeNull();
     });
 
     it('should not display edit and delete options to users that are neither author or tutor', () => {

src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts

@@ -223,7 +223,7 @@ describe('PostReactionsBarComponent', () => {
         expect(debugElement.query(By.directive(ConfirmIconComponent))).toBeNull();
     });
 
-    it('should not display edit and delete options to tutor if posting is in course-wide channel', () => {
+    it('should not display edit option but should display delete option to tutor if posting is in course-wide channel', () => {
         metisServiceUserIsAtLeastInstructorStub.mockReturnValue(false);
         metisServiceUserIsAtLeastTutorStub.mockReturnValue(true);
         metisServiceUserIsAuthorOfPostingStub.mockReturnValue(false);
@@ -232,7 +232,7 @@ describe('PostReactionsBarComponent', () => {
         component.ngOnInit();
         fixture.detectChanges();
         expect(getEditButton()).toBeNull();
-        expect(getDeleteButton()).toBeNull();
+        expect(getDeleteButton()).not.toBeNull();
     });
 
     it('should not display edit and delete options to tutor if posting is announcement', () => {
@@ -257,11 +257,14 @@ describe('PostReactionsBarComponent', () => {
 
     it('should display the delete option to instructor if posting is in course-wide channel from a student', () => {
         metisServiceUserIsAtLeastInstructorStub.mockReturnValue(true);
+        metisServiceUserIsAtLeastTutorStub.mockReturnValue(true);
         metisServiceUserIsAuthorOfPostingStub.mockReturnValue(false);
         component.posting = { ...metisPostInChannel };
         component.posting.authorRole = UserRole.USER;
+
         component.ngOnInit();
         fixture.detectChanges();
+        component.setMayDelete();
         expect(getDeleteButton()).not.toBeNull();
     });