Merge pull request #823 from iceljc/master

refine idle conv

Author: iceljc

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Conversation.cs

@@ -507,12 +507,13 @@ public List<string> GetIdleConversations(int batchSize, int messageLimit, int bu
                     continue;
                 }
 
-                if (excludeAgentIds.Contains(conv.AgentId) || conv.UpdatedTime > utcNow.AddHours(-bufferHours))
+                if (conv.UpdatedTime > utcNow.AddHours(-bufferHours))
                 {
                     continue;
                 }
 
-                if (conv.DialogCount <= messageLimit)
+                if ((excludeAgentIds.Contains(conv.AgentId) && conv.DialogCount == 0)
+                    || (!excludeAgentIds.Contains(conv.AgentId) && conv.DialogCount <= messageLimit))
                 {
                     ids.Add(conv.Id);
                     if (ids.Count >= batchSize)

src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Conversation.cs

@@ -455,7 +455,9 @@ public List<string> GetIdleConversations(int batchSize, int messageLimit, int bu
         {
             var skip = (page - 1) * batchSize;
             var candidates = _dc.Conversations.AsQueryable()
-                                              .Where(x => !excludeAgentIds.Contains(x.AgentId) && x.DialogCount <= messageLimit && x.UpdatedTime <= utcNow.AddHours(-bufferHours))
+                                              .Where(x => ((!excludeAgentIds.Contains(x.AgentId) && x.DialogCount <= messageLimit)
+                                                       || (excludeAgentIds.Contains(x.AgentId) && x.DialogCount == 0))
+                                                        && x.UpdatedTime <= utcNow.AddHours(-bufferHours))
                                               .Skip(skip)
                                               .Take(batchSize)
                                               .Select(x => x.Id)