From 112ccbefeee62030e0b365b826e9b57debb10cd9 Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Thu, 20 Feb 2020 09:00:34 +0100 Subject: [PATCH] Light code cleaning --- Data/ProjectRepository working.cs | 57 ------------------------------- Data/UnitOfWork.cs | 1 - Models/AppUser.cs | 3 +- Models/File.cs | 2 -- Models/Project.cs | 3 +- Models/Ticket.cs | 2 +- README.md | 1 + TicketManager.csproj | 7 +--- 8 files changed, 5 insertions(+), 71 deletions(-) delete mode 100644 Data/ProjectRepository working.cs diff --git a/Data/ProjectRepository working.cs b/Data/ProjectRepository working.cs deleted file mode 100644 index c63560c..0000000 --- a/Data/ProjectRepository working.cs +++ /dev/null @@ -1,57 +0,0 @@ -// using System.Threading.Tasks; -// using TicketManager.Models; -// using System.Linq; -// using Microsoft.EntityFrameworkCore; -// using System.Collections.Generic; -// using Microsoft.AspNetCore.Mvc; - -// namespace TicketManager.Data -// { -// public class ProjectRepository : IProjectRepository -// { -// private readonly AppDbContext _context; -// private readonly IQueryable _query; -// public ProjectRepository(AppDbContext context) -// { -// _context = context; -// _query = _context.Projects -// .Include(p => p.Assignments) -// .ThenInclude(a => a.User) -// .Include(p => p.Tickets) -// .Include(p => p.Manager) -// .Include(p => p.Files); -// } - -// public Task AddAsync(Project project) -// { -// _context.Projects.Add(project); -// return _context.SaveChangesAsync(); -// } - -// public async Task DeleteAsync(int id) -// { -// Project project = await GetByIdAsync(id); -// _context.Projects.Remove(project); -// return await _context.SaveChangesAsync(); -// } - -// public async Task GetByIdAsync(int id) -// { -// return await _query.FirstOrDefaultAsync(p => p.Id == id); -// } - -// public async Task> ListAsync() -// { -// return await _query.ToListAsync(); -// } - -// public Task UpdateAsync(Project project) -// { -// _context.Entry(project).State = EntityState.Modified; -// return _context.SaveChangesAsync(); -// } -// public bool Exists(int id) -// { return _context.Projects.Any(e => e.Id == id); } - -// } -// } \ No newline at end of file diff --git a/Data/UnitOfWork.cs b/Data/UnitOfWork.cs index 3a70423..1a0e21a 100644 --- a/Data/UnitOfWork.cs +++ b/Data/UnitOfWork.cs @@ -24,7 +24,6 @@ namespace TicketManager.Data { return await _context.SaveChangesAsync(); } - public void Dispose() { _context.DisposeAsync(); diff --git a/Models/AppUser.cs b/Models/AppUser.cs index 8d81141..63f2a4d 100644 --- a/Models/AppUser.cs +++ b/Models/AppUser.cs @@ -38,7 +38,6 @@ namespace TicketManager.Models // [Display(Name = "Avatar")] // public byte[] Picture { get; set; } - // public Role Role { get; set; } public List Assignments { get; set; } = new List(); @@ -53,7 +52,7 @@ namespace TicketManager.Models public List GetTickets() { - List tickets = new List(); + var tickets = new List(); GetProjects().ForEach(p => tickets.Concat(p.Tickets)); return tickets; } diff --git a/Models/File.cs b/Models/File.cs index 8dd01e4..b2b7485 100644 --- a/Models/File.cs +++ b/Models/File.cs @@ -5,8 +5,6 @@ namespace TicketManager.Models { public class File { - - public int Id { get; set; } public string FileName { get; set; } diff --git a/Models/Project.cs b/Models/Project.cs index acebe5f..372cd35 100644 --- a/Models/Project.cs +++ b/Models/Project.cs @@ -119,8 +119,7 @@ namespace TicketManager.Models this.AddMembers(projectMembers); } } - // public int GetMembersCount() => this.GetMembers().Count(); - // public void GetTicketsCount() => this.Tickets.Count(); + public void GetTicketsUpdates() { throw new NotImplementedException("Not Implemented"); } diff --git a/Models/Ticket.cs b/Models/Ticket.cs index abd1ede..24ec37a 100644 --- a/Models/Ticket.cs +++ b/Models/Ticket.cs @@ -29,7 +29,7 @@ namespace TicketManager.Models public Difficulty Difficulty { get; set; } = Difficulty.Undefined; public Category Category { get; set; } = Category.Undefined; - [Display(Name = "Created By")] + // [Display(Name = "Created By")] // public AppUser Creator { get; set; } public Guid CreatorId { get; set; } diff --git a/README.md b/README.md index e28c7ca..100dedc 100644 --- a/README.md +++ b/README.md @@ -43,3 +43,4 @@ - Async model methods ? - update assignments automatically from context - use PATCH instead of PUT +- logging diff --git a/TicketManager.csproj b/TicketManager.csproj index 1f38ad6..812b03b 100644 --- a/TicketManager.csproj +++ b/TicketManager.csproj @@ -3,10 +3,7 @@ netcoreapp3.1 - - 8.0 - - + 8.0 @@ -16,9 +13,7 @@ - -