Compare commits
10 Commits
10f2083590
...
37e56206d4
| Author | SHA1 | Date | |
|---|---|---|---|
|
37e56206d4 | ||
|
|
9db458d720 | ||
|
|
b9c1f794e0 | ||
|
|
5697922eca | ||
|
|
b317bfc425 | ||
|
|
0670de0abe | ||
|
|
a1694572da | ||
|
|
a56f2cb3d7 | ||
|
|
daa9699bdd | ||
|
|
169c6409dc |
@ -10,7 +10,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
|
||||
<PackageReference Include="Blueprint.Logging" Version="0.0.2" />
|
||||
<PackageReference Include="Core.Blueprint.Logging" Version="1.0.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
|
||||
|
||||
@ -21,7 +21,11 @@ namespace Core.Blueprint.DAL.API.Extensions
|
||||
services.AddScoped<CollectionRepository<SampleCollection>>();
|
||||
|
||||
//SQL
|
||||
services.AddDbContext<SqlServerContext>(options => options.UseSqlServer(configuration.GetConnectionString("SQLServer")));
|
||||
services.AddDbContext<SqlServerContext>(options =>
|
||||
options.UseSqlServer(configuration.GetConnectionString("SqlServer"),
|
||||
sqlOptions => sqlOptions.EnableRetryOnFailure())
|
||||
);
|
||||
|
||||
services.AddScoped<ISqlSampleService, SqlSampleService>();
|
||||
|
||||
//Storage
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
using Azure.Identity;
|
||||
using Core.Blueprint.DAL.API.Extensions;
|
||||
using Core.Blueprint.DAL.Mongo.Configuration;
|
||||
using Core.Blueprint.KeyVault.Configuration;
|
||||
@ -7,27 +6,26 @@ using Core.Blueprint.Redis.Configuration;
|
||||
using Core.Blueprint.SQLServer.Configuration;
|
||||
using Core.Blueprint.Storage.Configuration;
|
||||
using Microsoft.AspNetCore.HttpLogging;
|
||||
using Microsoft.Extensions.Configuration.AzureAppConfiguration;
|
||||
using System.Reflection;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
builder.Configuration.AddAzureAppConfiguration(options =>
|
||||
{
|
||||
var endpoint = builder.Configuration.GetSection("Endpoints:AppConfigurationURI").Value;
|
||||
//builder.Configuration.AddAzureAppConfiguration(options =>
|
||||
//{
|
||||
// var endpoint = builder.Configuration.GetSection("Endpoints:AppConfigurationURI").Value;
|
||||
|
||||
if (string.IsNullOrEmpty(endpoint))
|
||||
throw new ArgumentException("The app configuration is missing");
|
||||
// if (string.IsNullOrEmpty(endpoint))
|
||||
// throw new ArgumentException("The app configuration is missing");
|
||||
|
||||
options.Connect(new Uri(endpoint), new DefaultAzureCredential())
|
||||
.Select(KeyFilter.Any, "blueprint_dal");
|
||||
// options.Connect(new Uri(endpoint), new DefaultAzureCredential())
|
||||
// .Select(KeyFilter.Any, "blueprint_dal");
|
||||
|
||||
options.ConfigureKeyVault(keyVaultOptions =>
|
||||
{
|
||||
keyVaultOptions.SetCredential(new DefaultAzureCredential());
|
||||
});
|
||||
});
|
||||
// options.ConfigureKeyVault(keyVaultOptions =>
|
||||
// {
|
||||
// keyVaultOptions.SetCredential(new DefaultAzureCredential());
|
||||
// });
|
||||
//});
|
||||
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
|
||||
@ -7,5 +7,30 @@
|
||||
},
|
||||
"CacheSettings": {
|
||||
"DefaultCacheDurationInMinutes": 3
|
||||
},
|
||||
"Vault": {
|
||||
"Address": "http://100.123.31.103:8200",
|
||||
"Token": "hvs.e37LQvLuPhTd5ALS5QQ03Cwm",
|
||||
"SecretMount": "secret"
|
||||
},
|
||||
"ConnectionStrings": {
|
||||
"BlobStorage": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFeqCnf2P==;BlobEndpoint=http://100.123.31.103:10000/devstoreaccount1;QueueEndpoint=http://100.123.31.103:10001/devstoreaccount1;TableEndpoint=http://100.123.31.103:10002/devstoreaccount1;",
|
||||
"MongoDB": "mongodb://admin_agile:Admin%40agileWebs@portainer.white-enciso.pro:27017/?authMechanism=SCRAM-SHA-256",
|
||||
"SqlServer": "Server=100.123.31.103,1433;Database=Blueprint;User Id=sa;Password=Alpha-Whisky-2025;TrustServerCertificate=True;",
|
||||
"Redis": "100.123.31.103:6379"
|
||||
},
|
||||
"MongoDb": {
|
||||
"DatabaseName": "Blueprint",
|
||||
"LocalAudience": "test",
|
||||
"Audience": "test",
|
||||
},
|
||||
"BlobStorage": {
|
||||
"ContainerName": "blueprint",
|
||||
"AccountName": "devstoreaccount1",
|
||||
"AccountKey": "Eby8vdM02xNOcqFeqCnf2P=="
|
||||
},
|
||||
"ServiceSettings": {
|
||||
"ApplicationName": "blueprint",
|
||||
"LayerName": "dal"
|
||||
}
|
||||
}
|
||||
@ -7,7 +7,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Blueprint.KeyVault" Version="0.0.1" />
|
||||
<PackageReference Include="Core.Blueprint.KeyVault" Version="1.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -7,8 +7,9 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Blueprint.Mongo" Version="0.0.2" />
|
||||
<PackageReference Include="Blueprint.Redis" Version="0.0.1" />
|
||||
<PackageReference Include="Core.Blueprint.Logging" Version="1.0.0" />
|
||||
<PackageReference Include="Core.Blueprint.Mongo" Version="1.0.0" />
|
||||
<PackageReference Include="Core.Blueprint.Redis" Version="1.0.2" />
|
||||
<PackageReference Include="Mapster" Version="7.4.0" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@ -5,22 +5,21 @@ using Core.Blueprint.Mongo;
|
||||
using Core.Blueprint.Redis;
|
||||
using Core.Blueprint.Redis.Helpers;
|
||||
using Mapster;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace Core.Blueprint.DAL.Mongo.Service
|
||||
{
|
||||
public class MongoSampleService : IMongoSampleService
|
||||
{
|
||||
private readonly CollectionRepository<SampleCollection> repository;
|
||||
private readonly CacheSettings cacheSettings;
|
||||
private readonly ICacheSettings cacheSettings;
|
||||
private readonly IRedisCacheProvider cacheProvider;
|
||||
|
||||
public MongoSampleService(CollectionRepository<SampleCollection> repository,
|
||||
IRedisCacheProvider cacheProvider, IOptions<CacheSettings> cacheSettings)
|
||||
IRedisCacheProvider cacheProvider, ICacheSettings cacheSettings)
|
||||
{
|
||||
this.repository = repository;
|
||||
this.repository.CollectionInitialization();
|
||||
this.cacheSettings = cacheSettings.Value;
|
||||
this.cacheSettings = cacheSettings;
|
||||
this.cacheProvider = cacheProvider;
|
||||
}
|
||||
|
||||
@ -30,6 +29,8 @@ namespace Core.Blueprint.DAL.Mongo.Service
|
||||
|
||||
await this.repository.InsertOneAsync(sampleCollection);
|
||||
|
||||
await ResetCollectionCache();
|
||||
|
||||
return sampleCollection;
|
||||
}
|
||||
|
||||
@ -43,7 +44,7 @@ namespace Core.Blueprint.DAL.Mongo.Service
|
||||
|
||||
var sample = await this.repository.FindByIdAsync(_id);
|
||||
|
||||
await cacheProvider.SetAsync(cacheKey, sample);
|
||||
await cacheProvider.SetAsync(cacheKey, sample, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes));
|
||||
|
||||
return sample;
|
||||
}
|
||||
@ -58,7 +59,7 @@ namespace Core.Blueprint.DAL.Mongo.Service
|
||||
|
||||
var samples = await this.repository.AsQueryable();
|
||||
|
||||
await cacheProvider.SetAsync(cacheKey, samples);
|
||||
await cacheProvider.SetAsync(cacheKey, samples, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes));
|
||||
|
||||
return samples;
|
||||
}
|
||||
@ -66,15 +67,33 @@ namespace Core.Blueprint.DAL.Mongo.Service
|
||||
public async ValueTask<SampleCollection> UpdateSample(string _id, SampleCollection entity, CancellationToken cancellationToken)
|
||||
{
|
||||
await this.repository.ReplaceOneAsync(entity);
|
||||
|
||||
await ResetCollectionCache();
|
||||
|
||||
return entity;
|
||||
}
|
||||
|
||||
|
||||
public async ValueTask<SampleCollection> DeleteSample(string _id, CancellationToken cancellationToken)
|
||||
{
|
||||
var entity = await this.repository.DeleteOneAsync(doc => doc._Id == _id);
|
||||
|
||||
await ResetCollectionCache();
|
||||
|
||||
return entity;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Temporary method to "reset" collections cache
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private async Task ResetCollectionCache()
|
||||
{
|
||||
//TODO: remoge this mehtod when necessary.
|
||||
var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllSamples");
|
||||
|
||||
await cacheProvider.SetAsync(cacheKey, Enumerable.Empty<SampleCollection>(), null);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Blueprint.Redis" Version="0.0.1" />
|
||||
<PackageReference Include="Core.Blueprint.Redis" Version="1.0.2" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -7,7 +7,7 @@ namespace Core.Blueprint.DAL.SQLServer.Context
|
||||
public sealed class SqlServerContext : DbContext
|
||||
{
|
||||
public SqlServerContext(DbContextOptions<SqlServerContext> options) : base(options) { }
|
||||
public DbSet<Sample> UserProjects { get; set; }
|
||||
public DbSet<Sample> Samples { get; set; }
|
||||
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
{
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Blueprint.Redis" Version="0.0.1" />
|
||||
<PackageReference Include="Blueprint.SQLServer" Version="0.0.1" />
|
||||
<PackageReference Include="Core.Blueprint.Redis" Version="1.0.2" />
|
||||
<PackageReference Include="Core.Blueprint.SQLServer" Version="1.0.2" />
|
||||
<PackageReference Include="Mapster" Version="7.4.1-pre01" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@ -6,18 +6,17 @@ using Core.Blueprint.DAL.SQLServer.Entities.Request;
|
||||
using Core.Blueprint.Redis;
|
||||
using Core.Blueprint.Redis.Helpers;
|
||||
using Mapster;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
public class SqlSampleService : ISqlSampleService
|
||||
{
|
||||
private readonly IEntityRepository<Sample, SqlServerContext> _sqlSampleRepository;
|
||||
private readonly CacheSettings cacheSettings;
|
||||
private readonly ICacheSettings cacheSettings;
|
||||
private readonly IRedisCacheProvider cacheProvider;
|
||||
|
||||
public SqlSampleService(IEntityRepository<Sample, SqlServerContext> sqlSampleRepository, IRedisCacheProvider cacheProvider, IOptions<CacheSettings> cacheSettings)
|
||||
public SqlSampleService(IEntityRepository<Sample, SqlServerContext> sqlSampleRepository, IRedisCacheProvider cacheProvider, ICacheSettings cacheSettings)
|
||||
{
|
||||
_sqlSampleRepository = sqlSampleRepository;
|
||||
this.cacheSettings = cacheSettings.Value;
|
||||
this.cacheSettings = cacheSettings;
|
||||
this.cacheProvider = cacheProvider;
|
||||
}
|
||||
|
||||
@ -30,7 +29,7 @@ public class SqlSampleService : ISqlSampleService
|
||||
|
||||
var samples = await _sqlSampleRepository.GetAllAsync();
|
||||
|
||||
await cacheProvider.SetAsync(cacheKey, samples);
|
||||
await cacheProvider.SetAsync(cacheKey, samples, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes));
|
||||
|
||||
return samples;
|
||||
}
|
||||
@ -44,7 +43,7 @@ public class SqlSampleService : ISqlSampleService
|
||||
|
||||
var sample = await _sqlSampleRepository.GetByIdAsync(id);
|
||||
|
||||
await cacheProvider.SetAsync(cacheKey, sample);
|
||||
await cacheProvider.SetAsync(cacheKey, sample, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes));
|
||||
|
||||
return sample;
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ namespace Core.Blueprint.DAL.Storage.Contracts
|
||||
Task<IEnumerable<BlobFileAdapter>> GetBlobsListAsync(string? prefix);
|
||||
Task<Response<BlobContentInfo>> UploadBlobAsync(string blobName, Stream content);
|
||||
Task<BlobFileAdapter> UploadBlobAsync(BlobAddDto newBlob);
|
||||
BlobDownloadUriAdapter DownloadBlobAsync(string blobName);
|
||||
ValueTask<BlobDownloadUriAdapter> DownloadBlobAsync(string blobName);
|
||||
Task<BlobFileAdapter?> DeleteBlobAsync(string fileName);
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Blueprint.Storage" Version="0.0.1" />
|
||||
<PackageReference Include="Core.Blueprint.Storage" Version="1.0.1" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -27,9 +27,9 @@ namespace Core.Blueprint.DAL.Storage.Service
|
||||
return await blobStorageProvider.ListBlobsAsync(prefix);
|
||||
}
|
||||
|
||||
public BlobDownloadUriAdapter DownloadBlobAsync(string blobName)
|
||||
public async ValueTask<BlobDownloadUriAdapter> DownloadBlobAsync(string blobName)
|
||||
{
|
||||
var result = blobStorageProvider.GenerateBlobDownloadUri(blobName);
|
||||
var result = await blobStorageProvider.GenerateBlobDownloadUri(blobName);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user