Newsbot.Collector.Api/Controllers/AccountController.cs

@@ -1,89 +0,0 @@
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Newsbot.Collector.Api.Domain.Requests;
-using Newsbot.Collector.Api.Domain.Response;
-using Newsbot.Collector.Api.Services;
-using Newsbot.Collector.Domain.Dto;
-using Newsbot.Collector.Domain.Entities;
-
-namespace Newsbot.Collector.Api.Controllers;
-
-[ApiController]
-[Route("/api/account")]
-public class AccountController : ControllerBase
-{
-    private IIdentityService _identityService;
-
-    public AccountController(IIdentityService identityService)
-    {
-        _identityService = identityService;
-    }
-
-    [HttpPost("register")]
-    public IActionResult Register([FromBody] RegisterUserRequest user)
-    {
-        if (!ModelState.IsValid)
-        {
-            return new BadRequestObjectResult(new AuthFailedResponse
-            {
-                Errors = ModelState.Values
-                    .Select(x => x.Errors
-                        .Select(y => y.ErrorMessage).FirstOrDefault())
-            });
-        }
-        
-        if (user.Email is null)
-        {
-            return new BadRequestResult();
-        }
-
-        if (user.Password is null)
-        {
-            return new BadRequestResult();
-        }
-
-        var response = _identityService.Register(user.Email, user.Password);
-
-        if (!response.IsSuccessful)
-        {
-            return new BadRequestObjectResult( new AuthFailedResponse
-            {
-                Errors = response.ErrorMessage
-            });
-        }
-
-        return new OkObjectResult(new AuthSuccessfulResponse
-        {
-            Token = response.Token
-        });
-    }
-
-    [HttpPost("login")]
-    public IActionResult Login([FromBody] UserLoginRequest request)
-    {
-        if (request.Email is null)
-        {
-            return new BadRequestResult();
-        }
-
-        if (request.Password is null)
-        {
-            return new BadRequestResult();
-        }
-
-        var response = _identityService.Login(request.Email, request.Password);
-
-        if (!response.IsSuccessful)
-        {
-            return new BadRequestObjectResult( new AuthFailedResponse
-            {
-                Errors = response.ErrorMessage
-            });
-        }
-
-        return new OkObjectResult(new AuthSuccessfulResponse
-        {
-            Token = response.Token
-        });
-    }
-}

Newsbot.Collector.Api/Controllers/ArticlesController.cs

@@ -1,7 +1,6 @@
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
+using Newsbot.Collector.Database.Repositories;
 using Newsbot.Collector.Domain.Dto;
 using Newsbot.Collector.Domain.Interfaces;
 using Newsbot.Collector.Domain.Models;
