Compare commits
No commits in common. "7b1407c2cbb3c4587d43e1b36aa709f09523ba5b" and "c25cafb0a780b025278ed5c3e0344f22444c6a92" have entirely different histories.
7b1407c2cb
...
c25cafb0a7
@ -1,7 +1,6 @@
|
|||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
|
using Newsbot.Collector.Database.Repositories;
|
||||||
using Newsbot.Collector.Domain.Dto;
|
using Newsbot.Collector.Domain.Dto;
|
||||||
using Newsbot.Collector.Domain.Interfaces;
|
using Newsbot.Collector.Domain.Interfaces;
|
||||||
using Newsbot.Collector.Domain.Models;
|
using Newsbot.Collector.Domain.Models;
|
||||||
@ -10,18 +9,17 @@ namespace Newsbot.Collector.Api.Controllers;
|
|||||||
|
|
||||||
[ApiController]
|
[ApiController]
|
||||||
[Route("api/articles")]
|
[Route("api/articles")]
|
||||||
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
|
|
||||||
public class ArticlesController : ControllerBase
|
public class ArticlesController : ControllerBase
|
||||||
{
|
{
|
||||||
private readonly ILogger<ArticlesController> _logger;
|
|
||||||
private readonly IArticlesRepository _articles;
|
private readonly IArticlesRepository _articles;
|
||||||
|
private readonly ILogger<ArticlesController> _logger;
|
||||||
private readonly ISourcesRepository _sources;
|
private readonly ISourcesRepository _sources;
|
||||||
|
|
||||||
public ArticlesController(ILogger<ArticlesController> logger, IArticlesRepository articles, ISourcesRepository sources)
|
public ArticlesController(ILogger<ArticlesController> logger, IOptions<ConnectionStrings> settings)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_articles = articles;
|
_articles = new ArticlesTable(settings.Value.Database);
|
||||||
_sources = sources;
|
_sources = new SourcesTable(settings.Value.Database);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet(Name = "GetArticles")]
|
[HttpGet(Name = "GetArticles")]
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
using Hangfire;
|
using Hangfire;
|
||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Newsbot.Collector.Domain.Models.Config;
|
using Newsbot.Collector.Domain.Models.Config;
|
||||||
@ -10,7 +8,6 @@ namespace Newsbot.Collector.Api.Controllers;
|
|||||||
|
|
||||||
[ApiController]
|
[ApiController]
|
||||||
[Route("api/codeprojects")]
|
[Route("api/codeprojects")]
|
||||||
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
|
|
||||||
public class CodeProjectController
|
public class CodeProjectController
|
||||||
{
|
{
|
||||||
private readonly ConfigSectionConnectionStrings _connectionStrings;
|
private readonly ConfigSectionConnectionStrings _connectionStrings;
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
using System.Net;
|
using System.Net;
|
||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Newsbot.Collector.Database.Repositories;
|
using Newsbot.Collector.Database.Repositories;
|
||||||
@ -13,16 +11,17 @@ namespace Newsbot.Collector.Api.Controllers;
|
|||||||
|
|
||||||
[ApiController]
|
[ApiController]
|
||||||
[Route("api/discord/webhooks")]
|
[Route("api/discord/webhooks")]
|
||||||
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
|
|
||||||
public class DiscordWebHookController : ControllerBase
|
public class DiscordWebHookController : ControllerBase
|
||||||
{
|
{
|
||||||
private readonly ILogger<DiscordWebHookController> _logger;
|
private readonly ILogger<DiscordWebHookController> _logger;
|
||||||
|
private readonly ConnectionStrings _settings;
|
||||||
private readonly IDiscordWebHooksRepository _webhooks;
|
private readonly IDiscordWebHooksRepository _webhooks;
|
||||||
|
|
||||||
public DiscordWebHookController(ILogger<DiscordWebHookController> logger, IOptions<ConnectionStrings> settings, IDiscordWebHooksRepository webhooks)
|
public DiscordWebHookController(ILogger<DiscordWebHookController> logger, IOptions<ConnectionStrings> settings)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_webhooks = webhooks;
|
_settings = settings.Value;
|
||||||
|
_webhooks = new DiscordWebhooksTable(_settings.Database);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet(Name = "GetDiscordWebhooks")]
|
[HttpGet(Name = "GetDiscordWebhooks")]
|
||||||
|
@ -1,17 +1,13 @@
|
|||||||
using Hangfire;
|
using Hangfire;
|
||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Newsbot.Collector.Domain.Models.Config;
|
using Newsbot.Collector.Domain.Models.Config;
|
||||||
using Newsbot.Collector.Domain.Models.Config.Sources;
|
|
||||||
using Newsbot.Collector.Services.Jobs;
|
using Newsbot.Collector.Services.Jobs;
|
||||||
|
|
||||||
namespace Newsbot.Collector.Api.Controllers;
|
namespace Newsbot.Collector.Api.Controllers;
|
||||||
|
|
||||||
[ApiController]
|
[ApiController]
|
||||||
[Route("api/rss")]
|
[Route("api/rss")]
|
||||||
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
|
|
||||||
public class RssController
|
public class RssController
|
||||||
{
|
{
|
||||||
private readonly ConfigSectionConnectionStrings _connectionStrings;
|
private readonly ConfigSectionConnectionStrings _connectionStrings;
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Newsbot.Collector.Database.Repositories;
|
using Newsbot.Collector.Database.Repositories;
|
||||||
@ -14,18 +12,22 @@ namespace Newsbot.Collector.Api.Controllers;
|
|||||||
|
|
||||||
[ApiController]
|
[ApiController]
|
||||||
[Route("api/sources")]
|
[Route("api/sources")]
|
||||||
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
|
|
||||||
public class SourcesController : ControllerBase
|
public class SourcesController : ControllerBase
|
||||||
{
|
{
|
||||||
private readonly ILogger<SourcesController> _logger;
|
private readonly IArticlesRepository _articles;
|
||||||
|
|
||||||
|
//private readonly ConnectionStrings _settings;
|
||||||
private readonly IIconsRepository _icons;
|
private readonly IIconsRepository _icons;
|
||||||
|
private readonly ILogger<SourcesController> _logger;
|
||||||
private readonly ISourcesRepository _sources;
|
private readonly ISourcesRepository _sources;
|
||||||
|
|
||||||
public SourcesController(ILogger<SourcesController> logger, IIconsRepository icons, ISourcesRepository sources)
|
public SourcesController(ILogger<SourcesController> logger, IOptions<ConnectionStrings> settings)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_icons = icons;
|
//_settings = settings.Value;
|
||||||
_sources = sources;
|
_sources = new SourcesTable(settings.Value.Database);
|
||||||
|
_icons = new IconsTable(settings.Value.Database);
|
||||||
|
_articles = new ArticlesTable(settings.Value.Database);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet(Name = "GetSources")]
|
[HttpGet(Name = "GetSources")]
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Newsbot.Collector.Database.Repositories;
|
using Newsbot.Collector.Database.Repositories;
|
||||||
@ -12,20 +10,19 @@ namespace Newsbot.Collector.Api.Controllers;
|
|||||||
|
|
||||||
[ApiController]
|
[ApiController]
|
||||||
[Route("api/subscriptions")]
|
[Route("api/subscriptions")]
|
||||||
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
|
|
||||||
public class SubscriptionsController : ControllerBase
|
public class SubscriptionsController : ControllerBase
|
||||||
{
|
{
|
||||||
private readonly ILogger<SubscriptionsController> _logger;
|
|
||||||
private readonly IDiscordWebHooksRepository _discord;
|
private readonly IDiscordWebHooksRepository _discord;
|
||||||
|
private readonly ILogger<SubscriptionsController> _logger;
|
||||||
private readonly ISourcesRepository _sources;
|
private readonly ISourcesRepository _sources;
|
||||||
private readonly ISubscriptionRepository _subscription;
|
private readonly ISubscriptionRepository _subscription;
|
||||||
|
|
||||||
public SubscriptionsController(ILogger<SubscriptionsController> logger, IDiscordWebHooksRepository discord, ISourcesRepository sources, ISubscriptionRepository subscription)
|
public SubscriptionsController(ILogger<SubscriptionsController> logger, IOptions<ConnectionStrings> settings)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_discord = discord;
|
_subscription = new SubscriptionsTable(settings.Value.Database);
|
||||||
_sources = sources;
|
_discord = new DiscordWebhooksTable(settings.Value.Database);
|
||||||
_subscription = subscription;
|
_sources = new SourcesTable(settings.Value.Database);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet(Name = "ListSubscriptions")]
|
[HttpGet(Name = "ListSubscriptions")]
|
||||||
|
@ -1,10 +1,7 @@
|
|||||||
using Hangfire;
|
using Hangfire;
|
||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Newsbot.Collector.Domain.Models.Config;
|
using Newsbot.Collector.Domain.Models.Config;
|
||||||
using Newsbot.Collector.Domain.Models.Config.Sources;
|
|
||||||
using Newsbot.Collector.Services.Jobs;
|
using Newsbot.Collector.Services.Jobs;
|
||||||
using ILogger = Grpc.Core.Logging.ILogger;
|
using ILogger = Grpc.Core.Logging.ILogger;
|
||||||
|
|
||||||
@ -12,7 +9,6 @@ namespace Newsbot.Collector.Api.Controllers;
|
|||||||
|
|
||||||
[ApiController]
|
[ApiController]
|
||||||
[Route("api/youtube")]
|
[Route("api/youtube")]
|
||||||
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
|
|
||||||
public class YoutubeController
|
public class YoutubeController
|
||||||
{
|
{
|
||||||
private readonly ILogger<YoutubeController> _logger;
|
private readonly ILogger<YoutubeController> _logger;
|
||||||
|
@ -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; }
|
|
||||||
|
|
||||||
}
|
|
@ -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; }
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
namespace Newsbot.Collector.Api.Domain.Response;
|
|
||||||
|
|
||||||
public class AuthFailedResponse
|
|
||||||
{
|
|
||||||
public IEnumerable<string>? Errors { get; set; }
|
|
||||||
}
|
|
@ -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; }
|
|
||||||
}
|
|
@ -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; }
|
|
||||||
}
|
|
@ -13,7 +13,6 @@
|
|||||||
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
|
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
|
||||||
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.33" />
|
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.33" />
|
||||||
<PackageReference Include="Hangfire.MemoryStorage" Version="1.7.0" />
|
<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.AspNetCore.OpenApi" Version="7.0.0" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
|
||||||
@ -37,8 +36,4 @@
|
|||||||
<ProjectReference Include="..\Newsbot.Collector.Database\Newsbot.Collector.Database.csproj" />
|
<ProjectReference Include="..\Newsbot.Collector.Database\Newsbot.Collector.Database.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Folder Include="Controllers\v1\" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -1,24 +1,14 @@
|
|||||||
using System.Text;
|
|
||||||
using Hangfire;
|
using Hangfire;
|
||||||
using Hangfire.MemoryStorage;
|
using Hangfire.MemoryStorage;
|
||||||
using HealthChecks.UI.Client;
|
using HealthChecks.UI.Client;
|
||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
|
||||||
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
|
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
|
||||||
using Microsoft.AspNetCore.Identity;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.IdentityModel.Tokens;
|
|
||||||
using Microsoft.OpenApi.Models;
|
using Microsoft.OpenApi.Models;
|
||||||
using Newsbot.Collector.Api;
|
using Newsbot.Collector.Api;
|
||||||
using Newsbot.Collector.Api.Authentication;
|
using Newsbot.Collector.Api.Authentication;
|
||||||
using Newsbot.Collector.Api.Services;
|
|
||||||
using Newsbot.Collector.Database;
|
using Newsbot.Collector.Database;
|
||||||
using Newsbot.Collector.Database.Repositories;
|
|
||||||
using Newsbot.Collector.Domain.Consts;
|
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;
|
||||||
using Newsbot.Collector.Domain.Models.Config;
|
using Newsbot.Collector.Domain.Models.Config;
|
||||||
using Newsbot.Collector.Domain.Models.Config.Sources;
|
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using Serilog.Events;
|
using Serilog.Events;
|
||||||
using ILogger = Serilog.ILogger;
|
using ILogger = Serilog.ILogger;
|
||||||
@ -33,76 +23,30 @@ var config = GetConfiguration();
|
|||||||
builder.Configuration.AddConfiguration(config);
|
builder.Configuration.AddConfiguration(config);
|
||||||
|
|
||||||
Log.Logger = GetLogger(config);
|
Log.Logger = GetLogger(config);
|
||||||
|
|
||||||
Log.Information("Starting up");
|
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<ISubscriptionRepository, SubscriptionsTable>();
|
|
||||||
|
|
||||||
// Configure Identity
|
|
||||||
builder.Services.AddScoped<IIdentityService, IdentityService>();
|
|
||||||
|
|
||||||
// Configure Hangfire
|
// Configure Hangfire
|
||||||
builder.Services.AddHangfire(f => f.UseMemoryStorage());
|
builder.Services.AddHangfire(f => f.UseMemoryStorage());
|
||||||
builder.Services.AddHangfireServer();
|
builder.Services.AddHangfireServer();
|
||||||
GlobalConfiguration.Configuration.UseSerilogLogProvider();
|
GlobalConfiguration.Configuration.UseSerilogLogProvider();
|
||||||
|
|
||||||
// Add Health Checks
|
|
||||||
builder.Services.AddHealthChecks()
|
builder.Services.AddHealthChecks()
|
||||||
.AddNpgSql(config.GetValue<string>(ConfigConnectionStringConst.Database) ?? "");
|
.AddNpgSql(config.GetValue<string>(ConfigConnectionStringConst.Database) ?? "");
|
||||||
|
|
||||||
|
|
||||||
builder.Services.AddControllers();
|
builder.Services.AddControllers();
|
||||||
|
|
||||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||||
builder.Services.AddEndpointsApiExplorer();
|
builder.Services.AddEndpointsApiExplorer();
|
||||||
builder.Services.AddSwaggerGen();
|
builder.Services.AddSwaggerGen();
|
||||||
|
|
||||||
builder.Services.Configure<ConnectionStrings>(config.GetSection("ConnectionStrings"));
|
builder.Services.Configure<ConnectionStrings>(config.GetSection("ConnectionStrings"));
|
||||||
|
|
||||||
builder.Services.Configure<ConfigSectionConnectionStrings>(config.GetSection(ConfigSectionsConst.ConnectionStrings));
|
builder.Services.Configure<ConfigSectionConnectionStrings>(config.GetSection(ConfigSectionsConst.ConnectionStrings));
|
||||||
builder.Services.Configure<ConfigSectionRssModel>(config.GetSection(ConfigSectionsConst.Rss));
|
builder.Services.Configure<ConfigSectionRssModel>(config.GetSection(ConfigSectionsConst.Rss));
|
||||||
builder.Services.Configure<ConfigSectionYoutubeModel>(config.GetSection(ConfigSectionsConst.Youtube));
|
builder.Services.Configure<ConfigSectionYoutubeModel>(config.GetSection(ConfigSectionsConst.Youtube));
|
||||||
//builder.Services.Configure<
|
//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 =>
|
builder.Services.AddSwaggerGen(cfg =>
|
||||||
{
|
{
|
||||||
|
|
||||||
cfg.AddSecurityDefinition("ApiKey", new OpenApiSecurityScheme
|
cfg.AddSecurityDefinition("ApiKey", new OpenApiSecurityScheme
|
||||||
{
|
{
|
||||||
Description = "The API key to access the API",
|
Description = "The API key to access the API",
|
||||||
@ -112,45 +56,23 @@ builder.Services.AddSwaggerGen(cfg =>
|
|||||||
Scheme = "ApiKeyScheme"
|
Scheme = "ApiKeyScheme"
|
||||||
});
|
});
|
||||||
|
|
||||||
cfg.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
|
var scheme = 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
|
|
||||||
{
|
{
|
||||||
Reference = new OpenApiReference
|
Reference = new OpenApiReference
|
||||||
{
|
{
|
||||||
Type = ReferenceType.SecurityScheme,
|
Type = ReferenceType.SecurityScheme,
|
||||||
Id = "Bearer"
|
Id = "ApiKey"
|
||||||
},
|
},
|
||||||
Scheme = "oauth2",
|
|
||||||
Name = "Bearer",
|
|
||||||
In = ParameterLocation.Header
|
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();
|
var app = builder.Build();
|
||||||
|
|
||||||
@ -166,10 +88,9 @@ app.UseHttpsRedirection();
|
|||||||
app.UseHangfireDashboard();
|
app.UseHangfireDashboard();
|
||||||
BackgroundJobs.SetupRecurringJobs(config);
|
BackgroundJobs.SetupRecurringJobs(config);
|
||||||
|
|
||||||
//app.UseAuthorization();
|
app.UseAuthorization();
|
||||||
app.UseAuthentication();
|
|
||||||
|
|
||||||
//app.UseMiddleware<ApiKeyAuthAuthentication>();
|
app.UseMiddleware<ApiKeyAuthAuthentication>();
|
||||||
|
|
||||||
app.MapHealthChecks("/health", new HealthCheckOptions
|
app.MapHealthChecks("/health", new HealthCheckOptions
|
||||||
{
|
{
|
||||||
|
@ -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)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,5 +1,3 @@
|
|||||||
using Microsoft.AspNetCore.Identity;
|
|
||||||
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Newsbot.Collector.Domain.Consts;
|
using Newsbot.Collector.Domain.Consts;
|
||||||
@ -7,7 +5,7 @@ using Newsbot.Collector.Domain.Entities;
|
|||||||
|
|
||||||
namespace Newsbot.Collector.Database;
|
namespace Newsbot.Collector.Database;
|
||||||
|
|
||||||
public class DatabaseContext : IdentityDbContext
|
public class DatabaseContext : DbContext
|
||||||
{
|
{
|
||||||
public DbSet<ArticlesEntity> Articles { get; set; } = null!;
|
public DbSet<ArticlesEntity> Articles { get; set; } = null!;
|
||||||
public DbSet<DiscordQueueEntity> DiscordQueue { get; set; } = null!;
|
public DbSet<DiscordQueueEntity> DiscordQueue { get; set; } = null!;
|
||||||
@ -16,50 +14,37 @@ public class DatabaseContext : IdentityDbContext
|
|||||||
public DbSet<SourceEntity> Sources { get; set; } = null!;
|
public DbSet<SourceEntity> Sources { get; set; } = null!;
|
||||||
public DbSet<SubscriptionEntity> Subscriptions { get; set; } = null!;
|
public DbSet<SubscriptionEntity> Subscriptions { get; set; } = null!;
|
||||||
|
|
||||||
//public DbSet<UserEntity> Users { get; set; } = null!;
|
private string ConnectionString { get; set; }
|
||||||
|
|
||||||
private string ConnectionString { get; set; } = "";
|
public DatabaseContext(IConfiguration appsettings, string connectionString)
|
||||||
|
{
|
||||||
//public DatabaseContext(IConfiguration appsettings, string connectionString)
|
var connString = appsettings.GetConnectionString(ConfigConnectionStringConst.Database);
|
||||||
//{
|
ConnectionString = connString ?? "";
|
||||||
// var connString = appsettings.GetConnectionString(ConfigConnectionStringConst.Database);
|
}
|
||||||
// ConnectionString = connString ?? "";
|
|
||||||
//}
|
|
||||||
|
|
||||||
public DatabaseContext(string connectionString)
|
public DatabaseContext(string connectionString)
|
||||||
{
|
{
|
||||||
ConnectionString = connectionString;
|
ConnectionString = connectionString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public DatabaseContext(DbContextOptions<DatabaseContext> connectionString)
|
||||||
|
{
|
||||||
|
ConnectionString = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
public DatabaseContext()
|
||||||
|
{
|
||||||
|
ConnectionString = "";
|
||||||
|
}
|
||||||
|
|
||||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||||
{
|
|
||||||
if (ConnectionString != "")
|
|
||||||
{
|
{
|
||||||
options.UseNpgsql(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)
|
public DatabaseContext(DbContextOptions<DatabaseContext> options, string connectionString)
|
||||||
: base(options)
|
: base(options)
|
||||||
{
|
{
|
||||||
//ConnectionString = connectionString;
|
ConnectionString = connectionString;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -17,207 +17,11 @@ namespace Newsbot.Collector.Database.Migrations
|
|||||||
{
|
{
|
||||||
#pragma warning disable 612, 618
|
#pragma warning disable 612, 618
|
||||||
modelBuilder
|
modelBuilder
|
||||||
.HasAnnotation("ProductVersion", "7.0.8")
|
.HasAnnotation("ProductVersion", "7.0.7")
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||||
|
|
||||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
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 =>
|
modelBuilder.Entity("Newsbot.Collector.Domain.Entities.ArticlesEntity", b =>
|
||||||
{
|
{
|
||||||
b.Property<Guid>("Id")
|
b.Property<Guid>("Id")
|
||||||
@ -410,57 +214,6 @@ namespace Newsbot.Collector.Database.Migrations
|
|||||||
|
|
||||||
b.ToTable("Subscriptions");
|
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
|
#pragma warning restore 612, 618
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="dapper" Version="2.0.123" />
|
<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" Version="7.0.8" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
@ -11,34 +11,29 @@ namespace Newsbot.Collector.Database.Repositories;
|
|||||||
|
|
||||||
public class ArticlesTable : IArticlesRepository
|
public class ArticlesTable : IArticlesRepository
|
||||||
{
|
{
|
||||||
//private readonly string _connectionString;
|
private readonly string _connectionString;
|
||||||
|
|
||||||
private DatabaseContext _context;
|
private DatabaseContext _context;
|
||||||
|
|
||||||
public ArticlesTable(string connectionString)
|
public ArticlesTable(string connectionString)
|
||||||
{
|
{
|
||||||
//_connectionString = connectionString;
|
_connectionString = connectionString;
|
||||||
_context = new DatabaseContext(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)
|
_connectionString = conn;
|
||||||
//{
|
_context = new DatabaseContext(conn);
|
||||||
// var conn = configuration.GetConnectionString("database");
|
}
|
||||||
// if (conn is null) conn = "";
|
|
||||||
//
|
|
||||||
// _context = new DatabaseContext(conn);
|
|
||||||
//}
|
|
||||||
|
|
||||||
public List<ArticlesEntity> List(int page = 0, int count = 25)
|
public List<ArticlesEntity> List(int page = 0, int count = 25)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
|
var query = context.Articles
|
||||||
var query = _context.Articles
|
|
||||||
.Skip(page * count)
|
.Skip(page * count)
|
||||||
.OrderBy(d => d.PubDate)
|
.OrderBy(d => d.PubDate)
|
||||||
.Take(25);
|
.Take(25);
|
||||||
@ -48,8 +43,8 @@ public class ArticlesTable : IArticlesRepository
|
|||||||
|
|
||||||
public ArticlesEntity GetById(Guid id)
|
public ArticlesEntity GetById(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var query = _context.Articles
|
var query = context.Articles
|
||||||
.FirstOrDefault(d => d.Id.Equals(id));
|
.FirstOrDefault(d => d.Id.Equals(id));
|
||||||
query ??= new ArticlesEntity();
|
query ??= new ArticlesEntity();
|
||||||
return query;
|
return query;
|
||||||
@ -57,16 +52,16 @@ public class ArticlesTable : IArticlesRepository
|
|||||||
|
|
||||||
public ArticlesEntity GetByUrl(string url)
|
public ArticlesEntity GetByUrl(string url)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Articles.FirstOrDefault(d => d.Url!.Equals(url));
|
var res = context.Articles.FirstOrDefault(d => d.Url!.Equals(url));
|
||||||
res ??= new ArticlesEntity();
|
res ??= new ArticlesEntity();
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ArticlesEntity> ListBySourceId(Guid id, int page, int count)
|
public List<ArticlesEntity> ListBySourceId(Guid id, int page, int count)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Articles
|
var res = context.Articles
|
||||||
.Skip(page * count)
|
.Skip(page * count)
|
||||||
.Where(d => d.SourceId.Equals(id));
|
.Where(d => d.SourceId.Equals(id));
|
||||||
return res.ToList();
|
return res.ToList();
|
||||||
@ -74,14 +69,13 @@ public class ArticlesTable : IArticlesRepository
|
|||||||
|
|
||||||
public ArticlesEntity New(ArticlesEntity model)
|
public ArticlesEntity New(ArticlesEntity model)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
model.Id = new Guid();
|
model.Id = new Guid();
|
||||||
var query = _context.Articles.Add(model);
|
var query = context.Articles.Add(model);
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
public ArticlesModel NewDapper(ArticlesModel model)
|
public ArticlesModel NewDapper(ArticlesModel model)
|
||||||
{
|
{
|
||||||
model.ID = Guid.NewGuid();
|
model.ID = Guid.NewGuid();
|
||||||
@ -109,27 +103,26 @@ public class ArticlesTable : IArticlesRepository
|
|||||||
});
|
});
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
|
|
||||||
public void DeleteAllBySourceId(Guid sourceId)
|
public void DeleteAllBySourceId(Guid sourceId)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Articles
|
var res = context.Articles
|
||||||
.Where(d => d.SourceId.Equals(sourceId))
|
.Where(d => d.SourceId.Equals(sourceId))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
foreach (var item in res)
|
foreach (var item in res)
|
||||||
{
|
{
|
||||||
_context.Articles.Remove(item);
|
context.Articles.Remove(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
//private IDbConnection OpenConnection(string connectionString)
|
private IDbConnection OpenConnection(string connectionString)
|
||||||
//{
|
{
|
||||||
// //var conn = new NpgsqlConnection(_connectionString);
|
var conn = new NpgsqlConnection(_connectionString);
|
||||||
// //conn.Open();
|
conn.Open();
|
||||||
// //return conn;
|
return conn;
|
||||||
//}
|
}
|
||||||
}
|
}
|
@ -9,49 +9,42 @@ namespace Newsbot.Collector.Database.Repositories;
|
|||||||
|
|
||||||
public class DiscordQueueTable : IDiscordQueueRepository
|
public class DiscordQueueTable : IDiscordQueueRepository
|
||||||
{
|
{
|
||||||
//private string _connectionString;
|
private string _connectionString;
|
||||||
private DatabaseContext _context;
|
|
||||||
|
|
||||||
public DiscordQueueTable(string connectionString)
|
public DiscordQueueTable(string connectionString)
|
||||||
{
|
{
|
||||||
//_connectionString = connectionString;
|
_connectionString = connectionString;
|
||||||
_context = new DatabaseContext(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)
|
public void New(DiscordQueueEntity model)
|
||||||
{
|
{
|
||||||
model.Id = new Guid();
|
model.Id = new Guid();
|
||||||
|
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.DiscordQueue.Add(model);
|
var res = context.DiscordQueue.Add(model);
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Delete(Guid id)
|
public void Delete(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.DiscordQueue.FirstOrDefault(d => d.Id.Equals(id));
|
var res = context.DiscordQueue.FirstOrDefault(d => d.Id.Equals(id));
|
||||||
res ??= new DiscordQueueEntity();
|
res ??= new DiscordQueueEntity();
|
||||||
_context.DiscordQueue.Remove(res);
|
context.DiscordQueue.Remove(res);
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<DiscordQueueEntity> List(int limit = 25)
|
public List<DiscordQueueEntity> List(int limit = 25)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.DiscordQueue.Take(limit).ToList();
|
var res = context.DiscordQueue.Take(limit).ToList();
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -9,50 +9,49 @@ namespace Newsbot.Collector.Database.Repositories;
|
|||||||
|
|
||||||
public class DiscordWebhooksTable : IDiscordWebHooksRepository
|
public class DiscordWebhooksTable : IDiscordWebHooksRepository
|
||||||
{
|
{
|
||||||
//private readonly string _connectionString;
|
private readonly string _connectionString;
|
||||||
private DatabaseContext _context;
|
|
||||||
|
|
||||||
public DiscordWebhooksTable(string connectionString)
|
public DiscordWebhooksTable(string connectionString)
|
||||||
{
|
{
|
||||||
//_connectionString = connectionString;
|
_connectionString = connectionString;
|
||||||
_context = new DatabaseContext(connectionString);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public DiscordWebhooksTable(DatabaseContext context)
|
public DiscordWebhooksTable(IConfiguration configuration)
|
||||||
{
|
{
|
||||||
_context = context;
|
var connstr = configuration.GetConnectionString("database") ?? "";
|
||||||
|
_connectionString = connstr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public DiscordWebhookEntity New(DiscordWebhookEntity model)
|
public DiscordWebhookEntity New(DiscordWebhookEntity model)
|
||||||
{
|
{
|
||||||
model.Id = new Guid();
|
model.Id = new Guid();
|
||||||
|
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
_context.DiscordWebhooks.Add(model);
|
context.DiscordWebhooks.Add(model);
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
public DiscordWebhookEntity GetById(Guid id)
|
public DiscordWebhookEntity GetById(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.DiscordWebhooks.FirstOrDefault(d => d.Id.Equals(id));
|
var res = context.DiscordWebhooks.FirstOrDefault(d => d.Id.Equals(id));
|
||||||
res ??= new DiscordWebhookEntity();
|
res ??= new DiscordWebhookEntity();
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
public DiscordWebhookEntity GetByUrl(string url)
|
public DiscordWebhookEntity GetByUrl(string url)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.DiscordWebhooks.FirstOrDefault(d => d.Url.Equals(url));
|
var res = context.DiscordWebhooks.FirstOrDefault(d => d.Url.Equals(url));
|
||||||
res ??= new DiscordWebhookEntity();
|
res ??= new DiscordWebhookEntity();
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<DiscordWebhookEntity> List(int page, int count = 25)
|
public List<DiscordWebhookEntity> List(int page, int count = 25)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.DiscordWebhooks
|
var res = context.DiscordWebhooks
|
||||||
.Skip(page * count)
|
.Skip(page * count)
|
||||||
.Take(count)
|
.Take(count)
|
||||||
.ToList();
|
.ToList();
|
||||||
@ -62,8 +61,8 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
|
|||||||
|
|
||||||
public List<DiscordWebhookEntity> ListByServer(string server, int limit = 25)
|
public List<DiscordWebhookEntity> ListByServer(string server, int limit = 25)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.DiscordWebhooks
|
var res = context.DiscordWebhooks
|
||||||
.Where(d => d.Server.Equals(server))
|
.Where(d => d.Server.Equals(server))
|
||||||
.Take(limit)
|
.Take(limit)
|
||||||
.ToList();
|
.ToList();
|
||||||
@ -73,8 +72,8 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
|
|||||||
|
|
||||||
public List<DiscordWebhookEntity> ListByServerAndChannel(string server, string channel, int limit = 25)
|
public List<DiscordWebhookEntity> ListByServerAndChannel(string server, string channel, int limit = 25)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.DiscordWebhooks
|
var res = context.DiscordWebhooks
|
||||||
.Where(s => s.Server.Equals(server))
|
.Where(s => s.Server.Equals(server))
|
||||||
.Where(c => c.Channel.Equals(channel))
|
.Where(c => c.Channel.Equals(channel))
|
||||||
.Take(limit)
|
.Take(limit)
|
||||||
@ -86,14 +85,14 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
|
|||||||
public int Disable(Guid id)
|
public int Disable(Guid id)
|
||||||
{
|
{
|
||||||
var res = GetById(id);
|
var res = GetById(id);
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
|
|
||||||
res.Enabled = true;
|
res.Enabled = true;
|
||||||
|
|
||||||
_context.DiscordWebhooks.Update(res);
|
context.DiscordWebhooks.Update(res);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
catch(Exception ex)
|
catch(Exception ex)
|
||||||
@ -106,14 +105,14 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
|
|||||||
public int Enable(Guid id)
|
public int Enable(Guid id)
|
||||||
{
|
{
|
||||||
var res = GetById(id);
|
var res = GetById(id);
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
|
|
||||||
res.Enabled = false;
|
res.Enabled = false;
|
||||||
|
|
||||||
_context.DiscordWebhooks.Update(res);
|
context.DiscordWebhooks.Update(res);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
catch(Exception ex)
|
catch(Exception ex)
|
||||||
@ -123,10 +122,10 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//private IDbConnection OpenConnection(string connectionString)
|
private IDbConnection OpenConnection(string connectionString)
|
||||||
//{
|
{
|
||||||
// var conn = new NpgsqlConnection(_connectionString);
|
var conn = new NpgsqlConnection(_connectionString);
|
||||||
// conn.Open();
|
conn.Open();
|
||||||
// return conn;
|
return conn;
|
||||||
//}
|
}
|
||||||
}
|
}
|
@ -10,49 +10,49 @@ namespace Newsbot.Collector.Database.Repositories;
|
|||||||
|
|
||||||
public class IconsTable : IIconsRepository
|
public class IconsTable : IIconsRepository
|
||||||
{
|
{
|
||||||
//private readonly string _connectionString;
|
private readonly string _connectionString;
|
||||||
private DatabaseContext _context;
|
|
||||||
|
|
||||||
public IconsTable(string connectionString)
|
public IconsTable(string connectionString)
|
||||||
{
|
{
|
||||||
//_connectionString = connectionString;
|
_connectionString = connectionString;
|
||||||
_context = new DatabaseContext(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)
|
public void New(IconEntity model)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
model.Id = Guid.NewGuid();
|
model.Id = Guid.NewGuid();
|
||||||
|
|
||||||
_context.Icons.Add(model);
|
context.Icons.Add(model);
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IconEntity GetById(Guid id)
|
public IconEntity GetById(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Icons.FirstOrDefault(f => f.Id.Equals(id));
|
var res = context.Icons.FirstOrDefault(f => f.Id.Equals(id));
|
||||||
res ??= new IconEntity();
|
res ??= new IconEntity();
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IconEntity GetBySourceId(Guid id)
|
public IconEntity GetBySourceId(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Icons.FirstOrDefault(f => f.SourceId.Equals(id));
|
var res = context.Icons.FirstOrDefault(f => f.SourceId.Equals(id));
|
||||||
res ??= new IconEntity();
|
res ??= new IconEntity();
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
//private IDbConnection OpenConnection(string connectionString)
|
private IDbConnection OpenConnection(string connectionString)
|
||||||
//{
|
{
|
||||||
// var conn = new NpgsqlConnection(_connectionString);
|
var conn = new NpgsqlConnection(_connectionString);
|
||||||
// conn.Open();
|
conn.Open();
|
||||||
// return conn;
|
return conn;
|
||||||
//}
|
}
|
||||||
}
|
}
|
@ -10,28 +10,28 @@ namespace Newsbot.Collector.Database.Repositories;
|
|||||||
|
|
||||||
public class SourcesTable : ISourcesRepository
|
public class SourcesTable : ISourcesRepository
|
||||||
{
|
{
|
||||||
//private readonly string _connectionString;
|
private readonly string _connectionString;
|
||||||
private DatabaseContext _context;
|
|
||||||
|
|
||||||
public SourcesTable(string connectionString)
|
public SourcesTable(string connectionString)
|
||||||
{
|
{
|
||||||
//_connectionString = connectionString;
|
_connectionString = connectionString;
|
||||||
_context = new DatabaseContext(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)
|
public SourceEntity New(SourceEntity model)
|
||||||
{
|
{
|
||||||
model.Id = Guid.NewGuid();
|
model.Id = Guid.NewGuid();
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
_context.Sources.Add(model);
|
context.Sources.Add(model);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@ -43,8 +43,8 @@ public class SourcesTable : ISourcesRepository
|
|||||||
|
|
||||||
public SourceEntity GetById(Guid id)
|
public SourceEntity GetById(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Sources.FirstOrDefault(f => f.Id.Equals(id));
|
var res = context.Sources.FirstOrDefault(f => f.Id.Equals(id));
|
||||||
res ??= new SourceEntity();
|
res ??= new SourceEntity();
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@ -57,16 +57,16 @@ public class SourcesTable : ISourcesRepository
|
|||||||
|
|
||||||
public SourceEntity GetByName(string name)
|
public SourceEntity GetByName(string name)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Sources.FirstOrDefault(f => f.Name.Equals(name));
|
var res = context.Sources.FirstOrDefault(f => f.Name.Equals(name));
|
||||||
res ??= new SourceEntity();
|
res ??= new SourceEntity();
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SourceEntity GetByNameAndType(string name, string type)
|
public SourceEntity GetByNameAndType(string name, string type)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Sources
|
var res = context.Sources
|
||||||
.Where(f => f.Name.Equals(name))
|
.Where(f => f.Name.Equals(name))
|
||||||
.FirstOrDefault(f => f.Type.Equals(type));
|
.FirstOrDefault(f => f.Type.Equals(type));
|
||||||
res ??= new SourceEntity();
|
res ??= new SourceEntity();
|
||||||
@ -75,8 +75,8 @@ public class SourcesTable : ISourcesRepository
|
|||||||
|
|
||||||
public SourceEntity GetByUrl(string url)
|
public SourceEntity GetByUrl(string url)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Sources
|
var res = context.Sources
|
||||||
.FirstOrDefault(f => f.Url.Equals(url));
|
.FirstOrDefault(f => f.Url.Equals(url));
|
||||||
res ??= new SourceEntity();
|
res ??= new SourceEntity();
|
||||||
return res;
|
return res;
|
||||||
@ -84,8 +84,8 @@ public class SourcesTable : ISourcesRepository
|
|||||||
|
|
||||||
public List<SourceEntity> List(int page = 0, int count = 100)
|
public List<SourceEntity> List(int page = 0, int count = 100)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Sources
|
var res = context.Sources
|
||||||
.Skip(page * count)
|
.Skip(page * count)
|
||||||
.Take(count)
|
.Take(count)
|
||||||
.ToList();
|
.ToList();
|
||||||
@ -94,8 +94,8 @@ public class SourcesTable : ISourcesRepository
|
|||||||
|
|
||||||
public List<SourceEntity> ListBySource(string source, int page = 0, int limit = 25)
|
public List<SourceEntity> ListBySource(string source, int page = 0, int limit = 25)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Sources
|
var res = context.Sources
|
||||||
.Where(f => f.Source.Equals(source))
|
.Where(f => f.Source.Equals(source))
|
||||||
.Skip(page * limit)
|
.Skip(page * limit)
|
||||||
.Take(limit)
|
.Take(limit)
|
||||||
@ -105,8 +105,8 @@ public class SourcesTable : ISourcesRepository
|
|||||||
|
|
||||||
public List<SourceEntity> ListByType(string type,int page = 0, int limit = 25)
|
public List<SourceEntity> ListByType(string type,int page = 0, int limit = 25)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Sources
|
var res = context.Sources
|
||||||
.Where(f => f.Type.Equals(type))
|
.Where(f => f.Type.Equals(type))
|
||||||
.Skip(page * limit)
|
.Skip(page * limit)
|
||||||
.Take(limit)
|
.Take(limit)
|
||||||
@ -116,13 +116,13 @@ public class SourcesTable : ISourcesRepository
|
|||||||
|
|
||||||
public int Disable(Guid id)
|
public int Disable(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = GetById(id);
|
var res = GetById(id);
|
||||||
res.Enabled = false;
|
res.Enabled = false;
|
||||||
_context.Sources.Update(res);
|
context.Sources.Update(res);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
@ -133,13 +133,13 @@ public class SourcesTable : ISourcesRepository
|
|||||||
|
|
||||||
public int Enable(Guid id)
|
public int Enable(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = GetById(id);
|
var res = GetById(id);
|
||||||
res.Enabled = true;
|
res.Enabled = true;
|
||||||
_context.Sources.Update(res);
|
context.Sources.Update(res);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
@ -150,21 +150,21 @@ public class SourcesTable : ISourcesRepository
|
|||||||
|
|
||||||
public void Delete(Guid id)
|
public void Delete(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = GetById(id);
|
var res = GetById(id);
|
||||||
_context.Sources.Remove(res);
|
context.Sources.Remove(res);
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int UpdateYoutubeId(Guid id, string youtubeId)
|
public int UpdateYoutubeId(Guid id, string youtubeId)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = GetById(id);
|
var res = GetById(id);
|
||||||
res.YoutubeId = youtubeId;
|
res.YoutubeId = youtubeId;
|
||||||
_context.Sources.Update(res);
|
context.Sources.Update(res);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
@ -173,10 +173,10 @@ public class SourcesTable : ISourcesRepository
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//private IDbConnection OpenConnection(string connectionString)
|
private IDbConnection OpenConnection(string connectionString)
|
||||||
//{
|
{
|
||||||
// var conn = new NpgsqlConnection(_connectionString);
|
var conn = new NpgsqlConnection(_connectionString);
|
||||||
// conn.Open();
|
conn.Open();
|
||||||
// return conn;
|
return conn;
|
||||||
//}
|
}
|
||||||
}
|
}
|
@ -10,61 +10,61 @@ namespace Newsbot.Collector.Database.Repositories;
|
|||||||
|
|
||||||
public class SubscriptionsTable : ISubscriptionRepository
|
public class SubscriptionsTable : ISubscriptionRepository
|
||||||
{
|
{
|
||||||
//private readonly string _connectionString;
|
private readonly string _connectionString;
|
||||||
private DatabaseContext _context;
|
|
||||||
|
|
||||||
public SubscriptionsTable(string connectionString)
|
public SubscriptionsTable(string connectionString)
|
||||||
{
|
{
|
||||||
//_connectionString = connectionString;
|
_connectionString = connectionString;
|
||||||
_context = new DatabaseContext(connectionString);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public SubscriptionsTable(DatabaseContext context)
|
public SubscriptionsTable(IConfiguration configuration)
|
||||||
{
|
{
|
||||||
_context = context;
|
var connstr = configuration.GetConnectionString("database");
|
||||||
|
if (connstr is null) connstr = "";
|
||||||
|
_connectionString = connstr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SubscriptionEntity New(SubscriptionEntity model)
|
public SubscriptionEntity New(SubscriptionEntity model)
|
||||||
{
|
{
|
||||||
model.Id = new Guid();
|
model.Id = new Guid();
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
_context.Subscriptions.Add(model);
|
context.Subscriptions.Add(model);
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<SubscriptionEntity> List(int page = 0, int count = 25)
|
public List<SubscriptionEntity> List(int page = 0, int count = 25)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
return _context.Subscriptions.Skip(page * count).Take(count).ToList();
|
return context.Subscriptions.Skip(page * count).Take(count).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<SubscriptionEntity> ListBySourceId(Guid id, int page = 0, int count = 25)
|
public List<SubscriptionEntity> ListBySourceId(Guid id, int page = 0, int count = 25)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
return _context.Subscriptions.Where(f => f.SourceId.Equals(id))
|
return context.Subscriptions.Where(f => f.SourceId.Equals(id))
|
||||||
.Skip(page * count)
|
.Skip(page * count)
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<SubscriptionEntity> ListByWebhook(Guid id, int page = 0, int count = 25)
|
public List<SubscriptionEntity> ListByWebhook(Guid id, int page = 0, int count = 25)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
return _context.Subscriptions.Where(f => f.DiscordWebHookId.Equals(id)).Skip(page * count).ToList();
|
return context.Subscriptions.Where(f => f.DiscordWebHookId.Equals(id)).Skip(page * count).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public SubscriptionEntity GetById(Guid id)
|
public SubscriptionEntity GetById(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Subscriptions
|
var res = context.Subscriptions
|
||||||
.FirstOrDefault(f => f.Id.Equals(id));
|
.FirstOrDefault(f => f.Id.Equals(id));
|
||||||
return res ??= new SubscriptionEntity();
|
return res ??= new SubscriptionEntity();
|
||||||
}
|
}
|
||||||
|
|
||||||
public SubscriptionEntity GetByWebhookAndSource(Guid webhookId, Guid sourceId)
|
public SubscriptionEntity GetByWebhookAndSource(Guid webhookId, Guid sourceId)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Subscriptions
|
var res = context.Subscriptions
|
||||||
.Where(f => f.DiscordWebHookId.Equals(webhookId))
|
.Where(f => f.DiscordWebHookId.Equals(webhookId))
|
||||||
.FirstOrDefault(f => f.SourceId.Equals(sourceId));
|
.FirstOrDefault(f => f.SourceId.Equals(sourceId));
|
||||||
return res ??= new SubscriptionEntity();
|
return res ??= new SubscriptionEntity();
|
||||||
@ -72,21 +72,22 @@ public class SubscriptionsTable : ISubscriptionRepository
|
|||||||
|
|
||||||
public void Delete(Guid id)
|
public void Delete(Guid id)
|
||||||
{
|
{
|
||||||
//using var context = new DatabaseContext(_connectionString);
|
using var context = new DatabaseContext(_connectionString);
|
||||||
var res = _context.Subscriptions.FirstOrDefault(f => f.Id.Equals(id));
|
var res = context.Subscriptions.FirstOrDefault(f => f.Id.Equals(id));
|
||||||
if (res is null)
|
if (res is null)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_context.Subscriptions.Remove(res);
|
context.Subscriptions.Remove(res);
|
||||||
_context.SaveChanges();
|
context.SaveChanges();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//private IDbConnection OpenConnection(string connectionString)
|
private IDbConnection OpenConnection(string connectionString)
|
||||||
//{
|
{
|
||||||
// var conn = new NpgsqlConnection(_connectionString);
|
var conn = new NpgsqlConnection(_connectionString);
|
||||||
// conn.Open();
|
conn.Open();
|
||||||
// return conn;
|
return conn;
|
||||||
//}
|
}
|
||||||
}
|
}
|
@ -1,4 +1,4 @@
|
|||||||
namespace Newsbot.Collector.Domain.Models.Config.Sources;
|
namespace Newsbot.Collector.Domain.Models.Config;
|
||||||
|
|
||||||
public class ConfigSectionRedditModel
|
public class ConfigSectionRedditModel
|
||||||
{
|
{
|
@ -1,4 +1,4 @@
|
|||||||
namespace Newsbot.Collector.Domain.Models.Config.Sources;
|
namespace Newsbot.Collector.Domain.Models.Config;
|
||||||
|
|
||||||
public class ConfigSectionRssModel
|
public class ConfigSectionRssModel
|
||||||
{
|
{
|
@ -1,4 +1,4 @@
|
|||||||
namespace Newsbot.Collector.Domain.Models.Config.Sources;
|
namespace Newsbot.Collector.Domain.Models.Config;
|
||||||
|
|
||||||
public class ConfigSectionYoutubeModel
|
public class ConfigSectionYoutubeModel
|
||||||
{
|
{
|
@ -1,6 +0,0 @@
|
|||||||
namespace Newsbot.Collector.Domain.Models.Config;
|
|
||||||
|
|
||||||
public class JwtSettings
|
|
||||||
{
|
|
||||||
public string? Secret { get; set; }
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user