Merge pull request 'features/add-authors-table' (#17) from features/add-authors-table into main

Reviewed-on: #17

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

@@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newsbot.Collector.Domain.Dto;
+using Newsbot.Collector.Domain.Entities;
 using Newsbot.Collector.Domain.Interfaces;
 using Newsbot.Collector.Domain.Results;
 
@@ -15,11 +16,13 @@ public class ArticlesController : ControllerBase
     //private readonly ILogger<ArticlesController> _logger;
     private readonly IArticlesRepository _articles;
     private readonly ISourcesRepository _sources;
+    private readonly IAuthorTable _author;
 
-    public ArticlesController(IArticlesRepository articles, ISourcesRepository sources)
+    public ArticlesController(IArticlesRepository articles, ISourcesRepository sources, IAuthorTable author)
     {
         _articles = articles;
         _sources = sources;
+        _author = author;
     }
 
     [HttpGet(Name = "GetArticles")]
@@ -59,11 +62,13 @@ public class ArticlesController : ControllerBase
     {
         var item = _articles.GetById(id);
         var sourceItem = _sources.GetById(item.SourceId);
+        var author = _author.GetBySourceIdAndNameAsync(sourceItem.Id, sourceItem.Name);
+        author.Wait();
         
         return new OkObjectResult(new ArticleDetailsResult
         {
             IsSuccessful = true,
-            Item = ArticleDetailsDto.Convert(item, sourceItem)
+            Item = ArticleDetailsDto.Convert(item, sourceItem, author.Result)
         });
     }
 

Newsbot.Collector.Database/Migrations/20230805060324_add author table.Designer.cs

@@ -0,0 +1,575 @@
+// <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("20230805060324_add author table")]
+    partial class addauthortable
+    {
+        /// <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<Guid>("AuthorId")
+                        .HasColumnType("uuid");
+
+                    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.AuthorEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Image")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SourceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Authors");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordNotificationEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("CodeAllowCommits")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("CodeAllowReleases")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("DiscordWebHookId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("SourceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DiscordNotification");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordQueueEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ArticleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DiscordQueue");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordWebhookEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Channel")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Server")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    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.RefreshTokenEntity", b =>
+                {
+                    b.Property<string>("Token")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("Invalidated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("JwtId")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Used")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Token");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.SourceEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Site")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tags")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("YoutubeId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sources");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.UserSourceSubscriptionEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("DateAdded")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("SourceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserSourceSubscription");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordWebhookEntity", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.RefreshTokenEntity", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.UserSourceSubscriptionEntity", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Newsbot.Collector.Database/Migrations/20230805060324_add author table.cs

@@ -0,0 +1,51 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Newsbot.Collector.Database.Migrations
+{
+    /// <inheritdoc />
+    public partial class addauthortable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AuthorImage",
+                table: "Articles");
+
+            migrationBuilder.DropColumn(
+                name: "AuthorName",
+                table: "Articles");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "AuthorId",
+                table: "Articles",
+                type: "uuid",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AuthorId",
+                table: "Articles");
+
+            migrationBuilder.AddColumn<string>(
+                name: "AuthorImage",
+                table: "Articles",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "AuthorName",
+                table: "Articles",
+                type: "text",
+                nullable: false,
+                defaultValue: "");
+        }
+    }
+}

Newsbot.Collector.Database/Migrations/DatabaseContextModelSnapshot.cs

@@ -224,12 +224,8 @@ namespace Newsbot.Collector.Database.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid");
 
-                    b.Property<string>("AuthorImage")
-                        .HasColumnType("text");
-
-                    b.Property<string>("AuthorName")
-                        .IsRequired()
-                        .HasColumnType("text");
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("uuid");
 
                     b.Property<bool>("CodeIsCommit")
                         .HasColumnType("boolean");

Newsbot.Collector.Database/Repositories/AuthorsTable.cs

@@ -1,3 +1,4 @@
+using Microsoft.EntityFrameworkCore;
 using Newsbot.Collector.Domain.Entities;
 using Newsbot.Collector.Domain.Interfaces;
 
@@ -18,30 +19,49 @@ public class AuthorsTable : IAuthorTable
         _context = context;
     }
 