@@ -10,18 +9,17 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/articles")]
-[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class ArticlesController : ControllerBase
 {
-    private readonly ILogger<ArticlesController> _logger;
     private readonly IArticlesRepository _articles;
+    private readonly ILogger<ArticlesController> _logger;
     private readonly ISourcesRepository _sources;
 
-    public ArticlesController(ILogger<ArticlesController> logger, IArticlesRepository articles, ISourcesRepository sources)
+    public ArticlesController(ILogger<ArticlesController> logger, IOptions<ConnectionStrings> settings)
     {
         _logger = logger;
-        _articles = articles;
-        _sources = sources;
+        _articles = new ArticlesTable(settings.Value.Database);
+        _sources = new SourcesTable(settings.Value.Database);
     }
 
     [HttpGet(Name = "GetArticles")]

Newsbot.Collector.Api/Controllers/CodeProjectController.cs

@@ -1,6 +1,4 @@
 using Hangfire;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Domain.Models.Config;
@@ -10,7 +8,6 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/codeprojects")]
-[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class CodeProjectController
 {
     private readonly ConfigSectionConnectionStrings _connectionStrings;

Newsbot.Collector.Api/Controllers/DiscordNotificationController.cs

@@ -1,130 +0,0 @@
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Newsbot.Collector.Domain.Dto;
-using Newsbot.Collector.Domain.Entities;
-using Newsbot.Collector.Domain.Interfaces;
-
-namespace Newsbot.Collector.Api.Controllers;
-
-[ApiController]
-[Route("api/subscriptions")]
-[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
-public class DiscordNotificationController : ControllerBase
-{
-    private readonly ILogger<DiscordNotificationController> _logger;
-    private readonly IDiscordWebHooksRepository _discord;
-    private readonly ISourcesRepository _sources;
-    private readonly IDiscordNotificationRepository _discordNotification;
-
-    public DiscordNotificationController(ILogger<DiscordNotificationController> logger, IDiscordWebHooksRepository discord, ISourcesRepository sources, IDiscordNotificationRepository discordNotification)
-    {
-        _logger = logger;
-        _discord = discord;
-        _sources = sources;
-        _discordNotification = discordNotification;
-    }
-
-    [HttpGet(Name = "ListSubscriptions")]
-    public IEnumerable<DiscordNotificationDto> List(int page)
-    {
-        var res = new List<DiscordNotificationDto>();
-        var items = _discordNotification.List(page);
-        foreach (var item in items) res.Add(DiscordNotificationDto.Convert(item));
-        return res;
-    }
-
-    [HttpGet("{id}")]
-    public DiscordNotificationDto GetById(Guid id)
-    {
-        return DiscordNotificationDto.Convert(_discordNotification.GetById(id));
-    }
-
-    [HttpGet("{id}/details")]
-    public DiscordNotificationDetailsDto GetDetailsById(Guid id)
-    {
-        var sub = _discordNotification.GetById(id);
-        var webhook = _discord.GetById(sub.DiscordWebHookId);
-        var source = _sources.GetById(sub.SourceId);
-
-        return DiscordNotificationDetailsDto.Convert(sub, source, webhook);
-    }
-
-    [HttpPost("{id}/delete")]
-    public void DeleteById(Guid id)
-    {
-        _discordNotification.Delete(id);
-    }
-
-    [HttpGet("by/discordId/{id}")]
-    public IEnumerable<DiscordNotificationDto> GetByDiscordId(Guid id)
-    {
-        var res = new List<DiscordNotificationDto>();
-        var items = _discordNotification.ListByWebhook(id);
-        foreach (var item in items) res.Add(DiscordNotificationDto.Convert(item));
-        return res;
-    }
-
-    [HttpGet("by/sourceId/{id}")]
-    public IEnumerable<DiscordNotificationDto> GetBySourceId(Guid id)
-    {
-        var res = new List<DiscordNotificationDto>();
-        var items = _discordNotification.ListBySourceId(id);
-        foreach (var item in items) res.Add(DiscordNotificationDto.Convert(item));
-        return res;
-    }
-
-    [HttpPost(Name = "New Subscription")]
-    public ActionResult<DiscordNotificationDto> New(Guid sourceId, Guid discordId)
-    {
-        if (sourceId == Guid.Empty) return new BadRequestResult();
-        if (discordId == Guid.Empty) return new BadRequestResult();
-
-        var exists = _discordNotification.GetByWebhookAndSource(discordId, sourceId);
-        if (exists.Id != Guid.Empty) return DiscordNotificationDto.Convert(exists);
-
-        var discord = _discord.GetById(discordId);
-        if (discord.Id == Guid.Empty) return new BadRequestResult();
-
-        var source = _sources.GetById(sourceId);
-        if (source.Id == Guid.Empty) return new BadRequestResult();
-
-        var item = _discordNotification.New(new DiscordNotificationEntity
-        {
-            Id = Guid.NewGuid(),
-            SourceId = sourceId,
-            DiscordWebHookId = discordId,
-            CodeAllowCommits = false,
-            CodeAllowReleases = false
-        });
-
-        return DiscordNotificationDto.Convert(item);
-    }
-
-    [HttpPost("new/codeproject")]
-    public ActionResult<DiscordNotificationDto> NewCodeProjectSubscription(Guid sourceId, Guid discordId, bool allowReleases,
-        bool allowCommits)
-    {
-        if (sourceId == Guid.Empty) return new BadRequestResult();
-        if (discordId == Guid.Empty) return new BadRequestResult();
-
-        var exists = _discordNotification.GetByWebhookAndSource(discordId, sourceId);
-        if (exists.Id != Guid.Empty) return DiscordNotificationDto.Convert(exists);
-
-        var discord = _discord.GetById(discordId);
-        if (discord.Id == Guid.Empty) return new BadRequestResult();
-
-        var source = _sources.GetById(sourceId);
-        if (source.Id == Guid.Empty) return new BadRequestResult();
-
-        var sub = _discordNotification.New(new DiscordNotificationEntity
-        {
-            DiscordWebHookId = discordId,
-            SourceId = sourceId,
-            CodeAllowCommits = allowCommits,
-            CodeAllowReleases = allowReleases
-        });
-
-        return new DiscordNotificationDto();
-    }
-}

Newsbot.Collector.Api/Controllers/DiscordWebHooksController.cs

@@ -1,6 +1,4 @@
 using System.Net;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Database.Repositories;
@@ -13,16 +11,17 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/discord/webhooks")]
-[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class DiscordWebHookController : ControllerBase
 {
     private readonly ILogger<DiscordWebHookController> _logger;
+    private readonly ConnectionStrings _settings;
     private readonly IDiscordWebHooksRepository _webhooks;
 
-    public DiscordWebHookController(ILogger<DiscordWebHookController> logger, IOptions<ConnectionStrings> settings, IDiscordWebHooksRepository webhooks)
+    public DiscordWebHookController(ILogger<DiscordWebHookController> logger, IOptions<ConnectionStrings> settings)
     {
         _logger = logger;
-        _webhooks = webhooks;
+        _settings = settings.Value;
+        _webhooks = new DiscordWebhooksTable(_settings.Database);
     }
 
     [HttpGet(Name = "GetDiscordWebhooks")]

Newsbot.Collector.Api/Controllers/RssController.cs

@@ -1,17 +1,13 @@
 using Hangfire;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Domain.Models.Config;
-using Newsbot.Collector.Domain.Models.Config.Sources;
 using Newsbot.Collector.Services.Jobs;
 
 namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/rss")]
-[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class RssController
 {
     private readonly ConfigSectionConnectionStrings _connectionStrings;

Newsbot.Collector.Api/Controllers/SourcesController.cs

@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Database.Repositories;
@@ -14,18 +12,22 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/sources")]
-[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class SourcesController : ControllerBase
 {
-    private readonly ILogger<SourcesController> _logger;
+    private readonly IArticlesRepository _articles;
+
+    //private readonly ConnectionStrings _settings;
     private readonly IIconsRepository _icons;
+    private readonly ILogger<SourcesController> _logger;
     private readonly ISourcesRepository _sources;
 
-    public SourcesController(ILogger<SourcesController> logger, IIconsRepository icons, ISourcesRepository sources)
+    public SourcesController(ILogger<SourcesController> logger, IOptions<ConnectionStrings> settings)
     {
         _logger = logger;
-        _icons = icons;
-        _sources = sources;
+        //_settings = settings.Value;
+        _sources = new SourcesTable(settings.Value.Database);
+        _icons = new IconsTable(settings.Value.Database);
+        _articles = new ArticlesTable(settings.Value.Database);
     }
 
     [HttpGet(Name = "GetSources")]

Newsbot.Collector.Api/Controllers/SubscriptionsController.cs

@@ -0,0 +1,130 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Newsbot.Collector.Database.Repositories;
+using Newsbot.Collector.Domain.Dto;
+using Newsbot.Collector.Domain.Entities;
+using Newsbot.Collector.Domain.Interfaces;
+using Newsbot.Collector.Domain.Models;
+
+namespace Newsbot.Collector.Api.Controllers;
+
+[ApiController]
+[Route("api/subscriptions")]
+public class SubscriptionsController : ControllerBase
+{
+    private readonly IDiscordWebHooksRepository _discord;
+    private readonly ILogger<SubscriptionsController> _logger;
+    private readonly ISourcesRepository _sources;
+    private readonly ISubscriptionRepository _subscription;
+
+    public SubscriptionsController(ILogger<SubscriptionsController> logger, IOptions<ConnectionStrings> settings)
+    {
+        _logger = logger;
+        _subscription = new SubscriptionsTable(settings.Value.Database);
+        _discord = new DiscordWebhooksTable(settings.Value.Database);
+        _sources = new SourcesTable(settings.Value.Database);
+    }
+
+    [HttpGet(Name = "ListSubscriptions")]
+    public IEnumerable<SubscriptionDto> List(int page)
+    {
+        var res = new List<SubscriptionDto>();
+        var items = _subscription.List(page);
+        foreach (var item in items) res.Add(SubscriptionDto.Convert(item));
+        return res;
+    }
+
+    [HttpGet("{id}")]
+    public SubscriptionDto GetById(Guid id)
+    {
+        return SubscriptionDto.Convert(_subscription.GetById(id));
+    }
+
+    [HttpGet("{id}/details")]
+    public SubscriptionDetailsDto GetDetailsById(Guid id)
+    {
+        var sub = _subscription.GetById(id);
+        var webhook = _discord.GetById(sub.DiscordWebHookId);
+        var source = _sources.GetById(sub.SourceId);
+
+        return SubscriptionDetailsDto.Convert(sub, source, webhook);
+    }
+
+    [HttpPost("{id}/delete")]
+    public void DeleteById(Guid id)
+    {
+        _subscription.Delete(id);
+    }
+
+    [HttpGet("by/discordid/{id}")]
+    public IEnumerable<SubscriptionDto> GetByDiscordId(Guid id)
+    {
+        var res = new List<SubscriptionDto>();
+        var items = _subscription.ListByWebhook(id);
+        foreach (var item in items) res.Add(SubscriptionDto.Convert(item));
+        return res;
+    }
+
+    [HttpGet("by/sourceId/{id}")]
+    public IEnumerable<SubscriptionDto> GetBySourceId(Guid id)
+    {
+        var res = new List<SubscriptionDto>();
+        var items = _subscription.ListBySourceId(id);
+        foreach (var item in items) res.Add(SubscriptionDto.Convert(item));
+        return res;
+    }
+
+    [HttpPost(Name = "New Subscription")]
+    public ActionResult<SubscriptionDto> New(Guid sourceId, Guid discordId)
+    {
+        if (sourceId == Guid.Empty) return new BadRequestResult();
+        if (discordId == Guid.Empty) return new BadRequestResult();
+
+        var exists = _subscription.GetByWebhookAndSource(discordId, sourceId);
+        if (exists.Id != Guid.Empty) return SubscriptionDto.Convert(exists);
+
+        var discord = _discord.GetById(discordId);
+        if (discord.Id == Guid.Empty) return new BadRequestResult();
+
+        var source = _sources.GetById(sourceId);
+        if (source.Id == Guid.Empty) return new BadRequestResult();
+
+        var item = _subscription.New(new SubscriptionEntity
+        {
+            Id = Guid.NewGuid(),
+            SourceId = sourceId,
+            DiscordWebHookId = discordId,
+            CodeAllowCommits = false,
+            CodeAllowReleases = false
+        });
+
+        return SubscriptionDto.Convert(item);
+    }
+
+    [HttpPost("new/codeproject")]
+    public ActionResult<SubscriptionDto> NewCodeProjectSubscription(Guid sourceId, Guid discordId, bool allowReleases,
+        bool allowCommits)
+    {
+        if (sourceId == Guid.Empty) return new BadRequestResult();
+        if (discordId == Guid.Empty) return new BadRequestResult();
+
+        var exists = _subscription.GetByWebhookAndSource(discordId, sourceId);
+        if (exists.Id != Guid.Empty) return SubscriptionDto.Convert(exists);
+
+        var discord = _discord.GetById(discordId);
+        if (discord.Id == Guid.Empty) return new BadRequestResult();
+
+        var source = _sources.GetById(sourceId);
+        if (source.Id == Guid.Empty) return new BadRequestResult();
+
+        var sub = _subscription.New(new SubscriptionEntity
+        {
+            DiscordWebHookId = discordId,
+            SourceId = sourceId,
+            CodeAllowCommits = allowCommits,
+            CodeAllowReleases = allowReleases
+        });
+
+        return new SubscriptionDto();
+    }
+}

Newsbot.Collector.Api/Controllers/YoutubeController.cs

@@ -1,10 +1,7 @@
 using Hangfire;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Domain.Models.Config;
-using Newsbot.Collector.Domain.Models.Config.Sources;
 using Newsbot.Collector.Services.Jobs;
 using ILogger = Grpc.Core.Logging.ILogger;
 
@@ -12,7 +9,6 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/youtube")]
-[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class YoutubeController
 {
     private readonly ILogger<YoutubeController> _logger;

Newsbot.Collector.Api/Controllers/v1/UserController.cs

@@ -1,45 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Newsbot.Collector.Api.Authentication;
-using Newsbot.Collector.Domain.Entities;
-using Newsbot.Collector.Domain.Interfaces;
-
-namespace Newsbot.Collector.Api.Controllers;
-
-[ApiController]
-[Route("api/v1/user")]
-public class UserController : Controller
-{
-    private ILogger<UserController> _logger;
-    private IUserSourceSubscription _subscription;
-
-    public UserController(ILogger<UserController> logger, IUserSourceSubscription subscription)
-    {
-        _logger = logger;
-        _subscription = subscription;
-    }
-    
-    [HttpPost("listSubscriptions")]
-    public ActionResult ListSubscriptions()
-    {
-        _logger.LogInformation("'/api/v1/user/listSubscriptions' was requested");
-        
-        var userId = HttpContext.GetUserId();
-        if (userId.Equals(string.Empty))
-        {
-            _logger.LogWarning("Unable to find the user ID in the JWD Token");
-            return new BadRequestResult();
-        }
-        
-        try
-        {
-            var results = _subscription.ListUserSubscriptions(Guid.Parse(userId));
-            return new OkObjectResult(results);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Failed to pull subscriptions for userId \'{UserId}\'", userId);
-            return new NoContentResult();
-        }
-        
-    }
-}

Newsbot.Collector.Api/Domain/Requests/RegisterUserRequest.cs

@@ -1,12 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Newsbot.Collector.Api.Domain.Requests;
-
-public class RegisterUserRequest
-{
-    //public string? Name { get; set; }
-    [EmailAddress]
-    public string? Email { get; set; }
-    public string? Password { get; set; }
-    
-}

Newsbot.Collector.Api/Domain/Requests/UserLoginRequest.cs

@@ -1,10 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Newsbot.Collector.Api.Domain.Requests;
-
-public class UserLoginRequest
-{
-    [EmailAddress]
-    public string? Email { get; set; }
-    public string? Password { get; set; }
-}

Newsbot.Collector.Api/Domain/Response/AuthFailedResponse.cs

@@ -1,6 +0,0 @@
-namespace Newsbot.Collector.Api.Domain.Response;
-
-public class AuthFailedResponse
-{
-    public IEnumerable<string?>? Errors { get; set; }
-}

Newsbot.Collector.Api/Domain/Response/AuthSuccessfulResponse.cs

@@ -1,8 +0,0 @@
-namespace Newsbot.Collector.Api.Domain.Response;
-
-public class AuthSuccessfulResponse
-{
-    // might want to validate the user before we return the token
-    
-    public string? Token { get; set; }
-}

Newsbot.Collector.Api/Domain/Results/AuthenticationResult.cs

@@ -1,11 +0,0 @@
-using System.Collections;
-
-namespace Newsbot.Collector.Api.Domain.Results;
-
-public class AuthenticationResult
-{
-    public string? Token { get; set; }
-    
-    public bool IsSuccessful { get; set; }
-    public IEnumerable<string>? ErrorMessage { get; set; }
-}

Newsbot.Collector.Api/Middleware/JwtUserIdExtension.cs

@@ -1,14 +0,0 @@
-namespace Newsbot.Collector.Api.Authentication;
-
-public static class JwtUserIdExtension
-{
-    public static string GetUserId(this HttpContext context)
-    {
-        if (context.User == null)
-        {
-            return string.Empty;
-        }
-
-        return context.User.Claims.Single(x => x.Type == "id").Value;
-    }
-}

Newsbot.Collector.Api/Newsbot.Collector.Api.csproj

@@ -13,7 +13,6 @@
         <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
         <PackageReference Include="Hangfire.AspNetCore" Version="1.7.33" />
         <PackageReference Include="Hangfire.MemoryStorage" Version="1.7.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.8" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">

Newsbot.Collector.Api/Program.cs

@@ -1,24 +1,14 @@
-using System.Text;
 using Hangfire;
 using Hangfire.MemoryStorage;
 using HealthChecks.UI.Client;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
 using Newsbot.Collector.Api;
 using Newsbot.Collector.Api.Authentication;
-using Newsbot.Collector.Api.Services;
 using Newsbot.Collector.Database;
-using Newsbot.Collector.Database.Repositories;
 using Newsbot.Collector.Domain.Consts;
-using Newsbot.Collector.Domain.Entities;
-using Newsbot.Collector.Domain.Interfaces;
 using Newsbot.Collector.Domain.Models;
 using Newsbot.Collector.Domain.Models.Config;
-using Newsbot.Collector.Domain.Models.Config.Sources;
 using Serilog;
 using Serilog.Events;
 using ILogger = Serilog.ILogger;
@@ -33,77 +23,30 @@ var config = GetConfiguration();
 builder.Configuration.AddConfiguration(config);
 
 Log.Logger = GetLogger(config);
+
 Log.Information("Starting up");
-
-// configure Entity Framework
-var dbconn = config.GetConnectionString("Database");
-builder.Services.AddDbContext<DatabaseContext>(o => o.UseNpgsql(dbconn ?? ""));
-
-builder.Services.AddIdentity<IdentityUser, IdentityRole>()
-    .AddRoles<IdentityRole>()
-    .AddEntityFrameworkStores<DatabaseContext>();
-
-builder.Services.AddScoped<IArticlesRepository, ArticlesTable>();
-builder.Services.AddScoped<IDiscordQueueRepository, DiscordQueueTable>();
-builder.Services.AddScoped<IDiscordWebHooksRepository, DiscordWebhooksTable>();
-builder.Services.AddScoped<IIconsRepository, IconsTable>();
-builder.Services.AddScoped<ISourcesRepository, SourcesTable>();
-builder.Services.AddScoped<IDiscordNotificationRepository, DiscordNotificationTable>();
-builder.Services.AddScoped<IUserSourceSubscription, UserSourceSubscriptionTable>();
-
-// Configure Identity
-builder.Services.AddScoped<IIdentityService, IdentityService>();
-
 // Configure Hangfire
 builder.Services.AddHangfire(f => f.UseMemoryStorage());
 builder.Services.AddHangfireServer();
 GlobalConfiguration.Configuration.UseSerilogLogProvider();
 
-// Add Health Checks
 builder.Services.AddHealthChecks()
     .AddNpgSql(config.GetValue<string>(ConfigConnectionStringConst.Database) ?? "");
 
-
 builder.Services.AddControllers();
-
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
 builder.Services.Configure<ConnectionStrings>(config.GetSection("ConnectionStrings"));
+
 builder.Services.Configure<ConfigSectionConnectionStrings>(config.GetSection(ConfigSectionsConst.ConnectionStrings));
 builder.Services.Configure<ConfigSectionRssModel>(config.GetSection(ConfigSectionsConst.Rss));
 builder.Services.Configure<ConfigSectionYoutubeModel>(config.GetSection(ConfigSectionsConst.Youtube));
 //builder.Services.Configure<
 
-// Configure JWT for auth
-var jwtSettings = new JwtSettings();
-config.Bind(nameof(jwtSettings), jwtSettings);
-builder.Services.AddSingleton(jwtSettings);
-
-
-builder.Services.AddAuthentication(x =>
-{
-    x.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
-    x.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    x.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(x =>
-{
-    x.SaveToken = true;
-    x.TokenValidationParameters = new TokenValidationParameters
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(jwtSettings.Secret ?? "")),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        RequireExpirationTime = false,
-        ValidateLifetime = true
-    };
-});
-    
 builder.Services.AddSwaggerGen(cfg =>
 {
-    
     cfg.AddSecurityDefinition("ApiKey", new OpenApiSecurityScheme
     {
         Description = "The API key to access the API",
@@ -113,45 +56,23 @@ builder.Services.AddSwaggerGen(cfg =>
         Scheme = "ApiKeyScheme"
     });
 
-    cfg.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
-    {
-        Description = "JWT Authorization Header using the bearer scheme",
-        Name = "Authorization",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.ApiKey
-    });
-    
-    cfg.AddSecurityRequirement(new OpenApiSecurityRequirement
-    {
-        //{
-        //    new OpenApiSecurityScheme
-        //    {
-        //        Reference = new OpenApiReference
-        //        {
-        //            Type = ReferenceType.SecurityScheme,
-        //            Id = "ApiKey"
-        //        },
-        //        In = ParameterLocation.Header
-        //    },
-        //    new List<string>()
-        //},
-        { 
-            new OpenApiSecurityScheme
+    var scheme = new OpenApiSecurityScheme
     {
         Reference = new OpenApiReference
         {
             Type = ReferenceType.SecurityScheme,
-                    Id = "Bearer"
+            Id = "ApiKey"
         },
-                Scheme = "oauth2",
-                Name = "Bearer",
         In = ParameterLocation.Header
-            }, 
-            new List<string>()
-        }
-    });
+    };
+    var requirement = new OpenApiSecurityRequirement
+    {
+        { scheme, new List<string>() }
+    };
+    cfg.AddSecurityRequirement(requirement);
 });
 
+builder.Services.AddDbContext<DatabaseContext>();
 
 var app = builder.Build();
 
@@ -167,10 +88,9 @@ app.UseHttpsRedirection();
 app.UseHangfireDashboard();
 BackgroundJobs.SetupRecurringJobs(config);
 
-//app.UseAuthorization();
-app.UseAuthentication();
+app.UseAuthorization();
 
-//app.UseMiddleware<ApiKeyAuthAuthentication>();
+app.UseMiddleware<ApiKeyAuthAuthentication>();
 
 app.MapHealthChecks("/health", new HealthCheckOptions
 {

Newsbot.Collector.Api/Services/IdentityService.cs

@@ -1,114 +0,0 @@
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Claims;
-using System.Text;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.IdentityModel.Tokens;
-using Newsbot.Collector.Api.Domain.Results;
-using Newsbot.Collector.Domain.Models.Config;
-
-namespace Newsbot.Collector.Api.Services;
-
-public interface IIdentityService
-{
-    AuthenticationResult Register(string email, string password);
-    AuthenticationResult Login(string email, string password);
-}
-
-public class IdentityService : IIdentityService
-{
-    private readonly UserManager<IdentityUser> _userManager;
-    private readonly JwtSettings _jwtSettings;
-
-    public IdentityService(UserManager<IdentityUser> userManager, JwtSettings jwtSettings)
-    {
-        _userManager = userManager;
-        _jwtSettings = jwtSettings;
-    }
-
-    public AuthenticationResult Register(string email, string password)
-    {
-        var userExists = _userManager.FindByEmailAsync(email);
-        userExists.Wait();
-
-        if (userExists.Result != null)
-        {
-            return new AuthenticationResult
-            {
-                ErrorMessage = new[] { "A user with this email address already exists" }
-            };
-        }
-
-        var newUser = new IdentityUser
-        {
-            UserName = email,
-            Email = email
-        };
-
-        var createdUser = _userManager.CreateAsync(newUser, password);
-        createdUser.Wait();
-
-        if (!createdUser.Result.Succeeded)
-        {
-            return new AuthenticationResult
-            {
-                ErrorMessage = new[] { createdUser.Result.Errors.Select(x => x.Description).ToString() }
-            };
-        }
-
-        return  GenerateJwtToken(newUser);
-    }
-
-    public AuthenticationResult Login(string email, string password)
-    {
-        var user =_userManager.FindByEmailAsync(email);
-        user.Wait();
-
-        if (user.Result == null)
-        {
-            return new AuthenticationResult
-            {
-                ErrorMessage = new[] { "User does not exist" }
-            };
-        }
-
-        var hasValidPassword = _userManager.CheckPasswordAsync(user.Result ?? new IdentityUser(), password);
-        hasValidPassword.Wait();
-
-        if (!hasValidPassword.Result)
-        {
-            return new AuthenticationResult()
-            {
-                ErrorMessage = new[] { "Password is invalid" }
-            };
-        }
-
-        return GenerateJwtToken(user.Result ?? new IdentityUser());
-    }
-
-    private AuthenticationResult GenerateJwtToken(IdentityUser user)
-    {
-        var tokenHandler = new JwtSecurityTokenHandler();
-        var key = Encoding.ASCII.GetBytes(_jwtSettings.Secret ?? "");
-        var tokenDescriptor = new SecurityTokenDescriptor
-        {
-            Subject = new ClaimsIdentity(new[]
-            {
-                new Claim(JwtRegisteredClaimNames.Sub, user.Email ?? ""),
-                new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
-                new Claim(JwtRegisteredClaimNames.Email, user.Email ?? ""),
-                new Claim("id", user.Id)
-            }),
-            Expires = DateTime.UtcNow.AddHours(3),
-            SigningCredentials =
-                new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
-        };
-
-        var token = tokenHandler.CreateToken(tokenDescriptor);
-
-        return new AuthenticationResult
-        {
-            IsSuccessful = true,
-            Token = tokenHandler.WriteToken(token)
-        };
-    }
-}

Newsbot.Collector.Database/DatabaseContext.cs

@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Newsbot.Collector.Domain.Consts;
@@ -7,60 +5,46 @@ using Newsbot.Collector.Domain.Entities;
 
 namespace Newsbot.Collector.Database;
 
-public class DatabaseContext : IdentityDbContext
+public class DatabaseContext : DbContext
 {
     public DbSet<ArticlesEntity> Articles { get; set; } = null!;
-    
-    public DbSet<DiscordNotificationEntity> DiscordNotification { get; set; } = null!;
     public DbSet<DiscordQueueEntity> DiscordQueue { get; set; } = null!;
     public DbSet<DiscordWebhookEntity> DiscordWebhooks { get; set; } = null!;
     public DbSet<IconEntity> Icons { get; set; } = null!;
     public DbSet<SourceEntity> Sources { get; set; } = null!;
+    public DbSet<SubscriptionEntity> Subscriptions { get; set; } = null!;
     
-    public DbSet<UserSourceSubscriptionEntity> UserSourceSubscription { get; set; } = null!;
+    private string ConnectionString { get; set; }
 
-    private string ConnectionString { get; set; } = "";
-
-    //public DatabaseContext(IConfiguration appsettings, string connectionString)
-    //{
-    //    var connString = appsettings.GetConnectionString(ConfigConnectionStringConst.Database);
-    //    ConnectionString = connString ?? "";
-    //}
+    public DatabaseContext(IConfiguration appsettings, string connectionString)
+    {
+        var connString = appsettings.GetConnectionString(ConfigConnectionStringConst.Database);
+        ConnectionString = connString ?? "";
+    }
 
     public DatabaseContext(string connectionString)
     {
         ConnectionString = connectionString;
     }
     
+    public DatabaseContext(DbContextOptions<DatabaseContext> connectionString)
+    {
+        ConnectionString = "";
+    }
+
+    public DatabaseContext()
+    {
+        ConnectionString = "";
+    }
+
     protected override void OnConfiguring(DbContextOptionsBuilder options)
-    {
-        if (ConnectionString != "")
     {
         options.UseNpgsql(ConnectionString);
     }
-    }
-    
-    //public DatabaseContext(DbContextOptions<DatabaseContext> connectionString)
-    //{
-    //    ConnectionString = "";
-    //}
-
-    //public DatabaseContext()
-    //{
-    //    ConnectionString = "";
-    //}
-
-    
-    public DatabaseContext(DbContextOptions<DatabaseContext> options)
-        : base(options)
-    {
-        //ConnectionString = "";
-        
-    }
     
     public DatabaseContext(DbContextOptions<DatabaseContext> options, string connectionString)
         : base(options)
     {
-        //ConnectionString = connectionString;
+        ConnectionString = connectionString;
     }
 }

Newsbot.Collector.Database/Migrations/20230629222603_identity.Designer.cs

@@ -1,470 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Newsbot.Collector.Database;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace Newsbot.Collector.Database.Migrations
-{
-    [DbContext(typeof(DatabaseContext))]
-    [Migration("20230629222603_identity")]
-    partial class identity
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.8")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("NormalizedName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedName")
-                        .IsUnique()
-                        .HasDatabaseName("RoleNameIndex");
-
-                    b.ToTable("AspNetRoles", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClaimType")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("text");
-
-                    b.Property<string>("RoleId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetRoleClaims", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.Property<int>("AccessFailedCount")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<bool>("EmailConfirmed")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("LockoutEnabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTimeOffset?>("LockoutEnd")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("NormalizedEmail")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("NormalizedUserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("PasswordHash")
-                        .HasColumnType("text");
-
-                    b.Property<string>("PhoneNumber")
-                        .HasColumnType("text");
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("SecurityStamp")
-                        .HasColumnType("text");
-
-                    b.Property<bool>("TwoFactorEnabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("UserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedEmail")
-                        .HasDatabaseName("EmailIndex");
-
-                    b.HasIndex("NormalizedUserName")
-                        .IsUnique()
-                        .HasDatabaseName("UserNameIndex");
-
-                    b.ToTable("AspNetUsers", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClaimType")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("text");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserClaims", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ProviderKey")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ProviderDisplayName")
-                        .HasColumnType("text");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("LoginProvider", "ProviderKey");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserLogins", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("RoleId")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetUserRoles", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Value")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserId", "LoginProvider", "Name");
-
-                    b.ToTable("AspNetUserTokens", (string)null);
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.ArticlesEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("AuthorImage")
-                        .HasColumnType("text");
-
-                    b.Property<string>("AuthorName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<bool>("CodeIsCommit")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("CodeIsRelease")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("PubDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Tags")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Thumbnail")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Url")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Video")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("VideoHeight")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("VideoWidth")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Articles");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordQueueEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("ArticleId")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DiscordQueue");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordWebhookEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Channel")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Server")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Url")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DiscordWebhooks");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.IconEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("FileName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Icons");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.SourceEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<bool>("Deleted")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Source")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Tags")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Url")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("YoutubeId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Sources");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.SubscriptionEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<bool>("CodeAllowCommits")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("CodeAllowReleases")
-                        .HasColumnType("boolean");
-
-                    b.Property<Guid>("DiscordWebHookId")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Subscriptions");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Newsbot.Collector.Database/Migrations/20230629222603_identity.cs

@@ -1,223 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace Newsbot.Collector.Database.Migrations
-{
-    /// <inheritdoc />
-    public partial class identity : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "AspNetRoles",
-                columns: table => new
-                {
-                    Id = table.Column<string>(type: "text", nullable: false),
-                    Name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
-                    NormalizedName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "text", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AspNetRoles", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AspNetUsers",
-                columns: table => new
-                {
-                    Id = table.Column<string>(type: "text", nullable: false),
-                    UserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
-                    NormalizedUserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
-                    Email = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
-                    NormalizedEmail = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
-                    EmailConfirmed = table.Column<bool>(type: "boolean", nullable: false),
-                    PasswordHash = table.Column<string>(type: "text", nullable: true),
-                    SecurityStamp = table.Column<string>(type: "text", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "text", nullable: true),
-                    PhoneNumber = table.Column<string>(type: "text", nullable: true),
-                    PhoneNumberConfirmed = table.Column<bool>(type: "boolean", nullable: false),
-                    TwoFactorEnabled = table.Column<bool>(type: "boolean", nullable: false),
-                    LockoutEnd = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: true),
-                    LockoutEnabled = table.Column<bool>(type: "boolean", nullable: false),
-                    AccessFailedCount = table.Column<int>(type: "integer", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AspNetUsers", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AspNetRoleClaims",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    RoleId = table.Column<string>(type: "text", nullable: false),
-                    ClaimType = table.Column<string>(type: "text", nullable: true),
-                    ClaimValue = table.Column<string>(type: "text", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_AspNetRoleClaims_AspNetRoles_RoleId",
-                        column: x => x.RoleId,
-                        principalTable: "AspNetRoles",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AspNetUserClaims",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    UserId = table.Column<string>(type: "text", nullable: false),
-                    ClaimType = table.Column<string>(type: "text", nullable: true),
-                    ClaimValue = table.Column<string>(type: "text", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AspNetUserClaims", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_AspNetUserClaims_AspNetUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "AspNetUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AspNetUserLogins",
-                columns: table => new
-                {
-                    LoginProvider = table.Column<string>(type: "text", nullable: false),
-                    ProviderKey = table.Column<string>(type: "text", nullable: false),
-                    ProviderDisplayName = table.Column<string>(type: "text", nullable: true),
-                    UserId = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey });
-                    table.ForeignKey(
-                        name: "FK_AspNetUserLogins_AspNetUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "AspNetUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AspNetUserRoles",
-                columns: table => new
-                {
-                    UserId = table.Column<string>(type: "text", nullable: false),
-                    RoleId = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId });
-                    table.ForeignKey(
-                        name: "FK_AspNetUserRoles_AspNetRoles_RoleId",
-                        column: x => x.RoleId,
-                        principalTable: "AspNetRoles",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_AspNetUserRoles_AspNetUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "AspNetUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AspNetUserTokens",
-                columns: table => new
-                {
-                    UserId = table.Column<string>(type: "text", nullable: false),
-                    LoginProvider = table.Column<string>(type: "text", nullable: false),
-                    Name = table.Column<string>(type: "text", nullable: false),
-                    Value = table.Column<string>(type: "text", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
-                    table.ForeignKey(
-                        name: "FK_AspNetUserTokens_AspNetUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "AspNetUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AspNetRoleClaims_RoleId",
-                table: "AspNetRoleClaims",
-                column: "RoleId");
-
-            migrationBuilder.CreateIndex(
-                name: "RoleNameIndex",
-                table: "AspNetRoles",
-                column: "NormalizedName",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AspNetUserClaims_UserId",
-                table: "AspNetUserClaims",
-                column: "UserId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AspNetUserLogins_UserId",
-                table: "AspNetUserLogins",
-                column: "UserId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AspNetUserRoles_RoleId",
-                table: "AspNetUserRoles",
-                column: "RoleId");
-
-            migrationBuilder.CreateIndex(
-                name: "EmailIndex",
-                table: "AspNetUsers",
-                column: "NormalizedEmail");
-
-            migrationBuilder.CreateIndex(
-                name: "UserNameIndex",
-                table: "AspNetUsers",
-                column: "NormalizedUserName",
-                unique: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "AspNetRoleClaims");
-
-            migrationBuilder.DropTable(
-                name: "AspNetUserClaims");
-
-            migrationBuilder.DropTable(
-                name: "AspNetUserLogins");
-
-            migrationBuilder.DropTable(
-                name: "AspNetUserRoles");
-
-            migrationBuilder.DropTable(
-                name: "AspNetUserTokens");
-
-            migrationBuilder.DropTable(
-                name: "AspNetRoles");
-
-            migrationBuilder.DropTable(
-                name: "AspNetUsers");
-        }
-    }
-}

Newsbot.Collector.Database/Migrations/20230710050618_SourcesRenamed.Designer.cs

@@ -1,501 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Newsbot.Collector.Database;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace Newsbot.Collector.Database.Migrations
-{
-    [DbContext(typeof(DatabaseContext))]
-    [Migration("20230710050618_SourcesRenamed")]
-    partial class SourcesRenamed
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.8")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("NormalizedName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedName")
-                        .IsUnique()
-                        .HasDatabaseName("RoleNameIndex");
-
-                    b.ToTable("AspNetRoles", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClaimType")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("text");
-
-                    b.Property<string>("RoleId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetRoleClaims", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.Property<int>("AccessFailedCount")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<bool>("EmailConfirmed")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("LockoutEnabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTimeOffset?>("LockoutEnd")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("NormalizedEmail")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("NormalizedUserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("PasswordHash")
-                        .HasColumnType("text");
-
-                    b.Property<string>("PhoneNumber")
-                        .HasColumnType("text");
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("SecurityStamp")
-                        .HasColumnType("text");
-
-                    b.Property<bool>("TwoFactorEnabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("UserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedEmail")
-                        .HasDatabaseName("EmailIndex");
-
-                    b.HasIndex("NormalizedUserName")
-                        .IsUnique()
-                        .HasDatabaseName("UserNameIndex");
-
-                    b.ToTable("AspNetUsers", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClaimType")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("text");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserClaims", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ProviderKey")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ProviderDisplayName")
-                        .HasColumnType("text");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("LoginProvider", "ProviderKey");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserLogins", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("RoleId")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetUserRoles", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Value")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserId", "LoginProvider", "Name");
-
-                    b.ToTable("AspNetUserTokens", (string)null);
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.ArticlesEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("AuthorImage")
-                        .HasColumnType("text");
-
-                    b.Property<string>("AuthorName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<bool>("CodeIsCommit")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("CodeIsRelease")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("PubDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Tags")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Thumbnail")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Url")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Video")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("VideoHeight")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("VideoWidth")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Articles");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordNotificationEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<bool>("CodeAllowCommits")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("CodeAllowReleases")
-                        .HasColumnType("boolean");
-
-                    b.Property<Guid>("DiscordWebHookId")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DiscordNotification");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordQueueEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("ArticleId")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DiscordQueue");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordWebhookEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Channel")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Server")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Url")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DiscordWebhooks");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.IconEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("FileName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Icons");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.SourceEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<bool>("Deleted")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Source")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Tags")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Url")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("YoutubeId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Sources");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.UserSourceSubscriptionEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTimeOffset>("DateAdded")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserSourceSubscription");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.UserSourceSubscriptionEntity", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId");
-
-                    b.Navigation("User");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Newsbot.Collector.Database/Migrations/20230710050618_SourcesRenamed.cs

@@ -1,82 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Newsbot.Collector.Database.Migrations
-{
-    /// <inheritdoc />
-    public partial class SourcesRenamed : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Subscriptions");
-
-            migrationBuilder.CreateTable(
-                name: "DiscordNotification",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uuid", nullable: false),
-                    CodeAllowReleases = table.Column<bool>(type: "boolean", nullable: false),
-                    CodeAllowCommits = table.Column<bool>(type: "boolean", nullable: false),
-                    SourceId = table.Column<Guid>(type: "uuid", nullable: false),
-                    DiscordWebHookId = table.Column<Guid>(type: "uuid", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_DiscordNotification", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "UserSourceSubscription",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uuid", nullable: false),
-                    SourceId = table.Column<Guid>(type: "uuid", nullable: false),
-                    DateAdded = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
-                    UserId = table.Column<string>(type: "text", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UserSourceSubscription", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_UserSourceSubscription_AspNetUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "AspNetUsers",
-                        principalColumn: "Id");
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserSourceSubscription_UserId",
-                table: "UserSourceSubscription",
-                column: "UserId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "DiscordNotification");
-
-            migrationBuilder.DropTable(
-                name: "UserSourceSubscription");
-
-            migrationBuilder.CreateTable(
-                name: "Subscriptions",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uuid", nullable: false),
-                    CodeAllowCommits = table.Column<bool>(type: "boolean", nullable: false),
-                    CodeAllowReleases = table.Column<bool>(type: "boolean", nullable: false),
-                    DiscordWebHookId = table.Column<Guid>(type: "uuid", nullable: false),
-                    SourceId = table.Column<Guid>(type: "uuid", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Subscriptions", x => x.Id);
-                });
-        }
-    }
-}

Newsbot.Collector.Database/Migrations/20230710050913_DiscordNotificationOwnerAdded.Designer.cs

@@ -1,504 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Newsbot.Collector.Database;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace Newsbot.Collector.Database.Migrations
-{
-    [DbContext(typeof(DatabaseContext))]
-    [Migration("20230710050913_DiscordNotificationOwnerAdded")]
-    partial class DiscordNotificationOwnerAdded
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.8")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("NormalizedName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedName")
-                        .IsUnique()
-                        .HasDatabaseName("RoleNameIndex");
-
-                    b.ToTable("AspNetRoles", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClaimType")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("text");
-
-                    b.Property<string>("RoleId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetRoleClaims", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.Property<int>("AccessFailedCount")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<bool>("EmailConfirmed")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("LockoutEnabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTimeOffset?>("LockoutEnd")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("NormalizedEmail")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("NormalizedUserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("PasswordHash")
-                        .HasColumnType("text");
-
-                    b.Property<string>("PhoneNumber")
-                        .HasColumnType("text");
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("SecurityStamp")
-                        .HasColumnType("text");
-
-                    b.Property<bool>("TwoFactorEnabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("UserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedEmail")
-                        .HasDatabaseName("EmailIndex");
-
-                    b.HasIndex("NormalizedUserName")
-                        .IsUnique()
-                        .HasDatabaseName("UserNameIndex");
-
-                    b.ToTable("AspNetUsers", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClaimType")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("text");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserClaims", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ProviderKey")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ProviderDisplayName")
-                        .HasColumnType("text");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("LoginProvider", "ProviderKey");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserLogins", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("RoleId")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetUserRoles", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Value")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserId", "LoginProvider", "Name");
-
-                    b.ToTable("AspNetUserTokens", (string)null);
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.ArticlesEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("AuthorImage")
-                        .HasColumnType("text");
-
-                    b.Property<string>("AuthorName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<bool>("CodeIsCommit")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("CodeIsRelease")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("PubDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Tags")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Thumbnail")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Url")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Video")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("VideoHeight")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("VideoWidth")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Articles");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordNotificationEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<bool>("CodeAllowCommits")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("CodeAllowReleases")
-                        .HasColumnType("boolean");
-
-                    b.Property<Guid>("DiscordWebHookId")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DiscordNotification");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordQueueEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("ArticleId")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DiscordQueue");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordWebhookEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Channel")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Server")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Url")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DiscordWebhooks");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.IconEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("FileName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Icons");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.SourceEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<bool>("Deleted")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Source")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Tags")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Url")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("YoutubeId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Sources");
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.UserSourceSubscriptionEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTimeOffset>("DateAdded")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserSourceSubscription");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.UserSourceSubscriptionEntity", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId");
-
-                    b.Navigation("User");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Newsbot.Collector.Database/Migrations/20230710050913_DiscordNotificationOwnerAdded.cs

@@ -1,28 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Newsbot.Collector.Database.Migrations
-{
-    /// <inheritdoc />
-    public partial class DiscordNotificationOwnerAdded : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "UserId",
-                table: "DiscordNotification",
-                type: "text",
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "UserId",
-                table: "DiscordNotification");
-        }
-    }
-}

Newsbot.Collector.Database/Migrations/DatabaseContextModelSnapshot.cs

@@ -17,207 +17,11 @@ namespace Newsbot.Collector.Database.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.8")
+                .HasAnnotation("ProductVersion", "7.0.7")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("NormalizedName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedName")
-                        .IsUnique()
-                        .HasDatabaseName("RoleNameIndex");
-
-                    b.ToTable("AspNetRoles", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClaimType")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("text");
-
-                    b.Property<string>("RoleId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetRoleClaims", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.Property<int>("AccessFailedCount")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<bool>("EmailConfirmed")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("LockoutEnabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTimeOffset?>("LockoutEnd")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("NormalizedEmail")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("NormalizedUserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<string>("PasswordHash")
-                        .HasColumnType("text");
-
-                    b.Property<string>("PhoneNumber")
-                        .HasColumnType("text");
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("SecurityStamp")
-                        .HasColumnType("text");
-
-                    b.Property<bool>("TwoFactorEnabled")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("UserName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedEmail")
-                        .HasDatabaseName("EmailIndex");
-
-                    b.HasIndex("NormalizedUserName")
-                        .IsUnique()
-                        .HasDatabaseName("UserNameIndex");
-
-                    b.ToTable("AspNetUsers", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClaimType")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("text");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserClaims", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ProviderKey")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ProviderDisplayName")
-                        .HasColumnType("text");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("LoginProvider", "ProviderKey");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserLogins", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("RoleId")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetUserRoles", (string)null);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Value")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserId", "LoginProvider", "Name");
-
-                    b.ToTable("AspNetUserTokens", (string)null);
-                });
-
             modelBuilder.Entity("Newsbot.Collector.Domain.Entities.ArticlesEntity", b =>
                 {
                     b.Property<Guid>("Id")
@@ -277,32 +81,6 @@ namespace Newsbot.Collector.Database.Migrations
                     b.ToTable("Articles");
                 });
 
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordNotificationEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<bool>("CodeAllowCommits")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("CodeAllowReleases")
-                        .HasColumnType("boolean");
-
-                    b.Property<Guid>("DiscordWebHookId")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("SourceId")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DiscordNotification");
-                });
-
             modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordQueueEntity", b =>
                 {
                     b.Property<Guid>("Id")
@@ -414,86 +192,27 @@ namespace Newsbot.Collector.Database.Migrations
                     b.ToTable("Sources");
                 });
 
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.UserSourceSubscriptionEntity", b =>
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.SubscriptionEntity", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid");
 
-                    b.Property<DateTimeOffset>("DateAdded")
-                        .HasColumnType("timestamp with time zone");
+                    b.Property<bool>("CodeAllowCommits")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("CodeAllowReleases")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("DiscordWebHookId")
+                        .HasColumnType("uuid");
 
                     b.Property<Guid>("SourceId")
                         .HasColumnType("uuid");
 
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
                     b.HasKey("Id");
 
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserSourceSubscription");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.UserSourceSubscriptionEntity", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId");
-
-                    b.Navigation("User");
+                    b.ToTable("Subscriptions");
                 });
 #pragma warning restore 612, 618
         }

Newsbot.Collector.Database/Newsbot.Collector.Database.csproj

@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="dapper" Version="2.0.123" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.8" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Newsbot.Collector.Database/Repositories/ArticlesTable.cs

@@ -11,34 +11,29 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class ArticlesTable : IArticlesRepository
 {
-    //private readonly string _connectionString;
+    private readonly string _connectionString;
 
     private DatabaseContext _context;  
 
     public ArticlesTable(string connectionString)
     {
-        //_connectionString = connectionString;
+        _connectionString = connectionString;
         _context = new DatabaseContext(connectionString);
     }
 
-    public ArticlesTable(DatabaseContext context)
+    public ArticlesTable(IConfiguration configuration)
     {
-        _context = context;
-    }
+        var conn = configuration.GetConnectionString("database");
+        if (conn is null) conn = "";
 
-    //public ArticlesTable(IConfiguration configuration)
-    //{
-    //    var conn = configuration.GetConnectionString("database");
-    //    if (conn is null) conn = "";
-    //    
-    //    _context = new DatabaseContext(conn);
-    //}
+        _connectionString = conn;
+        _context = new DatabaseContext(conn);
+    }
 
     public List<ArticlesEntity> List(int page = 0, int count = 25)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        
-        var query = _context.Articles
+        using var context = new DatabaseContext(_connectionString);
+        var query = context.Articles
             .Skip(page * count)
             .OrderBy(d => d.PubDate)
             .Take(25);
@@ -48,8 +43,8 @@ public class ArticlesTable : IArticlesRepository
 
     public ArticlesEntity GetById(Guid id)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var query = _context.Articles
+        using var context = new DatabaseContext(_connectionString);
+        var query = context.Articles
             .FirstOrDefault(d => d.Id.Equals(id));
         query ??= new ArticlesEntity();
         return query;
@@ -57,16 +52,16 @@ public class ArticlesTable : IArticlesRepository
 
     public ArticlesEntity GetByUrl(string url)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Articles.FirstOrDefault(d => d.Url!.Equals(url));
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Articles.FirstOrDefault(d => d.Url!.Equals(url));
         res ??= new ArticlesEntity();
         return res;
     }
 
     public List<ArticlesEntity> ListBySourceId(Guid id, int page, int count)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Articles
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Articles
             .Skip(page * count)
             .Where(d => d.SourceId.Equals(id));
         return res.ToList();
