diff --git a/teams/DbContexts/MlbGameDayContext.cs b/teams/DbContexts/TeamsContext.cs similarity index 96% rename from teams/DbContexts/MlbGameDayContext.cs rename to teams/DbContexts/TeamsContext.cs index b4a6f84..49e3c93 100644 --- a/teams/DbContexts/MlbGameDayContext.cs +++ b/teams/DbContexts/TeamsContext.cs @@ -24,7 +24,7 @@ namespace Teams.DbContexts if (!optionsBuilder.IsConfigured) { #warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263. - optionsBuilder.UseNpgsql("Host=localhost;Database=mlb-game-day;Username=postgres;Password=postgres"); + optionsBuilder.UseNpgsql("Host=localhost;Port=5450;Database=teams;Username=postgres;Password=postgres"); } } diff --git a/teams/Filter/PaginationFilter.cs b/teams/Filter/PaginationFilter.cs deleted file mode 100644 index 17690e0..0000000 --- a/teams/Filter/PaginationFilter.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -namespace Teams.Filter -{ - public class PaginationFilter - { - public int PageNumber { get; set; } - public int PageSize { get; set; } - - public PaginationFilter() - { - this.PageNumber = 1; - this.PageSize = 10; - } - - public PaginationFilter(int pageNumber, int pageSize) - { - this.PageNumber = pageNumber < 1 ? 1 : pageNumber; - this.PageSize = pageSize > 10 ? 10 : pageSize; - } - } -} - diff --git a/teams/Models/TeamDto.cs b/teams/Models/TeamDto.cs deleted file mode 100644 index c2327dc..0000000 --- a/teams/Models/TeamDto.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -namespace Teams.Models -{ - public class TeamDto - { - public int Id { get; set; } - public string? Name { get; set; } - public string? Abbreviation { get; set; } - public string? Active { get; set; } - public string? AllStarStatus { get; set; } - public string? ClubName { get; set; } - public int? DivisionId { get; set; } - public string? FileCode { get; set; } - public int? FirstYearOfPlay { get; set; } - public string? FranchiseName { get; set; } - public int? LeagueId { get; set; } - public string? Link { get; set; } - public string? LocationName { get; set; } - public string? Season { get; set; } - public string? ShortName { get; set; } - public int? SpringLeagueId { get; set; } - public int? SpringVenueId { get; set; } - public int? SportId { get; set; } - public string? TeamCode { get; set; } - public string? TeamName { get; set; } - public int? VenueId { get; set; } - } -} - diff --git a/teams/Profiles/TeamProfile.cs b/teams/Profiles/TeamProfile.cs deleted file mode 100644 index 9dfa2d9..0000000 --- a/teams/Profiles/TeamProfile.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using AutoMapper; - -namespace Teams.Profiles -{ - public class TeamProfile : Profile - { - public TeamProfile() - { - CreateMap(); - } - } -} - diff --git a/teams/Services/ITeamsRepository.cs b/teams/Services/ITeamsRepository.cs deleted file mode 100644 index 1b4edb4..0000000 --- a/teams/Services/ITeamsRepository.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using Teams.Entities; - -namespace Teams.Services -{ - public interface ITeamsRepository - { - Task GetTeamAsync(int teamId); - Task<(IEnumerable, PaginationMetadata)> GetTeamsAsync(int pageNumber, int pageSize); - } -} - diff --git a/teams/Services/PaginationMetadata.cs b/teams/Services/PaginationMetadata.cs deleted file mode 100644 index 1e34432..0000000 --- a/teams/Services/PaginationMetadata.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; - -namespace Teams.Services -{ - public class PaginationMetadata - { - public int TotalItemCount { get; set; } - public int TotalPageCount { get; set; } - public int PageSize { get; set; } - public int CurrentPage { get; set; } - - public PaginationMetadata(int totalItemCount, int pageSize, int currentPage) - { - TotalItemCount = totalItemCount; - PageSize = pageSize; - CurrentPage = currentPage; - TotalPageCount = (int)Math.Ceiling(totalItemCount / (double)pageSize); - } - } -} - diff --git a/teams/Services/TeamsRepository.cs b/teams/Services/TeamsRepository.cs deleted file mode 100644 index 3fa837b..0000000 --- a/teams/Services/TeamsRepository.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore; -using Teams.DbContexts; -using Teams.Entities; - -namespace Teams.Services -{ - public class TeamsRepository : ITeamsRepository - { - private readonly MlbGameDayContext _context; - - public TeamsRepository(MlbGameDayContext context) - { - _context = context ?? throw new ArgumentNullException(nameof(context)); - } - - public async Task GetTeamAsync(int teamId) - { - return await _context.Teams.Where(t => t.Id == teamId).FirstOrDefaultAsync(); - } - - public async Task<(IEnumerable, PaginationMetadata)> GetTeamsAsync(int pageNumber, int pageSize) - { - var collection = _context.Teams as IQueryable; - var totalItemCount = await collection.CountAsync(); - var paginationMetadata = new PaginationMetadata(totalItemCount, pageSize, pageNumber); - var collectionToReturn = await collection.OrderBy(t => t.Name) - .Skip(pageSize * (pageNumber - 1)) - .Take(pageSize) - .ToListAsync(); - - return (collectionToReturn, paginationMetadata); - } - } -} - diff --git a/teams/Wrappers/PagedResponse.cs b/teams/Wrappers/PagedResponse.cs deleted file mode 100644 index cee3768..0000000 --- a/teams/Wrappers/PagedResponse.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using Teams.Services; - -namespace Teams.Wrappers -{ - public class PagedResponse: Response - { - public int TotalItemCount { get; set; } - public int TotalPageCount { get; set; } - public int PageSize { get; set; } - public int CurrentPage { get; set; } - - public PagedResponse(T results, PaginationMetadata paginationMetadata) - { - this.TotalItemCount = paginationMetadata.TotalItemCount; - this.TotalPageCount = paginationMetadata.TotalPageCount; - this.CurrentPage = paginationMetadata.CurrentPage; - this.PageSize = paginationMetadata.PageSize; - this.CurrentPage = paginationMetadata.CurrentPage; - this.Results = results; - this.Message = null; - this.Succeeded = true; - this.Errors = null; - } - } -} - diff --git a/teams/Wrappers/Response.cs b/teams/Wrappers/Response.cs deleted file mode 100644 index ed2b686..0000000 --- a/teams/Wrappers/Response.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -namespace Teams.Wrappers -{ - public class Response - { - public T Results { get; set; } - public bool Succeeded { get; set; } - public string[] Errors { get; set; } - public string Message { get; set; } - - public Response() - { - } - - public Response(T results) - { - Succeeded = true; - Message = string.Empty; - Errors = null; - Results = results; - } - } -} - diff --git a/venues/DbContexts/MlbGameDayContext.cs b/venues/DbContexts/VenuesContext.cs similarity index 67% rename from venues/DbContexts/MlbGameDayContext.cs rename to venues/DbContexts/VenuesContext.cs index e2319aa..d3c9d87 100644 --- a/venues/DbContexts/MlbGameDayContext.cs +++ b/venues/DbContexts/VenuesContext.cs @@ -6,26 +6,26 @@ using Venues.Entities; namespace Venues.DbContexts { - public partial class MlbGameDayContext : DbContext + public partial class VenuesContext : DbContext { - public MlbGameDayContext() + public VenuesContext() { } - public MlbGameDayContext(DbContextOptions options) + public VenuesContext(DbContextOptions options) : base(options) { } public virtual DbSet Venues { get; set; } = null!; - //protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - //{ - // if (!optionsBuilder.IsConfigured) - // { - // optionsBuilder.UseNpgsql("Host=localhost;Database=mlb-game-day;Username=postgres;Password=postgres"); - // } - //} + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + if (!optionsBuilder.IsConfigured) + { + optionsBuilder.UseNpgsql("Host=localhost;Port=5460;Database=venues;Username=postgres;Password=postgres"); + } + } protected override void OnModelCreating(ModelBuilder modelBuilder) { diff --git a/venues/Filter/PaginationFilter.cs b/venues/Filter/PaginationFilter.cs deleted file mode 100644 index ba4a3b5..0000000 --- a/venues/Filter/PaginationFilter.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -namespace Venues.Filter -{ - public class PaginationFilter - { - public int PageNumber { get; set; } - public int PageSize { get; set; } - - public PaginationFilter() - { - this.PageNumber = 1; - this.PageSize = 10; - } - - public PaginationFilter(int pageNumber, int pageSize) - { - this.PageNumber = pageNumber < 1 ? 1 : pageNumber; - this.PageSize = pageSize > 10 ? 10 : pageSize; - } - } -} - diff --git a/venues/Models/VenueDto.cs b/venues/Models/VenueDto.cs deleted file mode 100644 index b3137a7..0000000 --- a/venues/Models/VenueDto.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -namespace Venues.Models -{ - public class VenueDto - { - public int Id { get; set; } - public string Name { get; set; } - public string Link { get; set; } - public string Active { get; set; } - } -} - diff --git a/venues/Profiles/VenueProfile.cs b/venues/Profiles/VenueProfile.cs deleted file mode 100644 index b5abd40..0000000 --- a/venues/Profiles/VenueProfile.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using AutoMapper; - -namespace Venues.Profiles -{ - public class VenueProfile : Profile - { - public VenueProfile() - { - CreateMap(); - } - } -} - diff --git a/venues/Services/IVenuesRepository.cs b/venues/Services/IVenuesRepository.cs deleted file mode 100644 index fcdc05a..0000000 --- a/venues/Services/IVenuesRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Venues.Entities; - -namespace Venues.Services -{ - public interface IVenuesRepository - { - Task<(IEnumerable, PaginationMetadata)> GetVenuesAsync(int pageNumber, int pageSize); - Task GetVenueAsync(int venueId); - } -} - diff --git a/venues/Services/PaginationMetadata.cs b/venues/Services/PaginationMetadata.cs deleted file mode 100644 index 5af59bd..0000000 --- a/venues/Services/PaginationMetadata.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -namespace Venues.Services -{ - public class PaginationMetadata - { - public int TotalItemCount { get; set; } - public int TotalPageCount { get; set; } - public int PageSize { get; set; } - public int CurrentPage { get; set; } - - public PaginationMetadata(int totalItemCount, int pageSize, int currentPage) - { - TotalItemCount = totalItemCount; - PageSize = pageSize; - CurrentPage = currentPage; - TotalPageCount = (int)Math.Ceiling(totalItemCount / (double)pageSize); - } - } -} - diff --git a/venues/Services/VenuesRepository.cs b/venues/Services/VenuesRepository.cs deleted file mode 100644 index 81e39da..0000000 --- a/venues/Services/VenuesRepository.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore; -using Venues.DbContexts; -using Venues.Entities; - -namespace Venues.Services -{ - public class VenuesRepository : IVenuesRepository - { - private readonly MlbGameDayContext _context; - - public VenuesRepository(MlbGameDayContext context) - { - _context = context ?? throw new ArgumentNullException(nameof(context)); - } - - public async Task GetVenueAsync(int venueId) - { - return await _context.Venues.Where(v => v.Id == venueId).FirstOrDefaultAsync(); - } - - public async Task<(IEnumerable, PaginationMetadata)> GetVenuesAsync(int pageNumber, int pageSize) - { - var collection = _context.Venues as IQueryable; - var totalItemCount = await collection.CountAsync(); - var paginationMetadata = new PaginationMetadata(totalItemCount, pageSize, pageNumber); - var collectionToReturn = await collection.OrderBy(v => v.Name) - .Skip(pageSize * (pageNumber -1)) - .Take(pageSize) - .ToListAsync(); - - return (collectionToReturn, paginationMetadata); - } - } -} - diff --git a/venues/Wrappers/PagedResponse.cs b/venues/Wrappers/PagedResponse.cs deleted file mode 100644 index 450f580..0000000 --- a/venues/Wrappers/PagedResponse.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using Venues.Services; - -namespace Venues.Wrappers -{ - public class PagedResponse: Response - { - public int TotalItemCount { get; set; } - public int TotalPageCount { get; set; } - public int PageSize { get; set; } - public int CurrentPage { get; set; } - - public PagedResponse(T results, PaginationMetadata paginationMetadata) - { - this.TotalItemCount = paginationMetadata.TotalItemCount; - this.TotalPageCount = paginationMetadata.TotalPageCount; - this.CurrentPage = paginationMetadata.CurrentPage; - this.PageSize = paginationMetadata.PageSize; - this.CurrentPage = paginationMetadata.CurrentPage; - this.Results = results; - this.Message = null; - this.Succeeded = true; - this.Errors = null; - } - } -} - diff --git a/venues/Wrappers/Response.cs b/venues/Wrappers/Response.cs deleted file mode 100644 index 97626df..0000000 --- a/venues/Wrappers/Response.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -namespace Venues.Wrappers -{ - public class Response - { - public T Results { get; set; } - public bool Succeeded { get; set; } - public string[] Errors { get; set; } - public string Message { get; set; } - - public Response() - { - } - - public Response(T results) - { - Succeeded = true; - Message = string.Empty; - Errors = null; - Results = results; - } - - - } -} -