refactor namespaces and imports (#670)

* re-namespace * optimize usings * more usings * more of the same * more implicit/global usings * cleanup all usings * minor fixes
2022-03-03 15:36:07 -06:00
parent 748581bf5a
commit 1ab98578ab
1164 changed files with 50127 additions and 53816 deletions
@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using MediatR;
+namespace ErsatzTV.Application.Playouts;

-namespace ErsatzTV.Application.Playouts.Queries
-{
-    public record GetAllPlayouts : IRequest<List<PlayoutNameViewModel>>;
-}
+public record GetAllPlayouts : IRequest<List<PlayoutNameViewModel>>;
@@ -1,35 +1,29 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using ErsatzTV.Infrastructure.Data;
-using MediatR;
+using ErsatzTV.Infrastructure.Data;
 using Microsoft.EntityFrameworkCore;
-using static LanguageExt.Prelude;

-namespace ErsatzTV.Application.Playouts.Queries
+namespace ErsatzTV.Application.Playouts;
+
+public class GetAllPlayoutsHandler : IRequestHandler<GetAllPlayouts, List<PlayoutNameViewModel>>
 {
-    public class GetAllPlayoutsHandler : IRequestHandler<GetAllPlayouts, List<PlayoutNameViewModel>>
+    private readonly IDbContextFactory<TvContext> _dbContextFactory;
+
+    public GetAllPlayoutsHandler(IDbContextFactory<TvContext> dbContextFactory) =>
+        _dbContextFactory = dbContextFactory;
+
+    public async Task<List<PlayoutNameViewModel>> Handle(
+        GetAllPlayouts request,
+        CancellationToken cancellationToken)
    {
-        private readonly IDbContextFactory<TvContext> _dbContextFactory;
-
-        public GetAllPlayoutsHandler(IDbContextFactory<TvContext> dbContextFactory) =>
-            _dbContextFactory = dbContextFactory;
-
-        public async Task<List<PlayoutNameViewModel>> Handle(
-            GetAllPlayouts request,
-            CancellationToken cancellationToken)
-        {
-            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
-            return await dbContext.Playouts
-                .Filter(p => p.Channel != null && p.ProgramSchedule != null)
-                .Map(
-                    p => new PlayoutNameViewModel(
-                        p.Id,
-                        p.Channel.Name,
-                        p.Channel.Number,
-                        p.ProgramSchedule.Name,
-                        Optional(p.DailyRebuildTime)))
-                .ToListAsync(cancellationToken);
-        }
+        await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+        return await dbContext.Playouts
+            .Filter(p => p.Channel != null && p.ProgramSchedule != null)
+            .Map(
+                p => new PlayoutNameViewModel(
+                    p.Id,
+                    p.Channel.Name,
+                    p.Channel.Number,
+                    p.ProgramSchedule.Name,
+                    Optional(p.DailyRebuildTime)))
+            .ToListAsync(cancellationToken);
    }
-}
+}
@@ -1,6 +1,3 @@
-using MediatR;
+namespace ErsatzTV.Application.Playouts;

-namespace ErsatzTV.Application.Playouts.Queries
-{
-    public record GetFuturePlayoutItemsById(int PlayoutId, bool ShowFiller, int PageNum, int PageSize) : IRequest<PagedPlayoutItemsViewModel>;
-}
+public record GetFuturePlayoutItemsById(int PlayoutId, bool ShowFiller, int PageNum, int PageSize) : IRequest<PagedPlayoutItemsViewModel>;
@@ -1,76 +1,68 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Domain.Filler;
 using ErsatzTV.Infrastructure.Data;
-using LanguageExt;
-using MediatR;
 using Microsoft.EntityFrameworkCore;
 using static ErsatzTV.Application.Playouts.Mapper;