@@ -74,14 +69,13 @@ public class ArticlesTable : IArticlesRepository
 
     public ArticlesEntity New(ArticlesEntity model)
     {
-        //using var context = new DatabaseContext(_connectionString);
+        using var context = new DatabaseContext(_connectionString);
         model.Id = new Guid();
-        var query = _context.Articles.Add(model);
-        _context.SaveChanges();
+        var query = context.Articles.Add(model);
+        context.SaveChanges();
         return model;
     }
     
-    /*
     public ArticlesModel NewDapper(ArticlesModel model)
     {
         model.ID = Guid.NewGuid();
@@ -109,27 +103,26 @@ public class ArticlesTable : IArticlesRepository
         });
         return model;
     }
-    */
 
     public void DeleteAllBySourceId(Guid sourceId)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Articles
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Articles
             .Where(d => d.SourceId.Equals(sourceId))
             .ToList();
 
         foreach (var item in res)
         {
-            _context.Articles.Remove(item);
+            context.Articles.Remove(item);
         }
 
-        _context.SaveChanges();
+        context.SaveChanges();
     }
 
-    //private IDbConnection OpenConnection(string connectionString)
-    //{
-    //    //var conn = new NpgsqlConnection(_connectionString);
-    //    //conn.Open();
-    //    //return conn;
-    //}
+    private IDbConnection OpenConnection(string connectionString)
+    {
+        var conn = new NpgsqlConnection(_connectionString);
+        conn.Open();
+        return conn;
+    }
 }

