mirror of
https://github.com/rjNemo/ticket_manager
synced 2026-06-06 00:36:39 +00:00
Added TicketDTO, AppUserDTO. Updated controllers to output DTOs
This commit is contained in:
parent
d692d10e72
commit
dfbd6632c0
18 changed files with 391 additions and 436 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -6,6 +6,9 @@ Migrations/
|
|||
app.db*
|
||||
.DS_Store
|
||||
app.db
|
||||
Data/Interfaces
|
||||
Data/UnitOfWork.cs
|
||||
Data/*Repository.cs
|
||||
|
||||
# client
|
||||
client/src/pages/TestPage.tsx
|
||||
|
|
|
|||
|
|
@ -1,38 +1,78 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using System.Linq;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using TicketManager.Data;
|
||||
using TicketManager.Models;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using TicketManager.DTO;
|
||||
|
||||
|
||||
namespace TicketManager.Controllers
|
||||
{
|
||||
// [Authorize]
|
||||
[Produces("application/json")]
|
||||
[Route("api/v1/users")]
|
||||
[ApiController]
|
||||
public class UsersController : ControllerBase
|
||||
{
|
||||
private readonly IAppUserRepository _users;
|
||||
private readonly AppDbContext _context;
|
||||
|
||||
public UsersController(IAppUserRepository users)
|
||||
public UsersController(AppDbContext context)
|
||||
{
|
||||
_users = users;
|
||||
_context = context;
|
||||
}
|
||||
|
||||
// GET: api/Users
|
||||
/// <summary>
|
||||
/// Returns all Users stored in the database.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Sample request:
|
||||
///
|
||||
/// GET: api/v1/Users
|
||||
///
|
||||
/// </remarks>
|
||||
/// <response code="200">Returns a list of users</response>
|
||||
[HttpGet]
|
||||
public async Task<IEnumerable<AppUser>> GetUsers()
|
||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||
public async Task<IEnumerable<AppUserDTO>> GetUsers()
|
||||
{
|
||||
return await _users.List();
|
||||
return await _context.AppUsers
|
||||
.Include(u => u.Assignments)
|
||||
.ThenInclude(a => a.Project)
|
||||
.Include(u => u.Activities)
|
||||
.AsNoTracking()
|
||||
.Select(u => new AppUserDTO(u))
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
// GET: api/Users/5
|
||||
/// <summary>
|
||||
/// Locate a specific User stored in the database by its Id
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Sample request:
|
||||
///
|
||||
/// GET: api/v1/Users/2
|
||||
///
|
||||
/// </remarks>
|
||||
/// <response code="200">Returns a User object</response>
|
||||
/// <response code="404">If the required User is null</response>
|
||||
[HttpGet("{id}")]
|
||||
public async Task<ActionResult<AppUser>> GetUser(Guid id)
|
||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public async Task<ActionResult<AppUserDTO>> GetUser(Guid id)
|
||||
{
|
||||
var user = await _users.GetUser(id);
|
||||
var user = await _context.AppUsers
|
||||
.Include(u => u.Assignments)
|
||||
.ThenInclude(a => a.Project)
|
||||
.Include(u => u.Activities)
|
||||
.AsNoTracking()
|
||||
.Select(u => new AppUserDTO(u))
|
||||
.FirstOrDefaultAsync(u => u.Id == id);
|
||||
|
||||
if (user == null)
|
||||
{
|
||||
return NotFound();
|
||||
|
|
@ -40,23 +80,44 @@ namespace TicketManager.Controllers
|
|||
return user;
|
||||
}
|
||||
|
||||
// PUT: api/Users/5
|
||||
// To protect from overposting attacks, please enable the specific properties you want to bind to, for
|
||||
// more details see https://aka.ms/RazorPagesCRUD.
|
||||
/// <summary>
|
||||
/// Updates the specific project with Id.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Sample request:
|
||||
///
|
||||
/// PUT: api/v1/Projects/3
|
||||
/// {
|
||||
/// "id": "357727fd-5262-4522-b8a3-38271d43de84",
|
||||
/// "firstName": "Thomas",
|
||||
/// "lastName": "Price",
|
||||
/// "presentation": "New Team?!",
|
||||
/// "email": "tp@mail.com",
|
||||
/// "phone": "0198237645"
|
||||
/// }
|
||||
///
|
||||
/// </remarks>
|
||||
/// <response code="204">Request was succesful but no content is changed</response>
|
||||
/// <response code="404">If the required project is null</response>
|
||||
[HttpPut("{id}")]
|
||||
[ProducesResponseType(StatusCodes.Status204NoContent)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public async Task<IActionResult> PutUser(Guid id, AppUser user)
|
||||
{
|
||||
if (id != user.Id)
|
||||
{
|
||||
return BadRequest();
|
||||
}
|
||||
|
||||
_context.Entry(user).State = EntityState.Modified;
|
||||
|
||||
try
|
||||
{
|
||||
await _users.Update(user);
|
||||
await _context.SaveChangesAsync();
|
||||
}
|
||||
catch (DbUpdateConcurrencyException)
|
||||
{
|
||||
if (!_users.Exists(id))
|
||||
if (!UserExists(id))
|
||||
{
|
||||
return NotFound();
|
||||
}
|
||||
|
|
@ -68,49 +129,101 @@ namespace TicketManager.Controllers
|
|||
return NoContent();
|
||||
}
|
||||
|
||||
// POST: api/Users
|
||||
// To protect from overposting attacks, please enable the specific properties you want to bind to, for
|
||||
// more details see https://aka.ms/RazorPagesCRUD.
|
||||
/// <summary>
|
||||
/// Creates a project.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Sample request:
|
||||
///
|
||||
/// POST: api/v1/Projects/
|
||||
/// {
|
||||
/// "firstName": "Thomas",
|
||||
/// "lastName": "Price",
|
||||
/// "presentation": "New Team?!",
|
||||
/// "email": "tp@mail.com",
|
||||
/// "phone": "0198237645"
|
||||
/// }
|
||||
///
|
||||
/// </remarks>
|
||||
/// <response code="201">Returns the created project</response>
|
||||
[HttpPost]
|
||||
public async Task<ActionResult<AppUser>> PostUser(AppUser user)
|
||||
[ProducesResponseType(StatusCodes.Status201Created)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public async Task<ActionResult<AppUserDTO>> PostUser(AppUser user)
|
||||
{
|
||||
await _users.Add(user);
|
||||
return CreatedAtAction("GetUser", new { id = user.Id }, user);
|
||||
if (!ModelState.IsValid)
|
||||
{
|
||||
return BadRequest();
|
||||
}
|
||||
|
||||
// DELETE: api/Users/5
|
||||
_context.AppUsers.Add(user);
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
var dto = new AppUserDTO(user);
|
||||
|
||||
return CreatedAtAction("GetUser", new { id = user.Id }, dto);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Deletes the project identified by its Id
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Sample request:
|
||||
///
|
||||
/// DELETE: api/v1/Projects/5
|
||||
///
|
||||
/// </remarks>
|
||||
/// <response code="200">Returns the deleted project</response>
|
||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
[HttpDelete("{id}")]
|
||||
public async Task<ActionResult<AppUser>> DeleteUser(Guid id)
|
||||
public async Task<ActionResult<AppUserDTO>> DeleteUser(Guid id)
|
||||
{
|
||||
var user = await _users.GetUser(id);
|
||||
var user = await _context.AppUsers.FindAsync(id);
|
||||
if (user == null)
|
||||
{
|
||||
return NotFound();
|
||||
}
|
||||
await _users.Delete(user);
|
||||
return user;
|
||||
_context.AppUsers.Remove(user);
|
||||
await _context.SaveChangesAsync();
|
||||
var dto = new AppUserDTO(user);
|
||||
return Ok(user);
|
||||
}
|
||||
|
||||
[HttpGet("{id}/projects")]
|
||||
public async Task<ActionResult<IEnumerable<Project>>> GetAppUserProjects(Guid id)
|
||||
public async Task<ActionResult<IEnumerable<ProjectDTO>>> GetAppUserProjects(Guid id)
|
||||
{
|
||||
AppUser user = await _users.GetUser(id);
|
||||
var user = await _context.AppUsers
|
||||
.Include(u => u.Assignments)
|
||||
.ThenInclude(a => a.Project)
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(u => u.Id == id);
|
||||
if (user == null)
|
||||
{
|
||||
return BadRequest();
|
||||
}
|
||||
return user.GetProjects();
|
||||
return user.GetProjects().Select(p => new ProjectDTO(p)).ToList();
|
||||
}
|
||||
|
||||
[HttpGet("{id}/tickets/")]
|
||||
public async Task<ActionResult<IEnumerable<Ticket>>> GetAppUserTickets(Guid id)
|
||||
public async Task<ActionResult<IEnumerable<TicketDTO>>> GetAppUserTickets(Guid id)
|
||||
{
|
||||
AppUser user = await _users.GetUser(id);
|
||||
var user = await _context.AppUsers
|
||||
.Include(u => u.Assignments)
|
||||
.ThenInclude(a => a.Project)
|
||||
.ThenInclude(p => p.Tickets)
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(u => u.Id == id);
|
||||
if (user == null)
|
||||
{
|
||||
return BadRequest();
|
||||
}
|
||||
return user.GetTickets();
|
||||
return user.GetTickets().Select(t => new TicketDTO(t)).ToList();
|
||||
}
|
||||
|
||||
private bool UserExists(Guid id)
|
||||
{
|
||||
return _context.AppUsers.Any(e => e.Id == id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,10 +18,11 @@ namespace TicketManager.Controllers
|
|||
[ApiController]
|
||||
public class ProjectsController : ControllerBase
|
||||
{
|
||||
private IProjectRepository _projects;
|
||||
public ProjectsController(IProjectRepository context)
|
||||
private readonly AppDbContext _context;
|
||||
|
||||
public ProjectsController(AppDbContext context)
|
||||
{
|
||||
_projects = context;
|
||||
_context = context;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -36,10 +37,18 @@ namespace TicketManager.Controllers
|
|||
/// <response code="200">Returns a list of projects</response>
|
||||
[HttpGet]
|
||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||
public async Task<IEnumerable<Project>> GetProjects()
|
||||
public async Task<IEnumerable<ProjectDTO>> GetProjects()
|
||||
{
|
||||
|
||||
return await _projects.List();
|
||||
return await _context.Projects
|
||||
.Include(p => p.Assignments)
|
||||
.ThenInclude(a => a.User)
|
||||
.Include(p => p.Tickets)
|
||||
.Include(p => p.Manager)
|
||||
.Include(p => p.Files)
|
||||
.Include(p => p.Activities)
|
||||
.AsNoTracking()
|
||||
.Select(p => new ProjectDTO(p))
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -58,12 +67,22 @@ namespace TicketManager.Controllers
|
|||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public async Task<ActionResult<ProjectDTO>> GetProject(int id)
|
||||
{
|
||||
Project project = await _projects.Get(id);
|
||||
var project = await _context.Projects
|
||||
.Include(p => p.Assignments)
|
||||
.ThenInclude(a => a.User)
|
||||
.Include(p => p.Tickets)
|
||||
.Include(p => p.Manager)
|
||||
.Include(p => p.Files)
|
||||
.Include(p => p.Activities)
|
||||
.AsNoTracking()
|
||||
.Select(p => new ProjectDTO(p))
|
||||
.FirstOrDefaultAsync(p => p.Id == id);
|
||||
|
||||
if (project == null)
|
||||
{
|
||||
return NotFound();
|
||||
}
|
||||
return new ProjectDTO(project);
|
||||
return project;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -90,15 +109,25 @@ namespace TicketManager.Controllers
|
|||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public async Task<IActionResult> PutProject(int id, Project project)
|
||||
{
|
||||
if (id != project.Id) { return BadRequest(); }
|
||||
if (id != project.Id)
|
||||
{
|
||||
return BadRequest();
|
||||
}
|
||||
_context.Entry(project).State = EntityState.Modified;
|
||||
try
|
||||
{
|
||||
await _projects.Update(project);
|
||||
await _context.SaveChangesAsync();
|
||||
}
|
||||
catch (DbUpdateConcurrencyException)
|
||||
{
|
||||
if (!_projects.Exists(id)) { return NotFound(); }
|
||||
else { throw; }
|
||||
if (!ProjectExists(id))
|
||||
{
|
||||
return NotFound();
|
||||
}
|
||||
else
|
||||
{
|
||||
throw;
|
||||
}
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
|
|
@ -123,11 +152,16 @@ namespace TicketManager.Controllers
|
|||
[HttpPost]
|
||||
[ProducesResponseType(StatusCodes.Status201Created)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public async Task<ActionResult<Project>> PostProject(Project project)
|
||||
public async Task<ActionResult<ProjectDTO>> PostProject(Project project)
|
||||
{
|
||||
if (!ModelState.IsValid) { return BadRequest(); }
|
||||
await _projects.Add(project);
|
||||
return CreatedAtAction("GetProject", new { id = project.Id }, project);
|
||||
if (!ModelState.IsValid)
|
||||
{
|
||||
return BadRequest();
|
||||
}
|
||||
_context.Projects.Add(project);
|
||||
await _context.SaveChangesAsync();
|
||||
var dto = new ProjectDTO(project);
|
||||
return CreatedAtAction("GetProject", new { id = project.Id }, dto);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -145,13 +179,15 @@ namespace TicketManager.Controllers
|
|||
[HttpDelete("{id}")]
|
||||
public async Task<IActionResult> DeleteProject(int id)
|
||||
{
|
||||
var project = await _projects.Get(id);
|
||||
var project = await _context.Projects.FindAsync(id);
|
||||
if (project == null)
|
||||
{
|
||||
return NotFound();
|
||||
}
|
||||
await _projects.Delete(project);
|
||||
return Ok();
|
||||
_context.Projects.Remove(project);
|
||||
await _context.SaveChangesAsync();
|
||||
var dto = new ProjectDTO(project);
|
||||
return Ok(dto);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -169,9 +205,20 @@ namespace TicketManager.Controllers
|
|||
[HttpGet("{id}/members")]
|
||||
public async Task<ActionResult<List<AppUser>>> GetProjectMembers(int id)
|
||||
{
|
||||
var project = await _projects.Get(id);
|
||||
Project project = await _context.Projects
|
||||
.Include(p => p.Assignments)
|
||||
.ThenInclude(a => a.User)
|
||||
.Include(p => p.Tickets)
|
||||
.Include(p => p.Manager)
|
||||
.Include(p => p.Files)
|
||||
.Include(p => p.Activities)
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(p => p.Id == id);
|
||||
|
||||
if (project == null)
|
||||
{ return NotFound(); }
|
||||
{
|
||||
return NotFound();
|
||||
}
|
||||
return project.GetMembers();
|
||||
}
|
||||
|
||||
|
|
@ -198,15 +245,21 @@ namespace TicketManager.Controllers
|
|||
[HttpPut("{id}/members")]
|
||||
public async Task<ActionResult<Project>> SetProjectMembers(int id, List<AppUser> projectMembers)
|
||||
{
|
||||
Project project = await _projects.Get(id);
|
||||
Project project = await _context.Projects
|
||||
.Include(p => p.Assignments)
|
||||
.FirstOrDefaultAsync(p => p.Id == id);
|
||||
|
||||
if (project == null)
|
||||
{
|
||||
return NotFound();
|
||||
}
|
||||
|
||||
project.SetMembers(projectMembers);
|
||||
_context.Entry(project).State = EntityState.Modified;
|
||||
try
|
||||
{
|
||||
await _projects.Update(project);
|
||||
|
||||
await _context.SaveChangesAsync();
|
||||
}
|
||||
catch (DbUpdateException /* ex */)
|
||||
{
|
||||
|
|
@ -218,86 +271,9 @@ namespace TicketManager.Controllers
|
|||
return NoContent();
|
||||
}
|
||||
|
||||
// // /// <summary>
|
||||
// // /// Assign a user to a project.
|
||||
// // /// </summary>
|
||||
// // /// <remarks>
|
||||
// // /// Sample request:
|
||||
// // ///
|
||||
// // /// POST: api/v1/Projects/addmembers
|
||||
// // /// [{
|
||||
// // /// "id": "357727fd-5262-4522-b8a3-38271d43de84",
|
||||
// // /// "firstName": "Thomas",
|
||||
// // /// "lastName": "Price",
|
||||
// // /// "presentation": "New Team?!",
|
||||
// // /// "email": "tp@mail.com",
|
||||
// // /// "phone": "0198237645"
|
||||
// // /// }]
|
||||
// // ///
|
||||
// // /// </remarks>
|
||||
// // /// <response code="204">Returns the created project</response>
|
||||
// // [ProducesResponseType(StatusCodes.Status204NoContent)]
|
||||
// // [ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
// // [HttpPut("{id}/addMembers")]
|
||||
// // public async Task<ActionResult<Project>> AddMembersToProject(int id, List<AppUser> usersToAdd)
|
||||
// // {
|
||||
// // if (usersToAdd == null)
|
||||
// // {
|
||||
// // return BadRequest();
|
||||
// // }
|
||||
// // Project project = await GetProjectByIdAsync(id);
|
||||
// // project.AddMembers(usersToAdd);
|
||||
// // try
|
||||
// // {
|
||||
// // await _context.SaveChangesAsync();
|
||||
// // }
|
||||
// // catch (DbUpdateException /* ex */)
|
||||
// // {
|
||||
// // //Log the error (uncomment ex variable name and write a log.)
|
||||
// // ModelState.AddModelError("", "Unable to save changes. " +
|
||||
// // "Try again, and if the problem persists, " +
|
||||
// // "see your system administrator.");
|
||||
// // }
|
||||
// // return NoContent();
|
||||
// // }
|
||||
|
||||
// // /// <summary>
|
||||
// // /// Remove a user to a project.
|
||||
// // /// </summary>
|
||||
// // /// <remarks>
|
||||
// // /// Sample request:
|
||||
// // ///
|
||||
// // /// PUT: api/v1/Projects/removemembers
|
||||
// // /// [{
|
||||
// // /// "id": "357727fd-5262-4522-b8a3-38271d43de84",
|
||||
// // /// "firstName": "Thomas",
|
||||
// // /// "lastName": "Price",
|
||||
// // /// "presentation": "New Team?!",
|
||||
// // /// "email": "tp@mail.com",
|
||||
// // /// "phone": "0198237645"
|
||||
// // /// }]
|
||||
// // ///
|
||||
// // /// </remarks>
|
||||
// // /// <response code="204">Returns the created project</response>
|
||||
// // [ProducesResponseType(StatusCodes.Status204NoContent)]
|
||||
// // [ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
// // [HttpPut("{id}/removeMembers")]
|
||||
// // public async Task<ActionResult<Project>> RemoveMembersFromProject(int id, List<AppUser> usersToRemove)
|
||||
// // {
|
||||
// // Project project = await GetProjectByIdAsync(id);
|
||||
// // project.RemoveMembers(usersToRemove);
|
||||
// // try
|
||||
// // {
|
||||
// // await _context.SaveChangesAsync();
|
||||
// // }
|
||||
// // catch (DbUpdateException /* ex */)
|
||||
// // {
|
||||
// // //Log the error (uncomment ex variable name and write a log.)
|
||||
// // ModelState.AddModelError("", "Unable to save changes. " +
|
||||
// // "Try again, and if the problem persists, " +
|
||||
// // "see your system administrator.");
|
||||
// // }
|
||||
// // return NoContent();
|
||||
// // }
|
||||
private bool ProjectExists(int id)
|
||||
{
|
||||
return _context.Projects.Any(e => e.Id == id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using TicketManager.Data;
|
||||
using TicketManager.DTO;
|
||||
using TicketManager.Models;
|
||||
|
||||
namespace TicketManager.Controllers
|
||||
|
|
@ -13,25 +15,40 @@ namespace TicketManager.Controllers
|
|||
[ApiController]
|
||||
public class TicketsController : ControllerBase
|
||||
{
|
||||
private readonly ITicketRepository _tickets;
|
||||
private readonly AppDbContext _context;
|
||||
|
||||
public TicketsController(ITicketRepository tickets)
|
||||
public TicketsController(AppDbContext context)
|
||||
{
|
||||
_tickets = tickets;
|
||||
_context = context;
|
||||
}
|
||||
|
||||
// GET: api/Tickets
|
||||
[HttpGet]
|
||||
public async Task<IEnumerable<Ticket>> GetTickets()
|
||||
public async Task<IEnumerable<TicketDTO>> GetTickets()
|
||||
{
|
||||
return await _tickets.List();
|
||||
return await _context.Tickets
|
||||
.Include(t => t.Project)
|
||||
.Include(t => t.Files)
|
||||
.Include(t => t.Activities)
|
||||
.Include(t => t.Notes)
|
||||
.AsNoTracking()
|
||||
.Select(t => new TicketDTO(t))
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
// GET: api/Tickets/5
|
||||
[HttpGet("{id}")]
|
||||
public async Task<ActionResult<Ticket>> GetTicket(int id)
|
||||
public async Task<ActionResult<TicketDTO>> GetTicket(int id)
|
||||
{
|
||||
var ticket = await _tickets.Get(id);
|
||||
var ticket = await _context.Tickets
|
||||
.Include(t => t.Project)
|
||||
.Include(t => t.Files)
|
||||
.Include(t => t.Activities)
|
||||
.Include(t => t.Notes)
|
||||
.AsNoTracking()
|
||||
.Select(t => new TicketDTO(t))
|
||||
.FirstOrDefaultAsync(t => t.Id == id);
|
||||
|
||||
if (ticket == null)
|
||||
{
|
||||
return NotFound();
|
||||
|
|
@ -49,13 +66,14 @@ namespace TicketManager.Controllers
|
|||
{
|
||||
return BadRequest();
|
||||
}
|
||||
_context.Entry(ticket).State = EntityState.Modified;
|
||||
try
|
||||
{
|
||||
await _tickets.Update(ticket);
|
||||
await _context.SaveChangesAsync();
|
||||
}
|
||||
catch (DbUpdateConcurrencyException)
|
||||
{
|
||||
if (!_tickets.Exists(id))
|
||||
if (!TicketExists(id))
|
||||
{
|
||||
return NotFound();
|
||||
}
|
||||
|
|
@ -73,36 +91,56 @@ namespace TicketManager.Controllers
|
|||
[HttpPost]
|
||||
public async Task<ActionResult<Ticket>> PostTicket(Ticket ticket)
|
||||
{
|
||||
await _tickets.Add(ticket);
|
||||
return CreatedAtAction("GetTicket", new { id = ticket.Id }, ticket);
|
||||
_context.Tickets.Add(ticket);
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
var dto = new TicketDTO(ticket);
|
||||
return CreatedAtAction("GetTicket", new { id = ticket.Id }, dto);
|
||||
}
|
||||
|
||||
// DELETE: api/Tickets/5
|
||||
[HttpDelete("{id}")]
|
||||
public async Task<ActionResult<Ticket>> DeleteTicket(int id)
|
||||
public async Task<ActionResult<TicketDTO>> DeleteTicket(int id)
|
||||
{
|
||||
var ticket = await _tickets.Get(id);
|
||||
var ticket = await _context.Tickets.FindAsync(id);
|
||||
if (ticket == null)
|
||||
{
|
||||
return NotFound();
|
||||
}
|
||||
await _tickets.Delete(ticket);
|
||||
return ticket;
|
||||
|
||||
_context.Tickets.Remove(ticket);
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
var dto = new TicketDTO(ticket);
|
||||
return Ok(dto);
|
||||
}
|
||||
|
||||
[HttpGet("{id}/assignees")]
|
||||
public async Task<ActionResult<List<AppUser>>> GetTicketAssignees(int id)
|
||||
public async Task<ActionResult<List<AppUserDTO>>> GetTicketAssignees(int id)
|
||||
{
|
||||
Ticket ticket = await _tickets.Get(id);
|
||||
return ticket.GetAssignees();
|
||||
Ticket ticket = await _context.Tickets
|
||||
.Include(t => t.Project)
|
||||
.ThenInclude(p => p.Assignments)
|
||||
.ThenInclude(a => a.User)
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(t => t.Id == id);
|
||||
|
||||
return ticket.GetAssignees().Select(u => new AppUserDTO(u)).ToList();
|
||||
}
|
||||
|
||||
[HttpPut("{id}/closed")]
|
||||
public async Task<IActionResult> CloseTicket(int id)
|
||||
{
|
||||
Ticket ticket = await _tickets.Get(id);
|
||||
Ticket ticket = await _context.Tickets.FindAsync(id);
|
||||
ticket.Close();
|
||||
// _context.Entry(ticket).State = EntityState.Modified;
|
||||
|
||||
return await PutTicket(ticket.Id, ticket);
|
||||
}
|
||||
|
||||
private bool TicketExists(int id)
|
||||
{
|
||||
return _context.Tickets.Any(e => e.Id == id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
using System.Threading.Tasks;
|
||||
using TicketManager.Models;
|
||||
using System.Linq;
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace TicketManager.Data
|
||||
{
|
||||
public class AppUserRepository : GenericRepository<AppUser>, IAppUserRepository
|
||||
{
|
||||
private readonly IQueryable<AppUser> _query;
|
||||
public AppUserRepository(AppDbContext context) : base(context)
|
||||
{
|
||||
_query = _dbSet
|
||||
.Include(p => p.Assignments)
|
||||
.ThenInclude(a => a.Project)
|
||||
.ThenInclude(p => p.Tickets)
|
||||
.Include(p => p.Activities);
|
||||
}
|
||||
|
||||
public async Task<AppUser> GetUser(Guid id)
|
||||
{
|
||||
return await _query.FirstOrDefaultAsync(p => p.Id == id);
|
||||
}
|
||||
|
||||
public override async Task<IEnumerable<AppUser>> List()
|
||||
{
|
||||
return await _query.ToListAsync();
|
||||
}
|
||||
|
||||
public bool Exists(Guid id)
|
||||
{
|
||||
return _dbSet.Any(e => e.Id == id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Linq.Expressions;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace TicketManager.Data
|
||||
{
|
||||
public class GenericRepository<T> : IGenericRepository<T> where T : class
|
||||
{
|
||||
protected readonly AppDbContext _context;
|
||||
protected readonly DbSet<T> _dbSet;
|
||||
public GenericRepository(AppDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
_dbSet = _context.Set<T>();
|
||||
}
|
||||
|
||||
public async Task<int> Add(T entity)
|
||||
{
|
||||
_dbSet.Add(entity);
|
||||
return await _context.SaveChangesAsync();
|
||||
}
|
||||
|
||||
public async Task<int> Delete(T entity)
|
||||
{
|
||||
if (_context.Entry(entity).State == EntityState.Detached)
|
||||
{ _dbSet.Attach(entity); }
|
||||
_dbSet.Remove(entity);
|
||||
return await _context.SaveChangesAsync();
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<T>> Find(int id, Expression<Func<T, bool>> expr)
|
||||
{
|
||||
return await _dbSet.Where(expr).AsNoTracking().ToListAsync();
|
||||
}
|
||||
|
||||
public virtual async Task<T> Get(int id)
|
||||
{
|
||||
return await _dbSet.FindAsync(id);
|
||||
}
|
||||
public virtual async Task<IEnumerable<T>> List()
|
||||
{
|
||||
return await _dbSet.AsNoTracking().ToListAsync();
|
||||
}
|
||||
|
||||
public async Task<int> Update(T entity)
|
||||
{
|
||||
_dbSet.Attach(entity);
|
||||
_context.Entry(entity).State = EntityState.Modified;
|
||||
return await _context.SaveChangesAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using TicketManager.Models;
|
||||
|
||||
namespace TicketManager.Data
|
||||
{
|
||||
public interface IAppUserRepository : IGenericRepository<AppUser>
|
||||
{
|
||||
Task<AppUser> GetUser(Guid id);
|
||||
bool Exists(Guid id);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
using System;
|
||||
using System.Linq.Expressions;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace TicketManager.Data
|
||||
{
|
||||
public interface IGenericRepository<T> where T : class
|
||||
{
|
||||
Task<IEnumerable<T>> List();
|
||||
Task<T> Get(int id);
|
||||
Task<IEnumerable<T>> Find(int id, Expression<Func<T, bool>> expr);
|
||||
|
||||
Task<int> Add(T entity);
|
||||
|
||||
Task<int> Update(T entity);
|
||||
|
||||
Task<int> Delete(T entity);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using TicketManager.Models;
|
||||
|
||||
namespace TicketManager.Data
|
||||
{
|
||||
public interface IProjectRepository : IGenericRepository<Project>
|
||||
{
|
||||
bool Exists(int id);
|
||||
Task<IEnumerable<AppUser>> GetMembers(int id);
|
||||
Task SetMembers(int id, List<AppUser> usersToAdd);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using TicketManager.Models;
|
||||
|
||||
namespace TicketManager.Data
|
||||
{
|
||||
public interface ITicketRepository : IGenericRepository<Ticket>
|
||||
{
|
||||
bool Exists(int id);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace TicketManager.Data
|
||||
{
|
||||
public interface IUnitOfWork : IDisposable
|
||||
{
|
||||
IProjectRepository Projects { get; }
|
||||
IAppUserRepository AppUsers { get; }
|
||||
ITicketRepository Tickets { get; }
|
||||
Task<int> Complete();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
using System.Threading.Tasks;
|
||||
using TicketManager.Models;
|
||||
using System.Linq;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace TicketManager.Data
|
||||
{
|
||||
public class ProjectRepository : GenericRepository<Project>, IProjectRepository
|
||||
{
|
||||
private readonly IQueryable<Project> _query;
|
||||
public ProjectRepository(AppDbContext context) : base(context)
|
||||
{
|
||||
_query = _dbSet
|
||||
.Include(p => p.Assignments).ThenInclude(a => a.User)
|
||||
.Include(p => p.Tickets)
|
||||
.Include(p => p.Manager)
|
||||
.Include(p => p.Files);
|
||||
}
|
||||
|
||||
public override async Task<Project> Get(int id)
|
||||
{
|
||||
return await _query.FirstOrDefaultAsync(p => p.Id == id);
|
||||
}
|
||||
|
||||
public override async Task<IEnumerable<Project>> List()
|
||||
{
|
||||
return await _query.ToListAsync();
|
||||
}
|
||||
|
||||
public bool Exists(int id)
|
||||
{
|
||||
return _dbSet.Any(e => e.Id == id);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<AppUser>> GetMembers(int id)
|
||||
{
|
||||
Project project = await Get(id);
|
||||
return project.GetMembers();
|
||||
}
|
||||
public async Task SetMembers(int id, List<AppUser> usersToAdd)
|
||||
{
|
||||
Project project = await Get(id);
|
||||
project.SetMembers(usersToAdd);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using System.Linq;
|
||||
using TicketManager.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace TicketManager.Data
|
||||
{
|
||||
public class TicketRepository : GenericRepository<Ticket>, ITicketRepository
|
||||
{
|
||||
private IQueryable<Ticket> _query;
|
||||
public TicketRepository(AppDbContext context) : base(context)
|
||||
{
|
||||
_query = _dbSet
|
||||
.Include(p => p.Project)
|
||||
.ThenInclude(a => a.Assignments)
|
||||
.ThenInclude(p => p.User)
|
||||
// .Include(p => p.Edits)
|
||||
// .Include(p => p.Notes)
|
||||
// .Include(p => p.Files)
|
||||
// .Include(p => p.Creator)
|
||||
;
|
||||
}
|
||||
|
||||
public override async Task<Ticket> Get(int id)
|
||||
{
|
||||
return await _query.FirstOrDefaultAsync(p => p.Id == id);
|
||||
}
|
||||
|
||||
public override async Task<IEnumerable<Ticket>> List()
|
||||
{
|
||||
return await _query.ToListAsync();
|
||||
}
|
||||
|
||||
public bool Exists(int id)
|
||||
{
|
||||
return _dbSet.Any(e => e.Id == id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace TicketManager.Data
|
||||
{
|
||||
public class UnitOfWork : IUnitOfWork
|
||||
{
|
||||
private readonly AppDbContext _context;
|
||||
public UnitOfWork(AppDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
Projects = new ProjectRepository(_context);
|
||||
Tickets = new TicketRepository(_context);
|
||||
AppUsers = new AppUserRepository(_context);
|
||||
}
|
||||
|
||||
public IProjectRepository Projects { get; private set; }
|
||||
|
||||
public IAppUserRepository AppUsers { get; private set; }
|
||||
|
||||
public ITicketRepository Tickets { get; private set; }
|
||||
|
||||
public async Task<int> Complete()
|
||||
{
|
||||
return await _context.SaveChangesAsync();
|
||||
}
|
||||
public void Dispose()
|
||||
{
|
||||
_context.DisposeAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
53
DataTransfertObjects/AppUserDTO.cs
Normal file
53
DataTransfertObjects/AppUserDTO.cs
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using TicketManager.Models;
|
||||
|
||||
namespace TicketManager.DTO
|
||||
{
|
||||
public class AppUserDTO
|
||||
{
|
||||
public AppUserDTO(AppUser user)
|
||||
{
|
||||
Id = user.Id;
|
||||
FirstName = user.FirstName;
|
||||
LastName = user.LastName;
|
||||
Presentation = user.Presentation;
|
||||
Email = user.Email;
|
||||
Phone = user.Phone;
|
||||
Created_at = user.Created_at;
|
||||
Picture = user.Picture;
|
||||
Activities = user.Activities;
|
||||
Projects = user.GetProjects();
|
||||
Tickets = user.GetTickets();
|
||||
}
|
||||
|
||||
public Guid Id { get; set; }
|
||||
|
||||
public string FirstName { get; set; }
|
||||
|
||||
public string LastName { get; set; }
|
||||
|
||||
public string FullName => $"{FirstName} {LastName}";
|
||||
|
||||
public string Presentation { get; set; }
|
||||
|
||||
[DataType(DataType.EmailAddress)]
|
||||
public string Email { get; set; }
|
||||
|
||||
[DataType(DataType.PhoneNumber)]
|
||||
public string Phone { get; set; }
|
||||
|
||||
[DataType(DataType.Date)]
|
||||
public DateTime Created_at { get; private set; } = DateTime.Now;
|
||||
|
||||
public string Picture { get; set; }
|
||||
|
||||
public List<Activity> Activities { get; set; } = new List<Activity>();
|
||||
|
||||
public List<Project> Projects { get; set; } = new List<Project>();
|
||||
|
||||
public List<Ticket> Tickets { get; set; } = new List<Ticket>();
|
||||
|
||||
}
|
||||
}
|
||||
51
DataTransfertObjects/TicketDTO.cs
Normal file
51
DataTransfertObjects/TicketDTO.cs
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using TicketManager.Models;
|
||||
|
||||
namespace TicketManager.DTO
|
||||
{
|
||||
public class TicketDTO
|
||||
{
|
||||
public TicketDTO(Ticket ticket)
|
||||
{
|
||||
Id = ticket.Id;
|
||||
Title = ticket.Title;
|
||||
Description = ticket.Description;
|
||||
CreatedAt = ticket.CreatedAt;
|
||||
PlannedEnding = ticket.PlannedEnding;
|
||||
Status = ticket.Status.ToString();
|
||||
Impact = ticket.Impact.ToString();
|
||||
Difficulty = ticket.Difficulty.ToString();
|
||||
Category = ticket.Category.ToString();
|
||||
CreatorId = ticket.CreatorId;
|
||||
Project = ticket.Project;
|
||||
Notes = ticket.Notes;
|
||||
Activities = ticket.Activities;
|
||||
Files = ticket.Files;
|
||||
Users = ticket.GetAssignees();
|
||||
}
|
||||
public int Id { get; set; }
|
||||
|
||||
public string Title { get; set; }
|
||||
|
||||
public string Description { get; set; }
|
||||
|
||||
[DataType(DataType.Date)]
|
||||
public DateTime CreatedAt { get; private set; }
|
||||
|
||||
[DataType(DataType.Date)]
|
||||
public DateTime PlannedEnding { get; set; }
|
||||
|
||||
public string Status { get; set; }
|
||||
public string Impact { get; set; }
|
||||
public string Difficulty { get; set; }
|
||||
public string Category { get; set; }
|
||||
public Guid CreatorId { get; set; }
|
||||
public Project Project { get; set; }
|
||||
public List<Note> Notes { get; set; } = new List<Note>();
|
||||
public List<Activity> Activities { get; set; } = new List<Activity>();
|
||||
public List<File> Files { get; set; } = new List<File>();
|
||||
public List<AppUser> Users { get; set; } = new List<AppUser>();
|
||||
}
|
||||
}
|
||||
|
|
@ -37,7 +37,7 @@ namespace TicketManager.Models
|
|||
public DateTime Created_at { get; private set; } = DateTime.Now;
|
||||
|
||||
[Display(Name = "Avatar")]
|
||||
public byte[] Picture { get; set; }
|
||||
public string Picture { get; set; }
|
||||
|
||||
public List<Assignment> Assignments { get; set; } = new List<Assignment>();
|
||||
|
||||
|
|
|
|||
|
|
@ -47,3 +47,4 @@
|
|||
- [ ] check useRef, useReducer, dispatch
|
||||
- [ ] error page redirect when offline.
|
||||
- [ ] ticket/files/activities list placeholders when empty
|
||||
- [ ] think about public/private DTO's constructor, getters and setters
|
||||
|
|
|
|||
Loading…
Reference in a new issue