SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refine null

Browse source
This commit is contained in:
Jicheng Lu 2024-01-02 11:50:07 -06:00
parent f5a9f37dd4
commit 538be13bee
5 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
View file

@ -33,7 +33,7 @@ public interface IBotSharpRepository
List<DialogElement> GetConversationDialogs(string conversationId);
void UpdateConversationDialogElements(string conversationId, List<DialogContentUpdateModel> updateElements);
void AppendConversationDialogs(string conversationId, List<DialogElement> dialogs);
List<StateKeyValue> GetConversationStates(string conversationId);
ConversationState GetConversationStates(string conversationId);
void UpdateConversationStates(string conversationId, List<StateKeyValue> states);
void UpdateConversationStatus(string conversationId, string status);
Conversation GetConversation(string conversationId);

13
src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
View file

@ -48,7 +48,7 @@ public class ConversationStateService : IConversationStateService, IDisposable
if (_states.TryGetValue(name, out var values))
{
preValue = values.LastOrDefault()?.Data ?? string.Empty;
preValue = values?.LastOrDefault()?.Data ?? string.Empty;
}
if (!_states.ContainsKey(name) || preValue != currentValue)
@ -82,15 +82,14 @@ public class ConversationStateService : IConversationStateService, IDisposable
{
_conversationId = conversationId;
var savedStates = _db.GetConversationStates(_conversationId).ToList();
_states = new ConversationState(savedStates);
_states = _db.GetConversationStates(_conversationId);
var curStates = new Dictionary<string, string>();
if (!savedStates.IsNullOrEmpty())
if (!_states.IsNullOrEmpty())
{
foreach (var state in savedStates)
foreach (var state in _states)
{
var value = state.Values.LastOrDefault()?.Data ?? string.Empty;
var value = state.Value?.LastOrDefault()?.Data ?? string.Empty;
curStates[state.Key] = value;
_logger.LogInformation($"[STATE] {state.Key} : {value}");
}
@ -134,7 +133,7 @@ public class ConversationStateService : IConversationStateService, IDisposable
var curStates = new Dictionary<string, string>();
foreach (var state in _states)
{
curStates[state.Key] = state.Value.LastOrDefault()?.Data ?? string.Empty;
curStates[state.Key] = state.Value?.LastOrDefault()?.Data ?? string.Empty;
}
return curStates;
}

2
src/Infrastructure/BotSharp.Core/Repository/BotSharpDbContext.cs
View file

@ -152,7 +152,7 @@ public class BotSharpDbContext : Database, IBotSharpRepository
throw new NotImplementedException();
}
public List<StateKeyValue> GetConversationStates(string conversationId)
public ConversationState GetConversationStates(string conversationId)
{
throw new NotImplementedException();
}

6
src/Infrastructure/BotSharp.Core/Repository/FileRepository.cs
View file

@ -753,7 +753,7 @@ public class FileRepository : IBotSharpRepository
}
}
public List<StateKeyValue> GetConversationStates(string conversationId)
public ConversationState GetConversationStates(string conversationId)
{
var states = new List<StateKeyValue>();
var convDir = FindConversationDirectory(conversationId);
@ -763,7 +763,7 @@ public class FileRepository : IBotSharpRepository
states = CollectConversationStates(stateFile);
}
return states;
return new ConversationState(states);
}
public void UpdateConversationStates(string conversationId, List<StateKeyValue> states)
@ -821,7 +821,7 @@ public class FileRepository : IBotSharpRepository
var curStates = new Dictionary<string, string>();
states.ForEach(x =>
{
curStates[x.Key] = x.Values.LastOrDefault()?.Data ?? string.Empty;
curStates[x.Key] = x.Values?.LastOrDefault()?.Data ?? string.Empty;
});
record.States = curStates;
}

8
src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.cs
View file

@ -746,9 +746,9 @@ public class MongoRepository : IBotSharpRepository
_dc.Conversations.UpdateOne(filterConv, updateConv);
}
public List<StateKeyValue> GetConversationStates(string conversationId)
public ConversationState GetConversationStates(string conversationId)
{
var states = new List<StateKeyValue>();
var states = new ConversationState();
if (string.IsNullOrEmpty(conversationId)) return states;
var filter = Builders<ConversationStateDocument>.Filter.Eq(x => x.ConversationId, conversationId);
@ -756,7 +756,7 @@ public class MongoRepository : IBotSharpRepository
if (foundStates == null || foundStates.States.IsNullOrEmpty()) return states;
var savedStates = foundStates.States.Select(x => StateMongoElement.ToDomainElement(x)).ToList();
return savedStates;
return new ConversationState(savedStates);
}
public void UpdateConversationStates(string conversationId, List<StateKeyValue> states)
@ -806,7 +806,7 @@ public class MongoRepository : IBotSharpRepository
var curStates = new Dictionary<string, string>();
states.States.ForEach(x =>
{
curStates[x.Key] = x.Values.LastOrDefault()?.Data ?? string.Empty;
curStates[x.Key] = x.Values?.LastOrDefault()?.Data ?? string.Empty;
});
return new Conversation