ruidy/ticket_manager
1
0
Fork 0
mirror of https://github.com/rjNemo/ticket_manager synced 2026-06-06 00:36:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merging backed

Browse source
This commit is contained in:
Ruidy Nemausat 2020-02-10 11:54:37 +01:00
commit c734fef7a3
6 changed files with 43 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Controllers/ProjectsController.cs
View file

@ -28,6 +28,10 @@ namespace TicketManager.Controllers
return await _context.Projects
.Include(p => p.Assignments)
.ThenInclude(a => a.User)
.Include(p => p.Tickets)
.Include(p => p.Manager)
.Include(p => p.Files)
.AsNoTracking()
.ToListAsync();
}
@ -37,8 +41,13 @@ namespace TicketManager.Controllers
{
var project = await _context.Projects
.Include(p => p.Assignments)
.Include(p => p.Tickets)
.Include(p => p.Manager)
.Include(p => p.Files)
.AsNoTracking()
.FirstOrDefaultAsync(p => p.Id == id);
if (project == null)
{ return NotFound(); }

15
Controllers/TicketsController.cs
View file

@ -25,14 +25,25 @@ namespace TicketManager.Controllers
[HttpGet]
public async Task<ActionResult<IEnumerable<Ticket>>> GetTickets()
{
return await _context.Tickets.ToListAsync();
return await _context.Tickets
.Include(t => t.Creator)
.Include(p => p.Notes)
.Include(p => p.Edits)
.Include(p => p.Files)
.AsNoTracking()
.ToListAsync();
}
// GET: api/Tickets/5
[HttpGet("{id}")]
public async Task<ActionResult<Ticket>> GetTicket(int id)
{
var ticket = await _context.Tickets.FindAsync(id);
var ticket = await _context.Tickets
.Include(t => t.Creator)
.Include(p => p.Notes)
.Include(p => p.Edits)
.Include(p => p.Files)
.FirstOrDefaultAsync(t => t.Id == id);
if (ticket == null)
{

12
Controllers/UsersController.cs
View file

@ -25,14 +25,20 @@ namespace TicketManager.Controllers
[HttpGet]
public async Task<ActionResult<IEnumerable<User>>> GetUsers()
{
return await _context.Users.ToListAsync();
return await _context.Users
.Include(p => p.Assignments)
.Include(p => p.Edits)
.ToListAsync();
}
// GET: api/Users/5
[HttpGet("{id}")]
public async Task<ActionResult<User>> GetUser(int id)
public async Task<ActionResult<User>> GetUser(Guid id)
{
var user = await _context.Users.FindAsync(id);
var user = await _context.Users
.Include(p => p.Assignments)
.Include(p => p.Edits)
.FirstOrDefaultAsync(p => p.Id == id);
if (user == null)
{

16
Models/Project.cs
View file

@ -24,7 +24,7 @@ namespace TicketManager.Models
public Status Status { get; set; } = Status.ToDo;
public User Manager { get; set; }
public int ManagerId { get; set; }
public Guid ManagerId { get; set; }
private List<Assignment> _assignments;
public List<Assignment> Assignments
{
@ -40,13 +40,13 @@ namespace TicketManager.Models
{ return _tickets ?? new List<Ticket>(); }
set { _tickets = value; }
}
private List<History> _edits;
public List<History> Edits
{
get
{ return _edits ?? new List<History>(); }
set { _edits = value; }
}
// private List<History> _edits;
// public List<History> Edits
// {
// get
// { return _edits ?? new List<History>(); }
// set { _edits = value; }
// }
private List<File> _files;
public List<File> Files
{

6
Models/Ticket.cs
View file

@ -17,9 +17,9 @@ namespace TicketManager.Models
public Category Category { get; set; } = Category.Undefined;
public User Creator { get; set; }
public int CreatorId { get; set; }
public Project Project { get; set; }
public int ProjectId { get; set; }
public Guid CreatorId { get; set; }
// public Project Project { get; set; }
// public int ProjectId { get; set; }
private List<Note> _notes;
public List<Note> Notes
{

1
client/src/react-app-env.d.ts vendored Normal file
View file

@ -0,0 +1 @@
/// <reference types="react-scripts" />