From 2c8ce46a75017daae017368a71e57d19fdbc8d2c Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Thu, 5 Mar 2020 14:19:03 +0100 Subject: [PATCH 1/2] logging --- Program.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Program.cs b/Program.cs index 35c5cb4..11a83ca 100644 --- a/Program.cs +++ b/Program.cs @@ -23,6 +23,13 @@ namespace TicketManager { webBuilder.UseStartup(); }); + // .ConfigureLogging((context, logging) => + // { + // logging.ClearProviders(); + // logging.AddConfiguration(context.Configuration.GetSection("Logging")); + // logging.AddDebug(); + // logging.AddConsole(); + // }); } #pragma warning restore CS1591 } From c8908b0bfe6345eb9e098498d435f3141b040b8c Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Fri, 17 Apr 2020 13:37:34 +0200 Subject: [PATCH 2/2] [chore]: renamed Ressources/Tickets -> Ticket --- Controllers/AppUsersController.cs | 4 ++-- Resources/AppUser/AppUserDTO.cs | 4 ++-- Resources/Project/{ProjectDTORequest.cs => ProjectDTORead.cs} | 4 ++-- Resources/{Tickets => Ticket}/NewTicketDTO.cs | 0 Resources/{Tickets => Ticket}/TicketDTO.cs | 4 ++-- Resources/{Tickets => Ticket}/TicketDTORead.cs | 0 .../UnitTests/ControllersTests/ProjectControllerTests.cs | 2 +- client/src/authentication/config.json | 4 ++++ 8 files changed, 13 insertions(+), 9 deletions(-) rename Resources/Project/{ProjectDTORequest.cs => ProjectDTORead.cs} (91%) rename Resources/{Tickets => Ticket}/NewTicketDTO.cs (100%) rename Resources/{Tickets => Ticket}/TicketDTO.cs (92%) rename Resources/{Tickets => Ticket}/TicketDTORead.cs (100%) create mode 100644 client/src/authentication/config.json diff --git a/Controllers/AppUsersController.cs b/Controllers/AppUsersController.cs index f93ade2..3b20410 100644 --- a/Controllers/AppUsersController.cs +++ b/Controllers/AppUsersController.cs @@ -200,7 +200,7 @@ namespace TicketManager.Controllers } [HttpGet("{id}/projects")] - public async Task>> GetAppUserProjects(Guid id) + public async Task>> GetAppUserProjects(Guid id) { var user = await _context.AppUsers .Include(u => u.Assignments) @@ -211,7 +211,7 @@ namespace TicketManager.Controllers { return BadRequest(); } - return user.GetProjects().Select(p => new ProjectDTORequest(p)).ToList(); + return user.GetProjects().Select(p => new ProjectDTORead(p)).ToList(); } [HttpGet("{id}/tickets/")] diff --git a/Resources/AppUser/AppUserDTO.cs b/Resources/AppUser/AppUserDTO.cs index c942884..ee6d90d 100644 --- a/Resources/AppUser/AppUserDTO.cs +++ b/Resources/AppUser/AppUserDTO.cs @@ -19,7 +19,7 @@ namespace TicketManager.Resources CreationDate = user.CreationDate; Picture = user.Picture; Activities = user.Activities; - Projects = user.GetProjects().Select(u => new ProjectDTORequest(u)).ToList(); + Projects = user.GetProjects().Select(u => new ProjectDTORead(u)).ToList(); Tickets = user.GetTickets().Select(u => new TicketDTORead(u)).ToList(); } @@ -46,7 +46,7 @@ namespace TicketManager.Resources public List Activities { get; set; } = new List(); - public List Projects { get; set; } = new List(); + public List Projects { get; set; } = new List(); public List Tickets { get; set; } = new List(); } diff --git a/Resources/Project/ProjectDTORequest.cs b/Resources/Project/ProjectDTORead.cs similarity index 91% rename from Resources/Project/ProjectDTORequest.cs rename to Resources/Project/ProjectDTORead.cs index ea14bae..e6f658d 100644 --- a/Resources/Project/ProjectDTORequest.cs +++ b/Resources/Project/ProjectDTORead.cs @@ -5,9 +5,9 @@ using TicketManager.Models; namespace TicketManager.Resources { - public class ProjectDTORequest + public class ProjectDTORead { - public ProjectDTORequest(Project project) + public ProjectDTORead(Project project) { Id = project.Id; Title = project.Title; diff --git a/Resources/Tickets/NewTicketDTO.cs b/Resources/Ticket/NewTicketDTO.cs similarity index 100% rename from Resources/Tickets/NewTicketDTO.cs rename to Resources/Ticket/NewTicketDTO.cs diff --git a/Resources/Tickets/TicketDTO.cs b/Resources/Ticket/TicketDTO.cs similarity index 92% rename from Resources/Tickets/TicketDTO.cs rename to Resources/Ticket/TicketDTO.cs index 46cfe75..9446271 100644 --- a/Resources/Tickets/TicketDTO.cs +++ b/Resources/Ticket/TicketDTO.cs @@ -20,7 +20,7 @@ namespace TicketManager.Resources Difficulty = ticket.Difficulty.ToString(); Category = ticket.Category.ToString(); CreatorId = ticket.CreatorId; - Project = ticket.Project != null ? new ProjectDTORequest(ticket.Project) : null; + Project = ticket.Project != null ? new ProjectDTORead(ticket.Project) : null; Notes = ticket.Notes; Activities = ticket.Activities; Files = ticket.Files; @@ -49,7 +49,7 @@ namespace TicketManager.Resources public Guid CreatorId { get; set; } - public ProjectDTORequest Project { get; set; } + public ProjectDTORead Project { get; set; } public List Notes { get; set; } = new List(); diff --git a/Resources/Tickets/TicketDTORead.cs b/Resources/Ticket/TicketDTORead.cs similarity index 100% rename from Resources/Tickets/TicketDTORead.cs rename to Resources/Ticket/TicketDTORead.cs diff --git a/Tests/TicketManager.Tests/UnitTests/ControllersTests/ProjectControllerTests.cs b/Tests/TicketManager.Tests/UnitTests/ControllersTests/ProjectControllerTests.cs index 8748691..d977140 100644 --- a/Tests/TicketManager.Tests/UnitTests/ControllersTests/ProjectControllerTests.cs +++ b/Tests/TicketManager.Tests/UnitTests/ControllersTests/ProjectControllerTests.cs @@ -158,7 +158,7 @@ namespace TicketManager.Tests await context.SaveChangesAsync(); // result = await controller.PatchProject(1, - // new ProjectDTORequest() + // new ProjectDTORead() // { // Id = 1, // Title = "Top Secret Project", diff --git a/client/src/authentication/config.json b/client/src/authentication/config.json new file mode 100644 index 0000000..4d92418 --- /dev/null +++ b/client/src/authentication/config.json @@ -0,0 +1,4 @@ +{ + "domain": "dev-fyjrvohx.auth0.com", + "clientId": "NOTxfOhjCLkdvsstLm2tcS1kiAjCdWm9" +} \ No newline at end of file