Skip to content

add repository enum #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ public class ElementButton

[JsonPropertyName("is_secondary")]
public bool IsSecondary { get; set; }

[JsonPropertyName("post_action_disclaimer")]
public string? PostActionDisclaimer { get; set; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace BotSharp.Abstraction.Repositories.Enums;

public static class RepositoryEnum
{
public const string FileRepository = nameof(FileRepository);
public const string MongoRepository = nameof(MongoRepository);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using BotSharp.Abstraction.Repositories.Enums;
using System.IO;

namespace BotSharp.Core.Agents.Services;
Expand All @@ -6,12 +7,19 @@ public partial class AgentService
{
public async Task<string> RefreshAgents()
{
string refreshResult;
var dbSettings = _services.GetRequiredService<BotSharpDatabaseSettings>();
if (dbSettings.Default == RepositoryEnum.FileRepository)
{
refreshResult = $"Invalid database repository setting: {dbSettings.Default}";
_logger.LogWarning(refreshResult);
return refreshResult;
}

var agentDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory,
dbSettings.FileRepository,
_agentSettings.DataDir);

string refreshResult;
if (!Directory.Exists(agentDir))
{
refreshResult = $"Cannot find the directory: {agentDir}";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using BotSharp.Abstraction.Agents.Models;
using BotSharp.Abstraction.Functions.Models;
using BotSharp.Abstraction.Repositories;
using BotSharp.Abstraction.Repositories.Enums;
using BotSharp.Abstraction.Routing.Models;
using System.IO;

Expand Down Expand Up @@ -42,6 +43,16 @@ public async Task UpdateAgent(Agent agent, AgentField updateField)
public async Task<string> UpdateAgentFromFile(string id)
{
string updateResult;
var dbSettings = _services.GetRequiredService<BotSharpDatabaseSettings>();
var agentSettings = _services.GetRequiredService<AgentSettings>();

if (dbSettings.Default == RepositoryEnum.FileRepository)
{
updateResult = $"Invalid database repository setting: {dbSettings.Default}";
_logger.LogWarning(updateResult);
return updateResult;
}

var agent = _db.GetAgent(id);
if (agent == null)
{
Expand All @@ -50,8 +61,6 @@ public async Task<string> UpdateAgentFromFile(string id)
return updateResult;
}

var dbSettings = _services.GetRequiredService<BotSharpDatabaseSettings>();
var agentSettings = _services.GetRequiredService<AgentSettings>();
var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory,
dbSettings.FileRepository,
agentSettings.DataDir);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using BotSharp.Abstraction.Repositories.Enums;
using BotSharp.Abstraction.Settings;
using Microsoft.Extensions.Configuration;

Expand Down Expand Up @@ -32,7 +33,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)

var myDatabaseSettings = new BotSharpDatabaseSettings();
config.Bind("Database", myDatabaseSettings);
if (myDatabaseSettings.Default == "FileRepository")
if (myDatabaseSettings.Default == RepositoryEnum.FileRepository)
{
services.AddScoped<IBotSharpRepository, FileRepository>();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using BotSharp.Abstraction.Plugins.Models;
using BotSharp.Abstraction.Repositories.Enums;
using BotSharp.Plugin.MongoStorage.Repository;

namespace BotSharp.Plugin.MongoStorage;
Expand All @@ -18,7 +19,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
var dbSettings = new BotSharpDatabaseSettings();
config.Bind("Database", dbSettings);

if (dbSettings.Default == "MongoRepository")
if (dbSettings.Default == RepositoryEnum.MongoRepository)
{
services.AddScoped((IServiceProvider x) =>
{
Expand Down