Newsbot.Collector.Database/Repositories/DiscordNotificationTable.cs

@@ -1,92 +0,0 @@
-using System.Data;
-using Dapper;
-using Microsoft.Extensions.Configuration;
-using Newsbot.Collector.Domain.Entities;
-using Newsbot.Collector.Domain.Interfaces;
-using Newsbot.Collector.Domain.Models;
-using Npgsql;
-
-namespace Newsbot.Collector.Database.Repositories;
-
-public class DiscordNotificationTable : IDiscordNotificationRepository
-{
-    //private readonly string _connectionString;
-    private DatabaseContext _context;
-
-    public DiscordNotificationTable(string connectionString)
-    {
-        //_connectionString = connectionString;
-        _context = new DatabaseContext(connectionString);
-    }
-
-    public DiscordNotificationTable(DatabaseContext context)
-    {
-        _context = context;
-    }
-
-    public DiscordNotificationEntity New(DiscordNotificationEntity model)
-    {
-        model.Id = new Guid();
-        //using var context = new DatabaseContext(_connectionString);
-        _context.DiscordNotification.Add(model);
-        _context.SaveChanges();
-        return model;
-    }
-
-    public List<DiscordNotificationEntity> List(int page = 0, int count = 25)
-    {
-        //using var context = new DatabaseContext(_connectionString);
-        return _context.DiscordNotification.Skip(page * count).Take(count).ToList();
-    }
-
-    public List<DiscordNotificationEntity> ListBySourceId(Guid id, int page = 0, int count = 25)
-    {
-        //using var context = new DatabaseContext(_connectionString);
-        return _context.DiscordNotification.Where(f => f.SourceId.Equals(id))
-            .Skip(page * count)
-            .ToList();
-    }
-
-    public List<DiscordNotificationEntity> ListByWebhook(Guid id, int page = 0, int count = 25)
-    {
-        //using var context = new DatabaseContext(_connectionString);
-        return _context.DiscordNotification.Where(f => f.DiscordWebHookId.Equals(id)).Skip(page * count).ToList();
-    }
-
-    public DiscordNotificationEntity GetById(Guid id)
-    {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordNotification
-            .FirstOrDefault(f => f.Id.Equals(id));
-        return res ??= new DiscordNotificationEntity();
-    }
-
-    public DiscordNotificationEntity GetByWebhookAndSource(Guid webhookId, Guid sourceId)
-    {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordNotification
-            .Where(f => f.DiscordWebHookId.Equals(webhookId))
-            .FirstOrDefault(f => f.SourceId.Equals(sourceId));
-        return res ??= new DiscordNotificationEntity();
-    }
-
-    public void Delete(Guid id)
-    {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordNotification.FirstOrDefault(f => f.Id.Equals(id));
-        if (res is null)
-        {
-            return;
-        }
-
-        _context.DiscordNotification.Remove(res);
-        _context.SaveChanges();
-    }
-
-    //private IDbConnection OpenConnection(string connectionString)
-    //{
-    //    var conn = new NpgsqlConnection(_connectionString);
-    //    conn.Open();
-    //    return conn;
-    //}
-}

