VM-1501: conversation improvements 2

src/VirtoCommerce.CommunicationModule.Data/Repositories/CommunicationRepository.cs

@@ -136,12 +136,12 @@ public virtual async Task<CommunicationUserEntity> GetCommunicationUserByUserIdA
     public virtual async Task<IList<ConversationEntity>> GetConversationsByIdsAsync(IList<string> ids, string responseGroup = null)
     {
         var result = Array.Empty<ConversationEntity>();
+        var respGroupEnum = EnumUtility.SafeParseFlags(responseGroup, ConversationResponseGroup.None);
 
         if (!ids.IsNullOrEmpty())
         {
-            result = await Conversations.Where(x => ids.Contains(x.Id)).ToArrayAsync();
+            result = await Conversations.Where(x => ids.Contains(x.Id)).Include(x => x.Users).ToArrayAsync();
         }
-
         return result;
     }
 

src/VirtoCommerce.CommunicationModule.Data/Services/MessageSearchService.cs

@@ -30,10 +30,7 @@ protected override IQueryable<MessageEntity> BuildQuery(IRepository repository,
     {
         var query = ((ICommunicationRepository)repository).Messages;
 
-        if (!string.IsNullOrEmpty(criteria.ConversationId))
-        {
-            query = query.Where(x => x.ConversationId == criteria.ConversationId);
-        }
+        query = query.Where(x => x.ConversationId == criteria.ConversationId);
 
         if (!string.IsNullOrEmpty(criteria.ThreadId))
         {

tests/VirtoCommerce.CommunicationModule.Tests/Functional/MessageSearchServiceTests.cs

@@ -110,22 +110,16 @@ public static TheoryData<string, string, bool, int> MessageSearchTestInput()
                 1
             },
             {
-                null,
-                null,
-                false,
-                3
-            },
-            {
-                null,
+                "TestConversationId_1",
                 "TestMessageId_1",
                 false,
                 1
             },
             {
-                null,
+                "TestConversationId_1",
                 null,
                 true,
-                2
+                1
             }
         };
     }