Communication: Allow users to search for answer post in course wide channels

src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java

@@ -19,7 +19,6 @@
 import de.tum.cit.aet.artemis.communication.domain.PostSortCriterion;
 import de.tum.cit.aet.artemis.communication.domain.Post_;
 import de.tum.cit.aet.artemis.communication.domain.Reaction_;
-import de.tum.cit.aet.artemis.communication.domain.conversation.Channel;
 import de.tum.cit.aet.artemis.communication.domain.conversation.Channel_;
 import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation_;
 import de.tum.cit.aet.artemis.core.domain.Course_;
@@ -61,7 +60,10 @@ else if (searchText.startsWith("#") && StringUtils.isNumeric(searchText.substrin
 
                 Predicate searchInMessageContent = criteriaBuilder.like(criteriaBuilder.lower(root.get(Post_.CONTENT)), searchTextLiteral);
 
-                return criteriaBuilder.and(searchInMessageContent);
+                Join<Post, AnswerPost> answersJoin = root.join(Post_.ANSWERS, JoinType.LEFT);
+                Predicate searchInAnswerContent = criteriaBuilder.like(criteriaBuilder.lower(answersJoin.get(AnswerPost_.CONTENT)), searchTextLiteral);
+
+                return criteriaBuilder.or(searchInMessageContent, searchInAnswerContent);
             }
         });
     }
@@ -93,11 +95,7 @@ public static Specification<Post> getCourseWideChannelsSpecification(Long course
         return (root, query, criteriaBuilder) -> {
             final var conversationJoin = root.join(Post_.conversation, JoinType.LEFT);
             final var isInCoursePredicate = criteriaBuilder.equal(conversationJoin.get(Channel_.COURSE).get(Course_.ID), courseId);
-            final var isCourseWidePredicate = criteriaBuilder.isTrue(conversationJoin.get(Channel_.IS_COURSE_WIDE));
-            // make sure we only fetch channels (which are sub types of conversations)
-            // this avoids the creation of sub queries
-            final var isChannelPredicate = criteriaBuilder.equal(conversationJoin.type(), criteriaBuilder.literal(Channel.class));
-            return criteriaBuilder.and(isInCoursePredicate, isCourseWidePredicate, isChannelPredicate);
+            return criteriaBuilder.and(isInCoursePredicate);
         };
     }
 

src/main/webapp/app/shared/metis/metis.service.ts

@@ -6,7 +6,7 @@ import { User } from 'app/core/user/user.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { Course } from 'app/entities/course.model';
 import { Posting } from 'app/entities/metis/posting.model';
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import { AnswerPostService } from 'app/shared/metis/answer-post.service';
 import { AnswerPost } from 'app/entities/metis/answer-post.model';
 import { Reaction } from 'app/entities/metis/reaction.model';
@@ -27,10 +27,11 @@ import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { MetisPostDTO } from 'app/entities/metis/metis-post-dto.model';
 import dayjs from 'dayjs/esm';
 import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase';
-import { Conversation, ConversationDTO } from 'app/entities/metis/conversation/conversation.model';
+import { Conversation, ConversationDTO, ConversationType } from 'app/entities/metis/conversation/conversation.model';
 import { ChannelDTO, ChannelSubType, getAsChannelDTO } from 'app/entities/metis/conversation/channel.model';
 import { ConversationService } from 'app/shared/metis/conversations/conversation.service';
 import { NotificationService } from 'app/shared/notification/notification.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Injectable()
 export class MetisService implements OnDestroy {
@@ -49,6 +50,7 @@ export class MetisService implements OnDestroy {
     private subscriptionChannel?: string;
 
     private courseWideTopicSubscription: Subscription;
+    private translateService = inject(TranslateService);
 
     constructor(
         protected postService: PostService,
@@ -516,13 +518,24 @@ export class MetisService implements OnDestroy {
         let queryParams = undefined;
         let displayName = '';
         if (post.conversation) {
-            displayName = getAsChannelDTO(post.conversation)?.name ?? '';
+            displayName = this.getDisplayName(post)!;
             routerLinkComponents = ['/courses', this.courseId, 'communication'];
             queryParams = { conversationId: post.conversation.id! };
         }
         return { routerLinkComponents, displayName, queryParams };
     }
 
+    getDisplayName(post: Post) {
+        switch (post.conversation!.type) {
+            case ConversationType.CHANNEL:
+                return getAsChannelDTO(post.conversation)?.name ?? '';
+            case ConversationType.ONE_TO_ONE:
+                return this.translateService.instant('artemisApp.conversationsLayout.conversationSelectionSideBar.groupChat');
+            case ConversationType.GROUP_CHAT:
+                return this.translateService.instant('artemisApp.conversationsLayout.conversationSelectionSideBar.directMessage');
+        }
+    }
+
     /**
      * Creates (and updates) the websocket channel for receiving messages in dedicated channels;
      * On message reception, subsequent actions for updating the dependent components are defined based on the MetisPostAction encapsulated in the MetisPostDTO (message payload);

src/main/webapp/i18n/de/conversation.json

@@ -45,7 +45,9 @@
                 "examChannels": "Klausuren",
                 "createChannel": "Kanal erstellen",
                 "browseChannels": "Kanäle durchsuchen",
+                "groupChat": "Gruppenchat",
                 "groupChats": "Gruppenchats",
+                "directMessage": "Direktnachricht",
                 "directMessages": "Direktnachrichten",
                 "filterConversationPlaceholder": "Konversationen filtern",
                 "sideBarSection": {

src/main/webapp/i18n/en/conversation.json

@@ -45,7 +45,9 @@
                 "examChannels": "Exams",
                 "createChannel": "Create channel",
                 "browseChannels": "Browse channels",
+                "groupChat": "Group Chat",
                 "groupChats": "Group Chats",
+                "directMessage": "Direct Message",
                 "directMessages": "Direct Messages",
                 "filterConversationPlaceholder": "Filter conversations",
                 "sideBarSection": {