Newsbot.Collector.Database/Repositories/DiscordQueue.cs

@@ -9,49 +9,42 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class DiscordQueueTable : IDiscordQueueRepository
 {
-    //private string _connectionString;
-    private DatabaseContext _context;  
+    private string _connectionString;
 
     public DiscordQueueTable(string connectionString)
     {
-        //_connectionString = connectionString;
-        _context = new DatabaseContext(connectionString);
+        _connectionString = connectionString;
     }
 
-    public DiscordQueueTable(DatabaseContext context)
+    private IDbConnection OpenConnection(string connectionString)
     {
-        _context = context;
+        var conn = new NpgsqlConnection(_connectionString);
+        conn.Open();
+        return conn;
     }
 
-    //private IDbConnection OpenConnection(string connectionString)
-    //{
-    //    var conn = new NpgsqlConnection(_connectionString);
-    //    conn.Open();
-    //    return conn;
-    //}
-
     public void New(DiscordQueueEntity model)
     {
         model.Id = new Guid();
         
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordQueue.Add(model);
-        _context.SaveChanges();
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.DiscordQueue.Add(model);
+        context.SaveChanges();
     }
 
     public void Delete(Guid id)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordQueue.FirstOrDefault(d => d.Id.Equals(id));
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.DiscordQueue.FirstOrDefault(d => d.Id.Equals(id));
         res ??= new DiscordQueueEntity();
-        _context.DiscordQueue.Remove(res);
-        _context.SaveChanges();
+        context.DiscordQueue.Remove(res);
+        context.SaveChanges();
     }
 
     public List<DiscordQueueEntity> List(int limit = 25)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordQueue.Take(limit).ToList();
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.DiscordQueue.Take(limit).ToList();
         return res;
     }
 }