-    public AuthorEntity New(AuthorEntity entity)
+    public async Task<AuthorEntity> NewAsync(AuthorEntity entity)
     {
         entity.Id = Guid.NewGuid();
         _context.Authors.Add(entity);
-        _context.SaveChanges();
+        await _context.SaveChangesAsync();
         return entity;
     }
 
-    public List<AuthorEntity> ListBySourceId(Guid sourceId)
+    public async Task<AuthorEntity> CreateIfMissingAsync(AuthorEntity entity)
     {
-        return _context.Authors
-            .Where(s => s.SourceId.Equals(sourceId)).ToList();
+        var res = await GetBySourceIdAndNameAsync(entity.SourceId, entity.Name);
+        if (res is null)
+        {
+            entity.Id = Guid.NewGuid();
+            _context.Authors.Add(entity);
+            await _context.SaveChangesAsync();
+            return entity;
+        }
+        
+        return res;
     }
 
-    public int TotalPosts(Guid id)
+    public async Task<List<AuthorEntity>> ListBySourceIdAsync(Guid sourceId)
     {
-        return _context.Authors.Count(x => x.Id.Equals(id));
+        return await _context.Authors
+            .Where(s => s.SourceId.Equals(sourceId)).ToListAsync();
     }
 
-    public AuthorEntity? GetBySourceIdAndName(Guid sourceId, string name)
+    public async Task<int> TotalPostsAsync(Guid id)
     {
-        return _context.Authors
+        return await _context.Authors.CountAsync(x => x.Id.Equals(id));
+    }
+
+    public async Task<AuthorEntity?> GetBySourceIdAndNameAsync(Guid sourceId, string name)
+    {
+        return await _context.Authors
             .Where(s => s.SourceId.Equals(sourceId))
-            .FirstOrDefault(n => n.Name.Equals(name));
+            .FirstOrDefaultAsync(n => n.Name.Equals(name));
             
     }
+
+    public async Task<AuthorEntity?> GetById(Guid id)
+    {
+        return await _context.Authors.FirstOrDefaultAsync(q => q.Id.Equals(id));
+    }
 }

Newsbot.Collector.Domain/Dto/ArticleDetailsDto.cs

@@ -19,8 +19,9 @@ public class ArticleDetailsDto
     public string? AuthorImage { get; set; }
 
     public SourceDto? Source { get; set; }
+    public AuthorEntity? Author { get; set; }
 
-    public static ArticleDetailsDto Convert(ArticlesEntity article, SourceEntity source)
+    public static ArticleDetailsDto Convert(ArticlesEntity article, SourceEntity source, AuthorEntity? author)
     {
         return new ArticleDetailsDto
         {
@@ -34,9 +35,8 @@ public class ArticleDetailsDto
             VideoWidth = article.VideoWidth,
             Thumbnail = article.Thumbnail,
             Description = article.Description,
-            AuthorName = article.AuthorName,
-            AuthorImage = article.AuthorImage,
-            Source = SourceDto.Convert(source)
+            Source = SourceDto.Convert(source),
+            
         };
     }
 }

Newsbot.Collector.Domain/Dto/ArticleDto.cs

@@ -7,6 +7,7 @@ public class ArticleDto
 {
     public Guid ID { get; set; }
     public Guid SourceID { get; set; }
+    public Guid AuthorId { get; set; }
     public string[]? Tags { get; set; }
     public string? Title { get; set; }
     public string? Url { get; set; }
@@ -16,8 +17,6 @@ public class ArticleDto
     public int VideoWidth { get; set; }
     public string? Thumbnail { get; set; }
     public string? Description { get; set; }
-    public string? AuthorName { get; set; }
-    public string? AuthorImage { get; set; }
     public static ArticleDto Convert(ArticlesModel article)
     {
         return new ArticleDto
@@ -33,8 +32,6 @@ public class ArticleDto
             VideoWidth = article.VideoWidth,
             Thumbnail = article.Thumbnail,
             Description = article.Description,
-            AuthorName = article.AuthorName,
-            AuthorImage = article.AuthorImage,
         };
     }
     
