diff --git a/Controllers/AppUsersController.cs b/Controllers/AppUsersController.cs index 940e98d..f93ade2 100644 --- a/Controllers/AppUsersController.cs +++ b/Controllers/AppUsersController.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using TicketManager.Data; using TicketManager.Models; -using TicketManager.DTO; +using TicketManager.Resources; namespace TicketManager.Controllers diff --git a/Controllers/ProjectsController.cs b/Controllers/ProjectsController.cs index 61a5a6d..c06bfb0 100644 --- a/Controllers/ProjectsController.cs +++ b/Controllers/ProjectsController.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using TicketManager.Data; using TicketManager.Models; -using TicketManager.DTO; +using TicketManager.Resources; using System; namespace TicketManager.Controllers diff --git a/Controllers/TicketsController.cs b/Controllers/TicketsController.cs index 6db1f84..25fa0a9 100644 --- a/Controllers/TicketsController.cs +++ b/Controllers/TicketsController.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using TicketManager.Data; -using TicketManager.DTO; +using TicketManager.Resources; using TicketManager.Models; namespace TicketManager.Controllers diff --git a/DTOs/AppUser/AppUserDTO.cs b/Resources/AppUser/AppUserDTO.cs similarity index 97% rename from DTOs/AppUser/AppUserDTO.cs rename to Resources/AppUser/AppUserDTO.cs index da918b7..c942884 100644 --- a/DTOs/AppUser/AppUserDTO.cs +++ b/Resources/AppUser/AppUserDTO.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using TicketManager.Models; -namespace TicketManager.DTO +namespace TicketManager.Resources { public class AppUserDTO { diff --git a/DTOs/AppUser/AppUserDTORead.cs b/Resources/AppUser/AppUserDTORead.cs similarity index 97% rename from DTOs/AppUser/AppUserDTORead.cs rename to Resources/AppUser/AppUserDTORead.cs index a814720..494476a 100644 --- a/DTOs/AppUser/AppUserDTORead.cs +++ b/Resources/AppUser/AppUserDTORead.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using TicketManager.Models; -namespace TicketManager.DTO +namespace TicketManager.Resources { public class AppUserDTORead { diff --git a/DTOs/AppUser/NewAppUserDTO.cs b/Resources/AppUser/NewAppUserDTO.cs similarity index 92% rename from DTOs/AppUser/NewAppUserDTO.cs rename to Resources/AppUser/NewAppUserDTO.cs index f99ae3d..824e8fe 100644 --- a/DTOs/AppUser/NewAppUserDTO.cs +++ b/Resources/AppUser/NewAppUserDTO.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace TicketManager.DTO +namespace TicketManager.Resources { public class NewAppUserDTO { diff --git a/DTOs/Project/NewProjectDTO.cs b/Resources/Project/NewProjectDTO.cs similarity index 90% rename from DTOs/Project/NewProjectDTO.cs rename to Resources/Project/NewProjectDTO.cs index b696398..e6d1bf9 100644 --- a/DTOs/Project/NewProjectDTO.cs +++ b/Resources/Project/NewProjectDTO.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace TicketManager.DTO +namespace TicketManager.Resources { public class NewProjectDTO { diff --git a/DTOs/Project/ProjectDTO.cs b/Resources/Project/ProjectDTO.cs similarity index 97% rename from DTOs/Project/ProjectDTO.cs rename to Resources/Project/ProjectDTO.cs index 6be538a..5da13c7 100644 --- a/DTOs/Project/ProjectDTO.cs +++ b/Resources/Project/ProjectDTO.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Collections.Generic; using TicketManager.Models; -namespace TicketManager.DTO +namespace TicketManager.Resources { public class ProjectDTO { diff --git a/DTOs/Project/ProjectDTORequest.cs b/Resources/Project/ProjectDTORequest.cs similarity index 96% rename from DTOs/Project/ProjectDTORequest.cs rename to Resources/Project/ProjectDTORequest.cs index 374c051..ea14bae 100644 --- a/DTOs/Project/ProjectDTORequest.cs +++ b/Resources/Project/ProjectDTORequest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Collections.Generic; using TicketManager.Models; -namespace TicketManager.DTO +namespace TicketManager.Resources { public class ProjectDTORequest { diff --git a/DTOs/Tickets/NewTicketDTO.cs b/Resources/Tickets/NewTicketDTO.cs similarity index 94% rename from DTOs/Tickets/NewTicketDTO.cs rename to Resources/Tickets/NewTicketDTO.cs index ef7629c..45864d2 100644 --- a/DTOs/Tickets/NewTicketDTO.cs +++ b/Resources/Tickets/NewTicketDTO.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using TicketManager.Models; -namespace TicketManager.DTO +namespace TicketManager.Resources { public class NewTicketDTO { diff --git a/DTOs/Tickets/TicketDTO.cs b/Resources/Tickets/TicketDTO.cs similarity index 93% rename from DTOs/Tickets/TicketDTO.cs rename to Resources/Tickets/TicketDTO.cs index 3d7154f..46cfe75 100644 --- a/DTOs/Tickets/TicketDTO.cs +++ b/Resources/Tickets/TicketDTO.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using TicketManager.Models; -namespace TicketManager.DTO +namespace TicketManager.Resources { public class TicketDTO { @@ -20,7 +20,7 @@ namespace TicketManager.DTO Difficulty = ticket.Difficulty.ToString(); Category = ticket.Category.ToString(); CreatorId = ticket.CreatorId; - Project = new ProjectDTORequest(ticket.Project); + Project = ticket.Project != null ? new ProjectDTORequest(ticket.Project) : null; Notes = ticket.Notes; Activities = ticket.Activities; Files = ticket.Files; diff --git a/DTOs/Tickets/TicketDTORead.cs b/Resources/Tickets/TicketDTORead.cs similarity index 97% rename from DTOs/Tickets/TicketDTORead.cs rename to Resources/Tickets/TicketDTORead.cs index edf131d..620a044 100644 --- a/DTOs/Tickets/TicketDTORead.cs +++ b/Resources/Tickets/TicketDTORead.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using TicketManager.Models; -namespace TicketManager.DTO +namespace TicketManager.Resources { public class TicketDTORead { diff --git a/Tests/TicketManager.Tests/UnitTests/ControllersTests/ProjectControllerTests.cs b/Tests/TicketManager.Tests/UnitTests/ControllersTests/ProjectControllerTests.cs index 43892b1..8748691 100644 --- a/Tests/TicketManager.Tests/UnitTests/ControllersTests/ProjectControllerTests.cs +++ b/Tests/TicketManager.Tests/UnitTests/ControllersTests/ProjectControllerTests.cs @@ -8,7 +8,7 @@ using Microsoft.Data.Sqlite; using TicketManager.Controllers; using TicketManager.Data; using TicketManager.Models; -using TicketManager.DTO; +using TicketManager.Resources; namespace TicketManager.Tests