-namespace ErsatzTV.Application.Playouts.Queries
+namespace ErsatzTV.Application.Playouts;
+
+public class GetFuturePlayoutItemsByIdHandler : IRequestHandler<GetFuturePlayoutItemsById, PagedPlayoutItemsViewModel>
 {
-    public class GetFuturePlayoutItemsByIdHandler : IRequestHandler<GetFuturePlayoutItemsById, PagedPlayoutItemsViewModel>
+    private readonly IDbContextFactory<TvContext> _dbContextFactory;
+
+    public GetFuturePlayoutItemsByIdHandler(IDbContextFactory<TvContext> dbContextFactory) =>
+        _dbContextFactory = dbContextFactory;
+
+    public async Task<PagedPlayoutItemsViewModel> Handle(
+        GetFuturePlayoutItemsById request,
+        CancellationToken cancellationToken)
    {
-        private readonly IDbContextFactory<TvContext> _dbContextFactory;
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);

-        public GetFuturePlayoutItemsByIdHandler(IDbContextFactory<TvContext> dbContextFactory) =>
-            _dbContextFactory = dbContextFactory;
+        DateTime now = DateTimeOffset.Now.UtcDateTime;

-        public async Task<PagedPlayoutItemsViewModel> Handle(
-            GetFuturePlayoutItemsById request,
-            CancellationToken cancellationToken)
-        {
-            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
-
-            DateTime now = DateTimeOffset.Now.UtcDateTime;
-
-            int totalCount = await dbContext.PlayoutItems
-                .CountAsync(i => i.Finish >= now && i.PlayoutId == request.PlayoutId && (request.ShowFiller || i.FillerKind == FillerKind.None), cancellationToken);
+        int totalCount = await dbContext.PlayoutItems
+            .CountAsync(i => i.Finish >= now && i.PlayoutId == request.PlayoutId && (request.ShowFiller || i.FillerKind == FillerKind.None), cancellationToken);
            
-            List<PlayoutItemViewModel> page = await dbContext.PlayoutItems
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as Movie).MovieMetadata)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as Movie).MediaVersions)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as MusicVideo).MusicVideoMetadata)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as MusicVideo).MediaVersions)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as MusicVideo).Artist)
-                .ThenInclude(mm => mm.ArtistMetadata)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as Episode).EpisodeMetadata)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as Episode).MediaVersions)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as Episode).Season)
-                .ThenInclude(s => s.SeasonMetadata)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as Episode).Season.Show)
-                .ThenInclude(s => s.ShowMetadata)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as OtherVideo).OtherVideoMetadata)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as OtherVideo).MediaVersions)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as Song).SongMetadata)
-                .Include(i => i.MediaItem)
-                .ThenInclude(mi => (mi as Song).MediaVersions)
-                .Filter(i => i.PlayoutId == request.PlayoutId)
-                .Filter(i => i.Finish >= now)
-                .Filter(i => request.ShowFiller || i.FillerKind == FillerKind.None)
-                .OrderBy(i => i.Start)
-                .Skip(request.PageNum * request.PageSize)
-                .Take(request.PageSize)
-                .ToListAsync(cancellationToken)
-                .Map(list => list.Map(ProjectToViewModel).ToList());
+        List<PlayoutItemViewModel> page = await dbContext.PlayoutItems
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as Movie).MovieMetadata)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as Movie).MediaVersions)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as MusicVideo).MusicVideoMetadata)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as MusicVideo).MediaVersions)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as MusicVideo).Artist)
+            .ThenInclude(mm => mm.ArtistMetadata)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as Episode).EpisodeMetadata)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as Episode).MediaVersions)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as Episode).Season)
+            .ThenInclude(s => s.SeasonMetadata)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as Episode).Season.Show)
+            .ThenInclude(s => s.ShowMetadata)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as OtherVideo).OtherVideoMetadata)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as OtherVideo).MediaVersions)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as Song).SongMetadata)
+            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as Song).MediaVersions)
+            .Filter(i => i.PlayoutId == request.PlayoutId)
+            .Filter(i => i.Finish >= now)
+            .Filter(i => request.ShowFiller || i.FillerKind == FillerKind.None)
+            .OrderBy(i => i.Start)
+            .Skip(request.PageNum * request.PageSize)
+            .Take(request.PageSize)
+            .ToListAsync(cancellationToken)
+            .Map(list => list.Map(ProjectToViewModel).ToList());

-            return new PagedPlayoutItemsViewModel(totalCount, page);
-        }
+        return new PagedPlayoutItemsViewModel(totalCount, page);
    }
-}
+}