Newsbot.Collector.Database/Repositories/DiscordWebhooksTable.cs

@@ -9,50 +9,49 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class DiscordWebhooksTable : IDiscordWebHooksRepository
 {
-    //private readonly string _connectionString;
-    private DatabaseContext _context;
+    private readonly string _connectionString;
 
     public DiscordWebhooksTable(string connectionString)
     {
-        //_connectionString = connectionString;
-        _context = new DatabaseContext(connectionString);
+        _connectionString = connectionString;
     }
 
-    public DiscordWebhooksTable(DatabaseContext context)
+    public DiscordWebhooksTable(IConfiguration configuration)
     {
-        _context = context;
+        var connstr = configuration.GetConnectionString("database") ?? "";
+        _connectionString = connstr;
     }
 
     public DiscordWebhookEntity New(DiscordWebhookEntity model)
     {
         model.Id = new Guid();
         
-        //using var context = new DatabaseContext(_connectionString);
-        _context.DiscordWebhooks.Add(model);
-        _context.SaveChanges();
+        using var context = new DatabaseContext(_connectionString);
+        context.DiscordWebhooks.Add(model);
+        context.SaveChanges();
         return model;
     }
 
     public DiscordWebhookEntity GetById(Guid id)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordWebhooks.FirstOrDefault(d => d.Id.Equals(id));
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.DiscordWebhooks.FirstOrDefault(d => d.Id.Equals(id));
         res ??= new DiscordWebhookEntity();
         return res;
     }
 
     public DiscordWebhookEntity GetByUrl(string url)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordWebhooks.FirstOrDefault(d => d.Url.Equals(url));
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.DiscordWebhooks.FirstOrDefault(d => d.Url.Equals(url));
         res ??= new DiscordWebhookEntity();
         return res;
     }
 
     public List<DiscordWebhookEntity> List(int page, int count = 25)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordWebhooks
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.DiscordWebhooks
             .Skip(page * count)
             .Take(count)
             .ToList();
@@ -62,8 +61,8 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
 
     public List<DiscordWebhookEntity> ListByServer(string server, int limit = 25)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordWebhooks
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.DiscordWebhooks
             .Where(d => d.Server.Equals(server))
             .Take(limit)
             .ToList();
@@ -73,8 +72,8 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
 
     public List<DiscordWebhookEntity> ListByServerAndChannel(string server, string channel, int limit = 25)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.DiscordWebhooks
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.DiscordWebhooks
             .Where(s => s.Server.Equals(server))
             .Where(c => c.Channel.Equals(channel))
             .Take(limit)
@@ -86,14 +85,14 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
     public int Disable(Guid id)
     {
         var res = GetById(id);
-        //using var context = new DatabaseContext(_connectionString);
+        using var context = new DatabaseContext(_connectionString);
 
         res.Enabled = true;
         
-        _context.DiscordWebhooks.Update(res);
+        context.DiscordWebhooks.Update(res);
         try
         {
-            _context.SaveChanges();
+            context.SaveChanges();
             return 1;
         }
         catch(Exception ex)
@@ -106,14 +105,14 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
     public int Enable(Guid id)
     {
         var res = GetById(id);
-        //using var context = new DatabaseContext(_connectionString);
+        using var context = new DatabaseContext(_connectionString);
 
         res.Enabled = false;
         
-        _context.DiscordWebhooks.Update(res);
+        context.DiscordWebhooks.Update(res);
         try
         {
-            _context.SaveChanges();
+            context.SaveChanges();
             return 1;
         }
         catch(Exception ex)
@@ -123,10 +122,10 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
         }
     }
 
-    //private IDbConnection OpenConnection(string connectionString)
-    //{
-    //    var conn = new NpgsqlConnection(_connectionString);
-    //    conn.Open();
-    //    return conn;
-    //}
+    private IDbConnection OpenConnection(string connectionString)
+    {
+        var conn = new NpgsqlConnection(_connectionString);
+        conn.Open();
+        return conn;
+    }
 }

Newsbot.Collector.Database/Repositories/IconsTable.cs

@@ -10,49 +10,49 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class IconsTable : IIconsRepository
 {
-    //private readonly string _connectionString;
-    private DatabaseContext _context;
+    private readonly string _connectionString;
 
     public IconsTable(string connectionString)
     {
-        //_connectionString = connectionString;
-        _context = new DatabaseContext(connectionString);
+        _connectionString = connectionString;
     }
 
-    public IconsTable(DatabaseContext context)
+    public IconsTable(IConfiguration configuration)
     {
-        _context = context;
+        var connstr = configuration.GetConnectionString("database");
+        if (connstr is null) connstr = "";
+        _connectionString = connstr;
     }
 
     public void New(IconEntity model)
     {
-        //using var context = new DatabaseContext(_connectionString);
+        using var context = new DatabaseContext(_connectionString);
         model.Id = Guid.NewGuid();
 
-        _context.Icons.Add(model);
-        _context.SaveChanges();
+        context.Icons.Add(model);
+        context.SaveChanges();
     }
 
     public IconEntity GetById(Guid id)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Icons.FirstOrDefault(f => f.Id.Equals(id));
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Icons.FirstOrDefault(f => f.Id.Equals(id));
         res ??= new IconEntity();
         return res;
     }
 
     public IconEntity GetBySourceId(Guid id)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Icons.FirstOrDefault(f => f.SourceId.Equals(id));
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Icons.FirstOrDefault(f => f.SourceId.Equals(id));
         res ??= new IconEntity();
         return res;
     }
 
-    //private IDbConnection OpenConnection(string connectionString)
-    //{
-    //    var conn = new NpgsqlConnection(_connectionString);
-    //    conn.Open();
-    //    return conn;
-    //}
+    private IDbConnection OpenConnection(string connectionString)
+    {
+        var conn = new NpgsqlConnection(_connectionString);
+        conn.Open();
+        return conn;
+    }
 }

Newsbot.Collector.Database/Repositories/SourcesTable.cs

