test

2025-06-19 13:00:23 -06:00
16 changed files with 42 additions and 91 deletions
--- a/Core.Blueprint.DAL.API/Controllers/BlobStorageController.cs
+++ b/Core.Blueprint.DAL.API/Controllers/BlobStorageController.cs
@@ -11,6 +11,7 @@ namespace Core.Blueprint.DAL.API.Controllers
    [Produces("application/json")]
    [ApiController]
    [AllowAnonymous]
+    //test gitea
    public class BlobStorageController(IBlobStorageService storageService) : ControllerBase
    {
        [HttpPost("UploadBlobFromFileBrowser")]
--- a/Core.Blueprint.DAL.API/Core.Blueprint.DAL.API.csproj
+++ b/Core.Blueprint.DAL.API/Core.Blueprint.DAL.API.csproj
@@ -10,7 +10,7 @@

  <ItemGroup>
    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
-    <PackageReference Include="Core.Blueprint.Logging" Version="1.0.0" />
+    <PackageReference Include="Blueprint.Logging" Version="0.0.2" />
    <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" />
--- a/Core.Blueprint.DAL.API/Extensions/ConfigurationExtension.cs
+++ b/Core.Blueprint.DAL.API/Extensions/ConfigurationExtension.cs
@@ -21,11 +21,7 @@ namespace Core.Blueprint.DAL.API.Extensions
            services.AddScoped<CollectionRepository<SampleCollection>>();

            //SQL
-            services.AddDbContext<SqlServerContext>(options =>
-                options.UseSqlServer(configuration.GetConnectionString("SqlServer"),
-                    sqlOptions => sqlOptions.EnableRetryOnFailure())
-            );
-
+            services.AddDbContext<SqlServerContext>(options => options.UseSqlServer(configuration.GetConnectionString("SQLServer")));
            services.AddScoped<ISqlSampleService, SqlSampleService>();

            //Storage
--- a/Core.Blueprint.DAL.API/Program.cs
+++ b/Core.Blueprint.DAL.API/Program.cs
@@ -1,3 +1,4 @@
+using Azure.Identity;
 using Core.Blueprint.DAL.API.Extensions;
 using Core.Blueprint.DAL.Mongo.Configuration;
 using Core.Blueprint.KeyVault.Configuration;
@@ -6,6 +7,7 @@ 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;

@@ -39,9 +41,9 @@ builder.Services.AddMemoryCache();
 builder.Services.AddLogs(builder);
 builder.Services.AddKeyVault(builder.Configuration);
 builder.Services.AddBlobStorage(builder.Configuration);
-builder.Services.AddRedis(builder.Configuration);
-builder.Services.AddMongoLayer(builder.Configuration);
-builder.Services.AddSQLServer(builder.Configuration);
+//builder.Services.AddRedis(builder.Configuration);
+//builder.Services.AddMongoLayer(builder.Configuration);
+//builder.Services.AddSQLServer(builder.Configuration);
 builder.Services.AddDALLayerServices(builder.Configuration);

 builder.Host.ConfigureServices((context, services) =>
--- a/Core.Blueprint.DAL.API/appsettings.Local.json
+++ b/Core.Blueprint.DAL.API/appsettings.Local.json
@@ -9,25 +9,17 @@
    "DefaultCacheDurationInMinutes": 3
  },
  "Vault": {
-    "Address": "https://vault.dream-views.com/:8200",
-    "Token": "hvs.TGz6P3AsKpYuODMrs11Msiza",
-    "SecretMount": "thalos"
+    "Address": "http://localhost:8200",
+    "Token": "hvs.kDZnAfrvfcMNrom6RmlEhZ7I",
+    "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": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;"
  },
  "BlobStorage": {
    "ContainerName": "blueprint",
    "AccountName": "devstoreaccount1",
-    "AccountKey": "Eby8vdM02xNOcqFeqCnf2P=="
+    "AccountKey": "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
  },
  "ServiceSettings": {
    "ApplicationName": "blueprint",
--- a/Core.Blueprint.DAL.KeyVault/Contracts/IKeyVaultService.cs
+++ b/Core.Blueprint.DAL.KeyVault/Contracts/IKeyVaultService.cs
@@ -4,16 +4,9 @@ namespace Core.Blueprint.DAL.KeyVault.Contracts
 {
    public interface IKeyVaultService
    {
-        Task<KeyVaultResponse> CreateSecretAsync(
-            KeyVaultRequest secret, CancellationToken cancellationToken);
-
-        Task<(KeyVaultResponse Secret, string? Message)> GetSecretAsync(
-            string secret, CancellationToken cancellationToken);
-
-        Task<(string Message, bool Deleted)> DeleteSecretAsync(
-            string secretName, CancellationToken cancellationToken);
-
-        Task<(KeyVaultResponse Secret, string? Message)> UpdateSecretAsync(
-            KeyVaultRequest secretName, CancellationToken cancellationToken);
+        Task<KeyVaultResponse> CreateSecretAsync(KeyVaultRequest secret, CancellationToken cancellationToken);
+        Task<Tuple<KeyVaultResponse, string?>> GetSecretAsync(string secret, CancellationToken cancellationToken);
+        Task<Tuple<string, bool>> DeleteSecretAsync(string secretName, CancellationToken cancellationToken);
+        Task<Tuple<KeyVaultResponse, string>> UpdateSecretAsync(KeyVaultRequest secretName, CancellationToken cancellationToken);
    }
 }
--- a/Core.Blueprint.DAL.KeyVault/Core.Blueprint.DAL.KeyVault.csproj
+++ b/Core.Blueprint.DAL.KeyVault/Core.Blueprint.DAL.KeyVault.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Core.Blueprint.KeyVault" Version="1.0.0" />
+    <PackageReference Include="Blueprint.KeyVault" Version="0.0.3" />
  </ItemGroup>

 </Project>
--- a/Core.Blueprint.DAL.KeyVault/Services/KeyVaultService.cs
+++ b/Core.Blueprint.DAL.KeyVault/Services/KeyVaultService.cs
@@ -5,29 +5,24 @@ namespace Core.Blueprint.DAL.KeyVault.Services
 {
    public class KeyVaultService(IKeyVaultProvider keyVaultProvider) : IKeyVaultService
    {
-        public async Task<KeyVaultResponse> CreateSecretAsync(
-            KeyVaultRequest newSecret, CancellationToken cancellationToken)
+        public async Task<KeyVaultResponse> CreateSecretAsync(KeyVaultRequest newSecret, CancellationToken cancellationToken)
        {
            var result = await keyVaultProvider.CreateSecretAsync(newSecret, cancellationToken);
            return result;
        }
-
-        public async Task<(KeyVaultResponse Secret, string? Message)> GetSecretAsync(
-            string secretName, CancellationToken cancellationToken)
+        public async Task<Tuple<KeyVaultResponse, string?>> GetSecretAsync(string secretName, CancellationToken cancellationToken)
        {
-            var result = await keyVaultProvider.GetSecretAsync(secretName, cancellationToken);
+            var result = await keyVaultProvider.GetSecretAsync(secretName, cancellationToken: cancellationToken);
            return result;
        }

-        public async Task<(KeyVaultResponse Secret, string? Message)> UpdateSecretAsync(
-            KeyVaultRequest newSecret, CancellationToken cancellationToken)
+        public async Task<Tuple<KeyVaultResponse, string>> UpdateSecretAsync(KeyVaultRequest newSecret, CancellationToken cancellationToken)
        {
            var result = await keyVaultProvider.UpdateSecretAsync(newSecret, cancellationToken);
            return result;
        }

-        public async Task<(string Message, bool Deleted)> DeleteSecretAsync(
-            string secretName, CancellationToken cancellationToken)
+        public async Task<Tuple<string, bool>> DeleteSecretAsync(string secretName, CancellationToken cancellationToken)
        {
            var result = await keyVaultProvider.DeleteSecretAsync(secretName, cancellationToken);
            return result;
--- a/Core.Blueprint.DAL.Mongo/Core.Blueprint.DAL.Mongo.csproj
+++ b/Core.Blueprint.DAL.Mongo/Core.Blueprint.DAL.Mongo.csproj
@@ -7,9 +7,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <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.0" />
+    <PackageReference Include="Blueprint.Mongo" Version="0.0.3" />
+    <PackageReference Include="Blueprint.Redis" Version="0.0.1" />
    <PackageReference Include="Mapster" Version="7.4.0" />
  </ItemGroup>

--- a/Core.Blueprint.DAL.Mongo/Service/MongoSampleService.cs
+++ b/Core.Blueprint.DAL.Mongo/Service/MongoSampleService.cs
@@ -5,21 +5,22 @@ 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 ICacheSettings cacheSettings;
+        private readonly CacheSettings cacheSettings;
        private readonly IRedisCacheProvider cacheProvider;

        public MongoSampleService(CollectionRepository<SampleCollection> repository,
-        IRedisCacheProvider cacheProvider, ICacheSettings cacheSettings)
+        IRedisCacheProvider cacheProvider, IOptions<CacheSettings> cacheSettings)
        {
            this.repository = repository;
            this.repository.CollectionInitialization();
-            this.cacheSettings = cacheSettings;
+            this.cacheSettings = cacheSettings.Value;
            this.cacheProvider = cacheProvider;
        }

@@ -29,8 +30,6 @@ namespace Core.Blueprint.DAL.Mongo.Service

            await this.repository.InsertOneAsync(sampleCollection);

-            await ResetCollectionCache();
-
            return sampleCollection;
        }

@@ -44,7 +43,7 @@ namespace Core.Blueprint.DAL.Mongo.Service

            var sample = await this.repository.FindByIdAsync(_id);

-            await cacheProvider.SetAsync(cacheKey, sample, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes));
+            await cacheProvider.SetAsync(cacheKey, sample);

            return sample;
        }
@@ -59,7 +58,7 @@ namespace Core.Blueprint.DAL.Mongo.Service

            var samples = await this.repository.AsQueryable();

-            await cacheProvider.SetAsync(cacheKey, samples, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes));
+            await cacheProvider.SetAsync(cacheKey, samples);

            return samples;
        }