@@ -44,6 +41,7 @@ public class ArticleDto
         {
             ID = article.Id,
             SourceID = article.SourceId,
+            AuthorId = article.AuthorId,
             Tags = article.Tags.Split(','),
             Title = article.Title,
             Url = article.Url,
@@ -52,9 +50,7 @@ public class ArticleDto
             VideoHeight = article.VideoHeight,
             VideoWidth = article.VideoWidth,
             Thumbnail = article.Thumbnail,
-            Description = article.Description,
-            AuthorName = article.AuthorName,
-            AuthorImage = article.AuthorImage,
+            Description = article.Description
         };
     }
 }

Newsbot.Collector.Domain/Dto/AuthorDto.cs

@@ -0,0 +1,9 @@
+namespace Newsbot.Collector.Domain.Dto;
+
+public class AuthorDto
+{
+    public Guid Id { get; set; }
+    public Guid SourceId { get; set; }
+    public string? Name { get; set; }
+    public string? Image { get; set; }
+}

Newsbot.Collector.Domain/Entities/ArticlesEntity.cs

@@ -4,6 +4,7 @@ public class ArticlesEntity
 {
     public Guid Id { get; set; }
     public Guid SourceId { get; set; }
+    public Guid AuthorId { get; set; }
     public string Tags { get; set; } = "";
     public string Title { get; set; } = "";
     public string? Url { get; set; }
@@ -13,8 +14,6 @@ public class ArticlesEntity
     public int VideoWidth { get; set; } = 0;
     public string Thumbnail { get; set; } = "";
     public string Description { get; set; } = "";
-    public string AuthorName { get; set; } = "";
-    public string? AuthorImage { get; set; }
     public bool CodeIsRelease { get; set; }
     public bool CodeIsCommit { get; set; }
 }

Newsbot.Collector.Domain/Interfaces/IAuthorTable.cs

@@ -4,8 +4,11 @@ namespace Newsbot.Collector.Domain.Interfaces;
 
 public interface IAuthorTable
 {
-    AuthorEntity New(AuthorEntity entity);
-    List<AuthorEntity> ListBySourceId(Guid sourceId);
-    int TotalPosts(Guid id);
-    AuthorEntity? GetBySourceIdAndName(Guid sourceId, string name);
+    Task<AuthorEntity> NewAsync(AuthorEntity entity);
+
+    Task<AuthorEntity> CreateIfMissingAsync(AuthorEntity entity);
+    Task<List<AuthorEntity>> ListBySourceIdAsync(Guid sourceId);
+    Task<int> TotalPostsAsync(Guid id);
+    Task<AuthorEntity?> GetBySourceIdAndNameAsync(Guid sourceId, string name);
+    Task<AuthorEntity?> GetById(Guid id);
 }

Newsbot.Collector.Domain/Interfaces/ICollector.cs

@@ -1,9 +0,0 @@
-using Newsbot.Collector.Domain.Models;
-
-namespace Newsbot.Collector.Domain.Interfaces;
-
-///
-public interface ICollector : IHangfireJob
-{
-    List<ArticlesModel> Collect();
-}

Newsbot.Collector.Services/Jobs/CodeProjectWatcherJob.cs

@@ -30,6 +30,7 @@ public class CodeProjectWatcherJob
     private ILogger _logger;
     private IDiscordQueueRepository _queue;
     private ISourcesRepository _source;
+    private IAuthorTable _author;
 
     public CodeProjectWatcherJob()
     {
@@ -37,12 +38,14 @@ public class CodeProjectWatcherJob
         _queue = new DiscordQueueTable("");
         _source = new SourcesTable("");
         _logger = JobLogger.GetLogger("", JobName);
+        _author = new AuthorsTable("");
     }
 
     public CodeProjectWatcherJob(CodeProjectWatcherJobOptions options)
     {
         options.ConnectionStrings ??= new ConfigSectionConnectionStrings();
         _articles = new ArticlesTable(options.ConnectionStrings.Database ?? "");
+        _author = new AuthorsTable(options.ConnectionStrings.Database ?? "");
         _queue = new DiscordQueueTable(options.ConnectionStrings.Database ?? "");
         _source = new SourcesTable(options.ConnectionStrings.Database ?? "");
         _logger = JobLogger.GetLogger(options.ConnectionStrings.OpenTelemetry ?? "", JobName);
@@ -52,6 +55,7 @@ public class CodeProjectWatcherJob
     {
         options.ConnectionStrings ??= new ConfigSectionConnectionStrings();
         _articles = new ArticlesTable(options.ConnectionStrings.Database ?? "");
+        _author = new AuthorsTable(options.ConnectionStrings.Database ?? "");
         _queue = new DiscordQueueTable(options.ConnectionStrings.Database ?? "");
         _source = new SourcesTable(options.ConnectionStrings.Database ?? "");
         _logger = JobLogger.GetLogger(options.ConnectionStrings.OpenTelemetry ?? "", JobName);
@@ -157,17 +161,29 @@ public class CodeProjectWatcherJob
             });
             parser.Parse();
 