@@ -10,28 +10,28 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class SourcesTable : ISourcesRepository
 {
-    //private readonly string _connectionString;
-    private DatabaseContext _context;
+    private readonly string _connectionString;
 
     public SourcesTable(string connectionString)
     {
-        //_connectionString = connectionString;
-        _context = new DatabaseContext(connectionString);
+        _connectionString = connectionString;
     }
 
-    public SourcesTable(DatabaseContext context)
+    public SourcesTable(IConfiguration configuration)
     {
-        _context = context;
+        var connstr = configuration.GetConnectionString("database");
+        if (connstr is null) connstr = "";
+        _connectionString = connstr;
     }
 
     public SourceEntity New(SourceEntity model)
     {
         model.Id = Guid.NewGuid();
-        //using var context = new DatabaseContext(_connectionString);
-        _context.Sources.Add(model);
+        using var context = new DatabaseContext(_connectionString);
+        context.Sources.Add(model);
         try
         {
-            _context.SaveChanges();
+            context.SaveChanges();
         }
         catch (Exception ex)
         {
@@ -43,8 +43,8 @@ public class SourcesTable : ISourcesRepository
 
     public SourceEntity GetById(Guid id)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Sources.FirstOrDefault(f => f.Id.Equals(id));
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Sources.FirstOrDefault(f => f.Id.Equals(id));
         res ??= new SourceEntity();
         return res;
     }
@@ -57,16 +57,16 @@ public class SourcesTable : ISourcesRepository
 
     public SourceEntity GetByName(string name)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Sources.FirstOrDefault(f => f.Name.Equals(name));
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Sources.FirstOrDefault(f => f.Name.Equals(name));
         res ??= new SourceEntity();
         return res;
     }
 
     public SourceEntity GetByNameAndType(string name, string type)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Sources
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Sources
             .Where(f => f.Name.Equals(name))
             .FirstOrDefault(f => f.Type.Equals(type));
         res ??= new SourceEntity();
@@ -75,8 +75,8 @@ public class SourcesTable : ISourcesRepository
 
     public SourceEntity GetByUrl(string url)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Sources
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Sources
             .FirstOrDefault(f => f.Url.Equals(url));
         res ??= new SourceEntity();
         return res;
@@ -84,8 +84,8 @@ public class SourcesTable : ISourcesRepository
 
     public List<SourceEntity> List(int page = 0, int count = 100)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Sources
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Sources
             .Skip(page * count)
             .Take(count)
             .ToList();
@@ -94,8 +94,8 @@ public class SourcesTable : ISourcesRepository
 
     public List<SourceEntity> ListBySource(string source, int page = 0, int limit = 25)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Sources
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Sources
             .Where(f => f.Source.Equals(source))
             .Skip(page * limit)
             .Take(limit)
@@ -105,8 +105,8 @@ public class SourcesTable : ISourcesRepository
 
     public List<SourceEntity> ListByType(string type,int page = 0, int limit = 25)
     {
-        //using var context = new DatabaseContext(_connectionString);
-        var res = _context.Sources
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Sources
             .Where(f => f.Type.Equals(type))
             .Skip(page * limit)
             .Take(limit)
@@ -116,13 +116,13 @@ public class SourcesTable : ISourcesRepository
 
     public int Disable(Guid id)
     {
-        //using var context = new DatabaseContext(_connectionString);
+        using var context = new DatabaseContext(_connectionString);
         var res = GetById(id);
         res.Enabled = false;
-        _context.Sources.Update(res);
+        context.Sources.Update(res);
         try
         {
-            _context.SaveChanges();
+            context.SaveChanges();
             return 1;
         }
         catch
@@ -133,13 +133,13 @@ public class SourcesTable : ISourcesRepository
 
     public int Enable(Guid id)
     {
-        //using var context = new DatabaseContext(_connectionString);
+        using var context = new DatabaseContext(_connectionString);
         var res = GetById(id);
         res.Enabled = true;
-        _context.Sources.Update(res);
+        context.Sources.Update(res);
         try
         {
-            _context.SaveChanges();
+            context.SaveChanges();
             return 1;
         }
         catch
@@ -150,21 +150,21 @@ public class SourcesTable : ISourcesRepository
 
     public void Delete(Guid id)
     {
-        //using var context = new DatabaseContext(_connectionString);
+        using var context = new DatabaseContext(_connectionString);
         var res = GetById(id);
-        _context.Sources.Remove(res);
-        _context.SaveChanges();
+        context.Sources.Remove(res);
+        context.SaveChanges();
     }
 
     public int UpdateYoutubeId(Guid id, string youtubeId)
     {
-        //using var context = new DatabaseContext(_connectionString);
+        using var context = new DatabaseContext(_connectionString);
         var res = GetById(id);
         res.YoutubeId = youtubeId;
-        _context.Sources.Update(res);
+        context.Sources.Update(res);
         try
         {
-            _context.SaveChanges();
+            context.SaveChanges();
             return 1;
         }
         catch
@@ -173,10 +173,10 @@ public class SourcesTable : ISourcesRepository
         }
     }
 
-    //private IDbConnection OpenConnection(string connectionString)
-    //{
-    //    var conn = new NpgsqlConnection(_connectionString);
-    //    conn.Open();
-    //    return conn;
-    //}
+    private IDbConnection OpenConnection(string connectionString)
+    {
+        var conn = new NpgsqlConnection(_connectionString);
+        conn.Open();
+        return conn;
+    }
 }

Newsbot.Collector.Database/Repositories/SubscriptionsTable.cs

@@ -0,0 +1,93 @@
+using System.Data;
+using Dapper;
+using Microsoft.Extensions.Configuration;
+using Newsbot.Collector.Domain.Entities;
+using Newsbot.Collector.Domain.Interfaces;
+using Newsbot.Collector.Domain.Models;
+using Npgsql;
+
+namespace Newsbot.Collector.Database.Repositories;
+
+public class SubscriptionsTable : ISubscriptionRepository
+{
+    private readonly string _connectionString;
+
+    public SubscriptionsTable(string connectionString)
+    {
+        _connectionString = connectionString;
+    }
+
+    public SubscriptionsTable(IConfiguration configuration)
+    {
+        var connstr = configuration.GetConnectionString("database");
+        if (connstr is null) connstr = "";
+        _connectionString = connstr;
+    }
+
+    public SubscriptionEntity New(SubscriptionEntity model)
+    {
+        model.Id = new Guid();
+        using var context = new DatabaseContext(_connectionString);
+        context.Subscriptions.Add(model);
+        context.SaveChanges();
+        return model;
+    }
+
+    public List<SubscriptionEntity> List(int page = 0, int count = 25)
+    {
+        using var context = new DatabaseContext(_connectionString);
+        return context.Subscriptions.Skip(page * count).Take(count).ToList();
+    }
+
+    public List<SubscriptionEntity> ListBySourceId(Guid id, int page = 0, int count = 25)
+    {
+        using var context = new DatabaseContext(_connectionString);
+        return context.Subscriptions.Where(f => f.SourceId.Equals(id))
+            .Skip(page * count)
+            .ToList();
+    }
+
+    public List<SubscriptionEntity> ListByWebhook(Guid id, int page = 0, int count = 25)
+    {
+        using var context = new DatabaseContext(_connectionString);
+        return context.Subscriptions.Where(f => f.DiscordWebHookId.Equals(id)).Skip(page * count).ToList();
+    }
+
+    public SubscriptionEntity GetById(Guid id)
+    {
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Subscriptions
+            .FirstOrDefault(f => f.Id.Equals(id));
+        return res ??= new SubscriptionEntity();
+    }
+
+    public SubscriptionEntity GetByWebhookAndSource(Guid webhookId, Guid sourceId)
+    {
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Subscriptions
+            .Where(f => f.DiscordWebHookId.Equals(webhookId))
+            .FirstOrDefault(f => f.SourceId.Equals(sourceId));
+        return res ??= new SubscriptionEntity();
+    }
+
+    public void Delete(Guid id)
+    {
+        using var context = new DatabaseContext(_connectionString);
+        var res = context.Subscriptions.FirstOrDefault(f => f.Id.Equals(id));
+        if (res is null)
+        {
+            return;
+        }
+
+        context.Subscriptions.Remove(res);
+        context.SaveChanges();
+
+    }
+
+    private IDbConnection OpenConnection(string connectionString)
+    {
+        var conn = new NpgsqlConnection(_connectionString);
+        conn.Open();
+        return conn;
+    }
+}

Newsbot.Collector.Database/Repositories/UserSourceSubscriptionTable.cs

@@ -1,26 +0,0 @@
-using Newsbot.Collector.Domain.Entities;
-using Newsbot.Collector.Domain.Interfaces;
-
-namespace Newsbot.Collector.Database.Repositories;
-
-public class UserSourceSubscriptionTable : IUserSourceSubscription
-{
-    private DatabaseContext _context;
-
-    public UserSourceSubscriptionTable(string connectionString)
-    {
-        _context = new DatabaseContext(connectionString);
-    }
-
-    public UserSourceSubscriptionTable(DatabaseContext context)
-    {
-        _context = context;
-    }
-
-    public List<UserSourceSubscriptionEntity> ListUserSubscriptions(Guid userId)
-    {
-        var results =_context.UserSourceSubscription.Where(i => i.UserId.Equals(userId)).ToList();
-        return results;
-    }
-}
-

Newsbot.Collector.Domain/Dto/SubscriptionDetailsDto.cs

@@ -3,7 +3,7 @@ using Newsbot.Collector.Domain.Models;
 
 namespace Newsbot.Collector.Domain.Dto;
 
-public class DiscordNotificationDetailsDto
+public class SubscriptionDetailsDto
 {
     public Guid Id { get; set; }
     public bool CodeAllowReleases { get; set; }
@@ -11,14 +11,14 @@ public class DiscordNotificationDetailsDto
     public SourceDto? Source { get; set; }
     public DiscordWebHookDto? DiscordWebHook { get; set; }
 
-    public static DiscordNotificationDetailsDto Convert(DiscordNotificationEntity discordNotification, SourceEntity source,
+    public static SubscriptionDetailsDto Convert(SubscriptionEntity subscription, SourceEntity source,
         DiscordWebhookEntity discord)
     {
-        return new DiscordNotificationDetailsDto
+        return new SubscriptionDetailsDto
         {
-            Id = discordNotification.Id,
-            CodeAllowCommits = discordNotification.CodeAllowCommits,
-            CodeAllowReleases = discordNotification.CodeAllowReleases,
+            Id = subscription.Id,
+            CodeAllowCommits = subscription.CodeAllowCommits,
+            CodeAllowReleases = subscription.CodeAllowReleases,
             Source = SourceDto.Convert(source),
             DiscordWebHook = DiscordWebHookDto.Convert(discord)
         };

Newsbot.Collector.Domain/Dto/SubscriptionDto.cs

@@ -3,7 +3,7 @@ using Newsbot.Collector.Domain.Models;
 
 namespace Newsbot.Collector.Domain.Dto;
 
-public class DiscordNotificationDto
+public class SubscriptionDto
 {
     public Guid Id { get; set; }
     public Guid SourceId { get; set; }
@@ -11,9 +11,9 @@ public class DiscordNotificationDto
     public bool CodeAllowReleases { get; set; }
     public bool CodeAllowCommits { get; set; }
 
-    public static DiscordNotificationDto Convert(DiscordNotificationEntity model)
+    public static SubscriptionDto Convert(SubscriptionEntity model)
     {
-        return new DiscordNotificationDto
+        return new SubscriptionDto
         {
             Id = model.Id,
             SourceId = model.SourceId,

Newsbot.Collector.Domain/Dto/UserNewDto.cs

@@ -1,7 +0,0 @@
-namespace Newsbot.Collector.Domain.Dto;
-
-public class UserNewDto
-{
-    public string? Username { get; set; }
-    public string? Password { get; set; }
-}

Newsbot.Collector.Domain/Entities/SubscriptionEntity.cs

@@ -1,9 +1,6 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.AspNetCore.Identity;
-
 namespace Newsbot.Collector.Domain.Entities;
 
-public class DiscordNotificationEntity
+public class SubscriptionEntity
 {
     public Guid Id { get; set; }
     public bool CodeAllowReleases { get; set; }
@@ -11,8 +8,4 @@ public class DiscordNotificationEntity
     
     public Guid SourceId { get; set; }
     public Guid DiscordWebHookId { get; set; }
-    
-    public string? UserId { get; set; }
-    //[ForeignKey(nameof(UserId))]
-    //public IdentityUser User { get; set; }
 }

Newsbot.Collector.Domain/Entities/UserSourceSubscriptionEntity.cs

@@ -1,20 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.AspNetCore.Identity;
-
-namespace Newsbot.Collector.Domain.Entities;
-
-/// <summary>
-/// This defines the sources a user will want to see as a feed.
-/// </summary>
-public class UserSourceSubscriptionEntity
-{
-    [Key]
-    public Guid Id { get; set; }
-    public Guid SourceId { get; set; }
-    public DateTimeOffset DateAdded { get; set; }
-    
-    public string? UserId { get; set; }
-    [ForeignKey(nameof(UserId))]
-    public IdentityUser? User { get; set; }
-}

Newsbot.Collector.Domain/Interfaces/IDiscordNotificationClient.cs

@@ -2,7 +2,7 @@ using Newsbot.Collector.Domain.Models;
 
 namespace Newsbot.Collector.Domain.Interfaces;
 
-public interface IDiscordClient
+public interface IDiscordNotificatioClient
 {
     void SendMessage(DiscordMessage payload);
 }

Newsbot.Collector.Domain/Interfaces/IDiscordNotificationRepository.cs

@@ -1,18 +0,0 @@
-using Newsbot.Collector.Domain.Entities;
-using Newsbot.Collector.Domain.Models;
-
-namespace Newsbot.Collector.Domain.Interfaces;
-
-public interface IDiscordNotificationRepository
-{
-    DiscordNotificationEntity New(DiscordNotificationEntity model);
-
-    List<DiscordNotificationEntity> List(int page = 0, int count = 25);
-    List<DiscordNotificationEntity> ListBySourceId(Guid id, int page = 0, int count = 25);
-    List<DiscordNotificationEntity> ListByWebhook(Guid id, int page = 0, int count = 25);
-
-    DiscordNotificationEntity GetById(Guid id);
-    DiscordNotificationEntity GetByWebhookAndSource(Guid webhookId, Guid sourceId);
-
-    void Delete(Guid id);
-}

Newsbot.Collector.Domain/Interfaces/ISubscriptionsRepository.cs

@@ -0,0 +1,18 @@
+using Newsbot.Collector.Domain.Entities;
+using Newsbot.Collector.Domain.Models;
+
+namespace Newsbot.Collector.Domain.Interfaces;
+
+public interface ISubscriptionRepository
+{
+    SubscriptionEntity New(SubscriptionEntity model);
+
+    List<SubscriptionEntity> List(int page = 0, int count = 25);
+    List<SubscriptionEntity> ListBySourceId(Guid id, int page = 0, int count = 25);
+    List<SubscriptionEntity> ListByWebhook(Guid id, int page = 0, int count = 25);
+
+    SubscriptionEntity GetById(Guid id);
+    SubscriptionEntity GetByWebhookAndSource(Guid webhookId, Guid sourceId);
+
+    void Delete(Guid id);
+}

Newsbot.Collector.Domain/Interfaces/IUserSourceSubscription.cs

@@ -1,8 +0,0 @@
-using Newsbot.Collector.Domain.Entities;
-
-namespace Newsbot.Collector.Domain.Interfaces;
-
-public interface IUserSourceSubscription
-{
-    List<UserSourceSubscriptionEntity> ListUserSubscriptions(Guid userId);
-}

Newsbot.Collector.Domain/Models/Config/ConfigSectionRedditModel.cs

@@ -1,4 +1,4 @@
-namespace Newsbot.Collector.Domain.Models.Config.Sources;
+namespace Newsbot.Collector.Domain.Models.Config;
 
 public class ConfigSectionRedditModel
 {

Newsbot.Collector.Domain/Models/Config/ConfigSectionRssModel.cs

@@ -1,4 +1,4 @@
-namespace Newsbot.Collector.Domain.Models.Config.Sources;
+namespace Newsbot.Collector.Domain.Models.Config;
 
 public class ConfigSectionRssModel
 {

Newsbot.Collector.Domain/Models/Config/ConfigSectionYoutubeModel.cs

@@ -1,4 +1,4 @@
-namespace Newsbot.Collector.Domain.Models.Config.Sources;
+namespace Newsbot.Collector.Domain.Models.Config;
 
 public class ConfigSectionYoutubeModel
 {

Newsbot.Collector.Domain/Models/Config/JwtSettings.cs

@@ -1,6 +0,0 @@
-namespace Newsbot.Collector.Domain.Models.Config;
-
-public class JwtSettings
-{
-    public string? Secret { get; set; }
-}

Newsbot.Collector.Domain/Newsbot.Collector.Domain.csproj

@@ -7,9 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.8" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 

Newsbot.Collector.Services/HtmlParser/HtmlPageReader.cs

@@ -36,20 +36,12 @@ public class HtmlPageReader
     private string ReadSiteContent(string url)
     {
         using var client = new HttpClient();
-        try
-        {
         var html = client.GetStringAsync(url);
         html.Wait();
 
         var content = html.Result;
         return content;
     }
-        catch (Exception ex)
-        {
-            Console.WriteLine($"Failed to connect to '{url}'. {ex.Message}");
-            return "";
-        }
-    }
 
     public string GetSiteContent()
     {

Newsbot.Collector.Services/Jobs/DiscordNotificationJob.cs

@@ -1,4 +1,3 @@
-using Newsbot.Collector.Database;
 using Newsbot.Collector.Database.Repositories;
 using Newsbot.Collector.Domain.Entities;
 using Newsbot.Collector.Domain.Interfaces;
@@ -33,13 +32,13 @@ public class DiscordNotificationJobOptions
 public class DiscordNotificationJob
 {
     private const string JobName = "DiscordNotifications";
-    private ILogger _logger;
-    //private DatabaseContext _databaseContext;
     private IArticlesRepository _article;
     private IIconsRepository _icons;
+    private ILogger _logger;
+
     private IDiscordQueueRepository _queue;
     private ISourcesRepository _sources;
-    private IDiscordNotificationRepository _subs;
+    private ISubscriptionRepository _subs;
     private IDiscordWebHooksRepository _webhook;
 
     public DiscordNotificationJob()
@@ -48,19 +47,18 @@ public class DiscordNotificationJob
         _article = new ArticlesTable("");
         _webhook = new DiscordWebhooksTable("");
         _sources = new SourcesTable("");
-        _subs = new DiscordNotificationTable("");
+        _subs = new SubscriptionsTable("");
         _icons = new IconsTable("");
         _logger = JobLogger.GetLogger("", JobName);
     }
 
     public void InitAndExecute(DiscordNotificationJobOptions options)
     {
-        //_databaseContext = new DatabaseContext(options.ConnectionString ?? "");
         _queue = new DiscordQueueTable(options.ConnectionString ?? "");
         _article = new ArticlesTable(options.ConnectionString ?? "");
         _webhook = new DiscordWebhooksTable(options.ConnectionString ?? "");
         _sources = new SourcesTable(options.ConnectionString ?? "");
-        _subs = new DiscordNotificationTable(options.ConnectionString ?? "");
+        _subs = new SubscriptionsTable(options.ConnectionString ?? "");
         _icons = new IconsTable(options.ConnectionString ?? "");
 
         _logger = JobLogger.GetLogger(options.OpenTelemetry ?? "", JobName);
@@ -78,7 +76,6 @@ public class DiscordNotificationJob
     private void Execute()
     {
         //collect all the new requests
-        
         var requests = _queue.List(100);
         _logger.Debug($"{JobName} - Collected {requests.Count} items to send");
 
@@ -124,7 +121,7 @@ public class DiscordNotificationJob
         _queue.Delete(request.Id);
     }
 
-    public void SendSubscriptionNotification(Guid requestId, ArticlesEntity articleDetails, SourceEntity sourceDetails, IconEntity sourceIcon, DiscordNotificationEntity sub)
+    public void SendSubscriptionNotification(Guid requestId, ArticlesEntity articleDetails, SourceEntity sourceDetails, IconEntity sourceIcon, SubscriptionEntity sub)
     {
         // Check if the subscription code flags
         // If the article is a code commit and the subscription does not want them, skip.
@@ -137,7 +134,7 @@ public class DiscordNotificationJob
         var discordDetails = _webhook.GetById(sub.DiscordWebHookId);
         if (discordDetails.Enabled == false) return;
 
-        var client = new DiscordClient(discordDetails.Url);
+        var client = new DiscordWebhookClient(discordDetails.Url);
         try
         {
             client.SendMessage(GenerateDiscordMessage(sourceDetails, articleDetails, sourceIcon));

Newsbot.Collector.Services/Notifications/Discord/DiscordWebhookClient.cs

@@ -6,16 +6,16 @@ using Newtonsoft.Json;
 
 namespace Newsbot.Collector.Services.Notifications.Discord;
 
-public class DiscordClient : IDiscordClient
+public class DiscordWebhookClient : IDiscordNotificatioClient
 {
     private readonly string[] _webhooks;
 
-    public DiscordClient(string webhook)
+    public DiscordWebhookClient(string webhook)
     {
         _webhooks = new[] { webhook };
     }
 
-    public DiscordClient(string[] webhooks)
+    public DiscordWebhookClient(string[] webhooks)
     {
         _webhooks = webhooks;
     }

Newsbot.Collector.Tests/Jobs/DiscordNotificationJobTest.cs

@@ -10,7 +10,7 @@ public class DiscordNotificationJobTest
     public void PostTestMessage()
     {
         var uri = "";
-        var webhookClient = new DiscordClient(uri);
+        var webhookClient = new DiscordWebhookClient(uri);
 
         var client = new DiscordNotificationJob();
         var msg = client.GenerateDiscordMessage(new SourceEntity
@@ -78,7 +78,7 @@ public class DiscordNotificationJobTest
                     Id = Guid.NewGuid(),
                     FileName = "https://www.redditstatic.com/desktop2x/img/favicon/android-icon-192x192.png"
                 },
-                new DiscordNotificationEntity
+                new SubscriptionEntity
                 {
                     CodeAllowCommits = false,
                     CodeAllowReleases = true

Newsbot.Collector.Tests/Tables/ArticlesTableTests.cs

@@ -23,8 +23,7 @@ public class ArticlesTableTests
     public void ArticlesListTest()
     {
         var cfg = GetConfiguration();
-        var dbconn = cfg.GetConnectionString("Database");
-        var client = new ArticlesTable(dbconn ?? "");
+        var client = new ArticlesTable(cfg);
         client.List(0, 25);
     }
 
@@ -34,8 +33,7 @@ public class ArticlesTableTests
         var uid = Guid.Parse("4ac46772-253c-4c3d-8a2c-29239abd2ad4");
 
         var cfg = GetConfiguration();
-        var dbconn = cfg.GetConnectionString("Database");
-        var client = new ArticlesTable(dbconn ?? "");
+        var client = new ArticlesTable(cfg);
         var res = client.GetById(uid);
         if (!res.Id.Equals(uid))
         {
@@ -47,8 +45,7 @@ public class ArticlesTableTests
     public void NewRecordTest()
     {
         var cfg = GetConfiguration();
-        var dbconn = cfg.GetConnectionString("Database");
-        var client = new ArticlesTable(dbconn ?? "");
+        var client = new ArticlesTable(cfg);
         var m = new ArticlesEntity
         {
             Id = Guid.NewGuid(),

Newsbot.Collector.Tests/Tables/DiscordQueueTableTests.cs

@@ -1,16 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Newsbot.Collector.Database.Repositories;
-using Newsbot.Collector.Domain.Consts;
-
-namespace Newsbot.Collector.Tests.Tables;
-
-public class DiscordQueueTableTests
-{
-    [Fact]
-    public void TableListsData()
-    {
-        var str = TestHelper.LoadConfig().GetConnectionString("Database") ?? "";
-        var context = new DiscordQueueTable(str);
-        var results = context.List();
-    }
-}