@@ -68,32 +67,14 @@ namespace Core.Blueprint.DAL.Mongo.Service
        {
            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);
-        }
-
    }
 }
--- a/Core.Blueprint.DAL.Redis/Core.Blueprint.DAL.Redis.csproj
+++ b/Core.Blueprint.DAL.Redis/Core.Blueprint.DAL.Redis.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Core.Blueprint.Redis" Version="1.0.0" />
+    <PackageReference Include="Blueprint.Redis" Version="0.0.1" />
  </ItemGroup>

 </Project>
--- a/Core.Blueprint.DAL.SQLServer/Context/SqlServerContext.cs
+++ b/Core.Blueprint.DAL.SQLServer/Context/SqlServerContext.cs
@@ -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> Samples { get; set; }
+        public DbSet<Sample> UserProjects { get; set; }

        protected override void OnModelCreating(ModelBuilder modelBuilder)
        {
--- a/Core.Blueprint.DAL.SQLServer/Core.Blueprint.DAL.SQLServer.csproj
+++ b/Core.Blueprint.DAL.SQLServer/Core.Blueprint.DAL.SQLServer.csproj
@@ -7,8 +7,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Core.Blueprint.Redis" Version="1.0.0" />
-    <PackageReference Include="Core.Blueprint.SQLServer" Version="1.0.0" />
+    <PackageReference Include="Blueprint.Redis" Version="0.0.1" />
+    <PackageReference Include="Blueprint.SQLServer" Version="0.0.1" />
    <PackageReference Include="Mapster" Version="7.4.1-pre01" />
  </ItemGroup>

--- a/Core.Blueprint.DAL.SQLServer/Services/SqlSampleService.cs
+++ b/Core.Blueprint.DAL.SQLServer/Services/SqlSampleService.cs
@@ -6,17 +6,18 @@ 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 ICacheSettings cacheSettings;
+    private readonly CacheSettings cacheSettings;
    private readonly IRedisCacheProvider cacheProvider;

-    public SqlSampleService(IEntityRepository<Sample, SqlServerContext> sqlSampleRepository, IRedisCacheProvider cacheProvider, ICacheSettings cacheSettings)
+    public SqlSampleService(IEntityRepository<Sample, SqlServerContext> sqlSampleRepository, IRedisCacheProvider cacheProvider, IOptions<CacheSettings> cacheSettings)
    {
        _sqlSampleRepository = sqlSampleRepository;
-        this.cacheSettings = cacheSettings;
+        this.cacheSettings = cacheSettings.Value;
        this.cacheProvider = cacheProvider;
    }

@@ -29,7 +30,7 @@ public class SqlSampleService : ISqlSampleService

        var samples = await _sqlSampleRepository.GetAllAsync();

-        await cacheProvider.SetAsync(cacheKey, samples, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes));
+        await cacheProvider.SetAsync(cacheKey, samples);

        return samples;
    }
@@ -43,7 +44,7 @@ public class SqlSampleService : ISqlSampleService

        var sample = await _sqlSampleRepository.GetByIdAsync(id);

-        await cacheProvider.SetAsync(cacheKey, sample, TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes));
+        await cacheProvider.SetAsync(cacheKey, sample);

        return sample;
    }
--- a/Core.Blueprint.DAL.Storage/Core.Blueprint.DAL.Storage.csproj
+++ b/Core.Blueprint.DAL.Storage/Core.Blueprint.DAL.Storage.csproj
@@ -11,7 +11,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Core.Blueprint.Storage" Version="1.0.0" />
+    <PackageReference Include="Blueprint.Storage" Version="0.0.3" />
  </ItemGroup>

 </Project>
--- a/nuget.config
+++ b/nuget.config
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <!-- Tu BaGet primero -->
-    <add key="BaGet" value="https://nuget.dream-views.com/v3/index.json" protocolVersion="3" />
-    <!-- NuGet oficial como fallback (si quieres) -->
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-</configuration>