+            if (item.Authors[0].Name is null)
+            {
+                _logger.Warning("Author was missing from the record and will continue with a missing author");
+            }
+
+            var authorExists = _author.CreateIfMissingAsync(new AuthorEntity
+            {
+                Name = item.Authors[0].Name,
+                SourceId = source.Id,
+                Image = "",
+            });
+            authorExists.Wait();
+            
             var a = new ArticlesEntity
             {
                 SourceId = source.Id,
+                AuthorId = authorExists.Result.Id,
                 Tags = source.Tags,
                 Title = item.Title.Text,
                 Url = itemUrl,
                 PubDate = item.LastUpdatedTime.DateTime,
                 Thumbnail = parser.Data.Header.Image,
                 Description = item.Title.Text,
-                AuthorName = item.Authors[0].Name ?? "",
-                AuthorImage = item.Authors[0].Uri ?? "",
                 CodeIsRelease = isRelease,
                 CodeIsCommit = isCommit,
             };

Newsbot.Collector.Services/Jobs/DiscordNotificationJob.cs

@@ -36,6 +36,7 @@ public class DiscordNotificationJob
     private ILogger _logger;
     //private DatabaseContext _databaseContext;
     private IArticlesRepository _article;
+    private IAuthorTable _author;
     private IIconsRepository _icons;
     private IDiscordQueueRepository _queue;
     private ISourcesRepository _sources;
@@ -46,6 +47,7 @@ public class DiscordNotificationJob
     {
         _queue = new DiscordQueueTable("");
         _article = new ArticlesTable("");
+        _author = new AuthorsTable("");
         _webhook = new DiscordWebhooksTable("");
         _sources = new SourcesTable("");
         _subs = new DiscordNotificationTable("");
@@ -92,7 +94,6 @@ public class DiscordNotificationJob
         _logger.Debug($"{JobName} - Processing {request.Id}");
         // Get all details on the article in the queue
         var articleDetails = _article.GetById(request.ArticleId);
-
         // Get the details of the source
         var sourceDetails = _sources.GetById(articleDetails.SourceId);
         if (sourceDetails.Id == Guid.Empty)
@@ -103,6 +104,9 @@ public class DiscordNotificationJob
             return;
         }
 
+        var author = _author.GetBySourceIdAndNameAsync(sourceDetails.Id, sourceDetails.Name);
+        author.Wait();
+        
         var sourceIcon = new IconEntity();
         try
         {
@@ -118,13 +122,13 @@ public class DiscordNotificationJob
         var allSubscriptions = _subs.ListBySourceId(sourceDetails.Id);
 
         foreach (var sub in allSubscriptions)
-            SendSubscriptionNotification(request.Id, articleDetails, sourceDetails, sourceIcon, sub);
+            SendSubscriptionNotification(request.Id, articleDetails, sourceDetails, sourceIcon, sub, author.Result ?? new AuthorEntity());
 
         _logger.Debug("{JobName} - Removing {RequestId} from the queue", JobName, request.Id);
         _queue.Delete(request.Id);
     }
 
