Merge pull request #190 from fluentcms/177-review-litedbrepositories

177 review litedbrepositories

src/FluentCMS.Repositories/Abstractions/IPageRepository.cs

@@ -5,5 +5,5 @@ namespace FluentCMS.Repositories;
 public interface IPageRepository : IGenericRepository<Page>
 {
     Task<IEnumerable<Page>> GetBySiteId(Guid siteId, CancellationToken cancellationToken = default);
-    Task<Page> GetByPath(string path);
+    Task<Page> GetByPath(string path, CancellationToken cancellationToken = default);
 }

src/FluentCMS.Repositories/LiteDb/LiteDbGenericRepository.cs → src/FluentCMS.Repositories/LiteDb/GenericRepository.cs

@@ -5,14 +5,14 @@
 
 namespace FluentCMS.Repositories.LiteDb;
 
-public class LiteDbGenericRepository<TEntity> : IGenericRepository<TEntity>
+public class GenericRepository<TEntity> : IGenericRepository<TEntity>
     where TEntity : IEntity
 {
     protected ILiteCollectionAsync<TEntity> Collection { get; }
     protected ILiteCollectionAsync<BsonDocument> BsonCollection { get; }
     protected LiteDbContext DbContext { get; private set; }
 
-    public LiteDbGenericRepository(LiteDbContext dbContext)
+    public GenericRepository(LiteDbContext dbContext)
     {
         DbContext = dbContext;
         Collection = dbContext.Database.GetCollection<TEntity>(GetCollectionName());

src/FluentCMS.Repositories/LiteDb/LiteDbHostRepository.cs → src/FluentCMS.Repositories/LiteDb/HostRepository.cs

@@ -3,10 +3,10 @@
 
 namespace FluentCMS.Repositories.LiteDb;
 
-public class LiteDbHostRepository : IHostRepository
+public class HostRepository : IHostRepository
 {
     private readonly LiteDbContext _dbContext;
-    public LiteDbHostRepository(LiteDbContext dbContext)
+    public HostRepository(LiteDbContext dbContext)
     {
         _dbContext = dbContext;
     }

src/FluentCMS.Repositories/LiteDb/LiteDbPageRepository.cs → src/FluentCMS.Repositories/LiteDb/PageRepository.cs

@@ -2,9 +2,9 @@
 
 namespace FluentCMS.Repositories.LiteDb;
 
-public class LiteDbPageRepository : LiteDbGenericRepository<Page>, IPageRepository
+public class PageRepository : GenericRepository<Page>, IPageRepository
 {
-    public LiteDbPageRepository(LiteDbContext dbContext) : base(dbContext)
+    public PageRepository(LiteDbContext dbContext) : base(dbContext)
     {
     }
 
@@ -15,8 +15,10 @@ public async Task<IEnumerable<Page>> GetBySiteId(Guid siteId, CancellationToken
         return await Collection.FindAsync(x => x.SiteId == siteId);
     }
 
-    public async Task<Page> GetByPath(string path)
+    public async Task<Page> GetByPath(string path, CancellationToken cancellationToken = default)
     {
+        cancellationToken.ThrowIfCancellationRequested();
+
         return await Collection.FindOneAsync(x => x.Path == path);
     }
 }

src/FluentCMS.Repositories/LiteDb/LiteDbRoleRepository.cs → src/FluentCMS.Repositories/LiteDb/RoleRepository.cs

@@ -3,9 +3,9 @@
 
 namespace FluentCMS.Repositories.LiteDb;
 
-internal class LiteDbRoleRepository : LiteDbGenericRepository<Role>, IRoleRepository
+internal class RoleRepository : GenericRepository<Role>, IRoleRepository
 {
-    public LiteDbRoleRepository(LiteDbContext dbContext) : base(dbContext)
+    public RoleRepository(LiteDbContext dbContext) : base(dbContext)
     {
     }
 

src/FluentCMS.Repositories/LiteDb/LiteDbServiceExtensions.cs → src/FluentCMS.Repositories/LiteDb/ServiceExtensions.cs

@@ -28,12 +28,12 @@ public static IServiceCollection AddInMemoryLiteDbRepositories(this IServiceColl
 
     private static void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped(typeof(IGenericRepository<>), typeof(LiteDbGenericRepository<>));
+        services.AddScoped(typeof(IGenericRepository<>), typeof(GenericRepository<>));
 
-        services.AddScoped<ISiteRepository, LiteDbSiteRepository>();
-        services.AddScoped<IHostRepository, LiteDbHostRepository>();
-        services.AddScoped<IPageRepository, LiteDbPageRepository>();
-        services.AddScoped<IUserRepository, LiteDbUserRepository>();
-        services.AddScoped<IRoleRepository, LiteDbRoleRepository>();
+        services.AddScoped<ISiteRepository, SiteRepository>();
+        services.AddScoped<IHostRepository, HostRepository>();
+        services.AddScoped<IPageRepository, PageRepository>();
+        services.AddScoped<IUserRepository, UserRepository>();
+        services.AddScoped<IRoleRepository, RoleRepository>();
     }
 }

src/FluentCMS.Repositories/LiteDb/LiteDbSiteRepository.cs → src/FluentCMS.Repositories/LiteDb/SiteRepository.cs

@@ -2,9 +2,9 @@
 
 namespace FluentCMS.Repositories.LiteDb;
 
-public class LiteDbSiteRepository : LiteDbGenericRepository<Site>, ISiteRepository
+public class SiteRepository : GenericRepository<Site>, ISiteRepository
 {
-    public LiteDbSiteRepository(LiteDbContext dbContext) : base(dbContext)
+    public SiteRepository(LiteDbContext dbContext) : base(dbContext)
     {
     }
 

src/FluentCMS.Repositories/LiteDb/LiteDbUserRepository.cs → src/FluentCMS.Repositories/LiteDb/UserRepository.cs

@@ -4,9 +4,9 @@
 
 namespace FluentCMS.Repositories.LiteDb;
 
-public class LiteDbUserRepository : LiteDbGenericRepository<User>, IUserRepository
+public class UserRepository : GenericRepository<User>, IUserRepository
 {
-    public LiteDbUserRepository(LiteDbContext dbContext) : base(dbContext)
+    public UserRepository(LiteDbContext dbContext) : base(dbContext)
     {
     }
 

src/FluentCMS.Repositories/MongoDB/PageRepository.cs

@@ -1,5 +1,6 @@
 using FluentCMS.Entities;
 using MongoDB.Driver;
+using System.Threading;
 
 namespace FluentCMS.Repositories.MongoDB;
 
@@ -9,10 +10,15 @@ public PageRepository(IMongoDBContext mongoDbContext) : base(mongoDbContext)
     {
     }
 
-    public Task<Page> GetByPath(string path)
+    public async Task<Page> GetByPath(string path, CancellationToken cancellationToken = default)
     {
-        // TODO: implement here
-        return Task.FromResult<Page>(null);
+        cancellationToken.ThrowIfCancellationRequested();
+
+        var filter = Builders<Page>.Filter.Eq(x => x.Path, path);
+
+        var findResult = await Collection.FindAsync(filter, null, cancellationToken);
+
+        return findResult.SingleOrDefault(cancellationToken);
     }
 
     public async Task<IEnumerable<Page>> GetBySiteId(Guid siteId, CancellationToken cancellationToken = default)
@@ -25,9 +31,4 @@ public async Task<IEnumerable<Page>> GetBySiteId(Guid siteId, CancellationToken
 
         return findResult.ToEnumerable(cancellationToken);
     }
-
-    public Task<IEnumerable<Page>> GetBySiteIdAndParentId(Guid siteId, Guid? parentId = null)
-    {
-        throw new NotImplementedException();
-    }
 }

src/FluentCMS.Tests/Repositories/LiteDb/LiteDbAuditRepository_Tests.cs

@@ -41,9 +41,9 @@ public async Task Should_Update()
         dbEntity.LastUpdatedAt.ShouldBeGreaterThan(utcNow);
     }
 
-    private static LiteDbGenericRepository<AuditedDummyEntity> GetInstance()
+    private static GenericRepository<AuditedDummyEntity> GetInstance()
     {
         var liteDbContext = new LiteDbContext(Options.Create(new LiteDbOptions()));
-        return new LiteDbGenericRepository<AuditedDummyEntity>(liteDbContext);
+        return new GenericRepository<AuditedDummyEntity>(liteDbContext);
     }
 }

src/FluentCMS.Tests/Repositories/LiteDb/LiteDbRepository_Tests.cs

@@ -117,9 +117,9 @@ public async Task Should_GetAll_With_Filter()
         dbEntities.All(x => x.Id == firstGuid).ShouldBeTrue();
     }
 
-    private static LiteDbGenericRepository<DummyEntity> GetInstance()
+    private static GenericRepository<DummyEntity> GetInstance()
     {
         var liteDbContext = new LiteDbContext(Options.Create(new LiteDbOptions()));
-        return new LiteDbGenericRepository<DummyEntity>(liteDbContext);
+        return new GenericRepository<DummyEntity>(liteDbContext);
     }
 }