-    public void SendSubscriptionNotification(Guid requestId, ArticlesEntity articleDetails, SourceEntity sourceDetails, IconEntity sourceIcon, DiscordNotificationEntity sub)
+    public void SendSubscriptionNotification(Guid requestId, ArticlesEntity articleDetails, SourceEntity sourceDetails, IconEntity sourceIcon, DiscordNotificationEntity sub, AuthorEntity authorEntity)
     {
         // Check if the subscription code flags
         // If the article is a code commit and the subscription does not want them, skip.
@@ -140,7 +144,7 @@ public class DiscordNotificationJob
         var client = new DiscordClient(discordDetails.Url);
         try
         {
-            client.SendMessage(GenerateDiscordMessage(sourceDetails, articleDetails, sourceIcon));
+            client.SendMessage(GenerateDiscordMessage(sourceDetails, articleDetails, sourceIcon, authorEntity));
         }
         catch (Exception e)
         {
@@ -154,7 +158,7 @@ public class DiscordNotificationJob
         Thread.Sleep(3000);
     }
 
-    public DiscordMessage GenerateDiscordMessage(SourceEntity source, ArticlesEntity article, IconEntity icon)
+    public DiscordMessage GenerateDiscordMessage(SourceEntity source, ArticlesEntity article, IconEntity icon, AuthorEntity author)
     {
         var embed = new DiscordMessageEmbed
         {
@@ -163,7 +167,7 @@ public class DiscordNotificationJob
             Description = MessageValidation.ConvertHtmlCodes(article.Description),
             Author = new DiscordMessageEmbedAuthor
             {
-                Name = article.AuthorName,
+                Name = author.Name,
                 IconUrl = icon.FileName
             },
             Footer = new DiscordMessageEmbedFooter
@@ -189,7 +193,7 @@ public class DiscordNotificationJob
                 Url = article.Thumbnail
             };
 
-        if (article.AuthorImage is not null && article.AuthorImage != "") embed.Author.IconUrl = article.AuthorImage;
+        embed.Author.IconUrl = author.Image ?? "";
 
         return new DiscordMessage
         {

Newsbot.Collector.Services/Jobs/YoutubeWatcherJob.cs

@@ -25,6 +25,7 @@ public class YoutubeWatcherJob
     
     private readonly YoutubeWatcherJobOptions _options;
     private IArticlesRepository _articles;
+    private IAuthorTable _author;
     private IIconsRepository _icons;
     private ILogger _logger;
     private IDiscordQueueRepository _queue;
@@ -34,6 +35,7 @@ public class YoutubeWatcherJob
     {
         _options = new YoutubeWatcherJobOptions();
         _articles = new ArticlesTable("");
+        _author = new AuthorsTable("");
         _queue = new DiscordQueueTable("");
         _source = new SourcesTable("");
         _icons = new IconsTable("");
@@ -43,6 +45,7 @@ public class YoutubeWatcherJob
     public void InitAndExecute(YoutubeWatcherJobOptions options)
     {
         _articles = new ArticlesTable(options.DatabaseConnectionString ?? "");
+        _author = new AuthorsTable(options.DatabaseConnectionString ?? "");
         _queue = new DiscordQueueTable(options.DatabaseConnectionString ?? "");
         _source = new SourcesTable(options.DatabaseConnectionString ?? "");
         _icons = new IconsTable(options.DatabaseConnectionString ?? "");
@@ -77,11 +80,23 @@ public class YoutubeWatcherJob
             _logger.Information($"{JobName} - Checking '{source.Name}'");
             var url = $"https://www.youtube.com/feeds/videos.xml?channel_id={channelId}";
 
-            var newVideos = CheckFeed(url, source);
+            var newVideos = FindMissingPosts(url, source);
             _logger.Debug($"{JobName} - Collected {newVideos.Count} new videos");
+            
             foreach (var video in newVideos)
             {
-                _logger.Debug($"{JobName} - {video.AuthorName} '{video.Title}' was found");
+                var author = _author.GetById(video.AuthorId);
+                author.Wait();
+
+                if (author.Result is null)
+                {
+                    _logger.Warning("Missing author record for article id {VideoId}", video.Id);
+                }
+                else
+                {
+                    _logger.Debug("{JobName} - {ResultName} \'{VideoTitle}\' was found", JobName, author.Result.Name, video.Title);
+                }
+                
                 _articles.New(video);
                 _queue.New(new DiscordQueueEntity
                 {
@@ -104,13 +119,12 @@ public class YoutubeWatcherJob
 
         var id = pageReader.Data.Header.YoutubeChannelID ?? "";
         if (id == "")
-            _logger.Error(new Exception($"{JobName} - Unable to find the Youtube Channel ID for the requested url."),
-                url);
+            _logger.Error(new Exception($"{JobName} - Unable to find the Youtube Channel ID for the requested url"), "");
 
         return id;
     }
 
-    private List<ArticlesEntity> CheckFeed(string url, SourceEntity source)
+    private List<ArticlesEntity> FindMissingPosts(string url, SourceEntity source)
     {
         var videos = new List<ArticlesEntity>();
 
@@ -118,37 +132,49 @@ public class YoutubeWatcherJob
         var feed = SyndicationFeed.Load(reader);
         foreach (var post in feed.Items.ToList())
         {
-            var articleUrl = post.Links[0].Uri.AbsoluteUri;
-            if (IsThisUrlKnown(articleUrl)) continue;
-
-            var videoDetails = new HtmlPageReader(new HtmlPageReaderOptions
-            {
-                Url = articleUrl
-            });
-            videoDetails.Parse();
-
-            var article = new ArticlesEntity
-            {
-                //Todo add the icon 
-                AuthorName = post.Authors[0].Name,
-                Title = post.Title.Text,
-                Tags = FetchTags(post),
-                Url = articleUrl,
-                PubDate = post.PublishDate.DateTime,
-                Thumbnail = videoDetails.Data.Header.Image,
-                Description = videoDetails.Data.Header.Description,
-                SourceId = source.Id,
-                Video = "true"
-            };
-
+            var article = CheckFeedItem(post, source.Id);
+            if (article is null) continue;
             videos.Add(article);
-
-            Thread.Sleep(_options.SleepTimer);
         }
 
         return videos;
     }
 
+    private ArticlesEntity? CheckFeedItem(SyndicationItem post, Guid sourceId)
+    {
+        var articleUrl = post.Links[0].Uri.AbsoluteUri;
+        if (IsThisUrlKnown(articleUrl)) return null;
+
+        var videoDetails = new HtmlPageReader(new HtmlPageReaderOptions
+        {
+            Url = articleUrl
+        });
+        videoDetails.Parse();
+
+        var author = _author.CreateIfMissingAsync(new AuthorEntity
+        {
+            Image = post.Authors[0].Uri,
+            Name = post.Authors[0].Name
+        });
+        author.Wait();
+
+        var article = new ArticlesEntity
+        {
+            //Todo add the icon 
+            AuthorId = author.Result.Id,
+            Title = post.Title.Text,
+            Tags = FetchTags(post),
+            Url = articleUrl,
+            PubDate = post.PublishDate.DateTime,
+            Thumbnail = videoDetails.Data.Header.Image,
+            Description = videoDetails.Data.Header.Description,
+            SourceId = sourceId,
+            Video = "true"
+        };
+
+        return article;
+    }
+    
     private bool IsThisUrlKnown(string url)
     {
         var isKnown = _articles.GetByUrl(url);

Newsbot.Collector.Tests/Jobs/DiscordNotificationJobTest.cs

@@ -32,12 +32,15 @@ public class DiscordNotificationJobTest
                 PubDate = DateTime.Now,
                 Thumbnail = "https://cdn.arstechnica.net/wp-content/uploads/2023/03/GettyImages-944827400-800x534.jpg",
                 Description = "Please work",
-                AuthorName = "No one knows"
             },
             new IconEntity()
             {
                 Id = Guid.NewGuid(),
                 FileName = "https://www.redditstatic.com/desktop2x/img/favicon/android-icon-192x192.png"
+            }, new AuthorEntity
+            {
+                Id = Guid.NewGuid(),
+                Name = "test"
             });
         webhookClient.SendMessage(msg);
     }
@@ -59,7 +62,6 @@ public class DiscordNotificationJobTest
                     Thumbnail =
                         "https://cdn.arstechnica.net/wp-content/uploads/2023/03/GettyImages-944827400-800x534.jpg",
                     Description = "Please work",
-                    AuthorName = "No one knows",
                     CodeIsCommit = true
                 },
                 new SourceEntity
@@ -82,6 +84,9 @@ public class DiscordNotificationJobTest
                 {
                     CodeAllowCommits = false,
                     CodeAllowReleases = true
+                }, new AuthorEntity
+                {
+                    Name = "a"
                 });
             Assert.Fail("Expected a error to come back.");
         }