From 302ca0c0ae3de0be8659ecf985b46eab38d1a7f4 Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Tue, 5 May 2020 15:11:53 +0200 Subject: [PATCH] set project creator as member on creation --- Controllers/ProjectsController.cs | 10 +++++++--- Resources/Project/NewProjectDTO.cs | 2 +- app.db | Bin 106496 -> 106496 bytes client/src/components/ButtonAppBar.tsx | 3 +-- client/src/components/Footer.tsx | 3 ++- .../src/components/Modals/NewProjectModal.tsx | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Controllers/ProjectsController.cs b/Controllers/ProjectsController.cs index 43800b1..e37435f 100644 --- a/Controllers/ProjectsController.cs +++ b/Controllers/ProjectsController.cs @@ -180,11 +180,15 @@ namespace TicketManager.Controllers EndingDate = projectDto.EndingDate, Manager = await _context.AppUsers.FindAsync(projectDto.ManagerId) }; - // project.LogAction( - // $"{project.Title} has been created by {project.Manager.FullName}.", - // ActivityType.StartTask); _context.Projects.Add(project); + _context.Assignments.Add(new Assignment() + { + Project = project, + ProjectId = project.Id, + User = project.Manager, + UserId = project.Manager.Id + }); await _context.SaveChangesAsync(); var dto = new ProjectDTO(project); return CreatedAtAction("GetProject", new { id = project.Id }, dto); diff --git a/Resources/Project/NewProjectDTO.cs b/Resources/Project/NewProjectDTO.cs index 8043069..244c484 100644 --- a/Resources/Project/NewProjectDTO.cs +++ b/Resources/Project/NewProjectDTO.cs @@ -11,6 +11,6 @@ namespace TicketManager.Resources [Required] public DateTime EndingDate { get; set; } [Required] - public Guid ManagerId { get; set; } + public string ManagerId { get; set; } } } \ No newline at end of file diff --git a/app.db b/app.db index ff1acb8d9398f4ebca6f8723332b96891920bd75..26a5986d836fabfa37891b8817e4b20d4e32edcf 100644 GIT binary patch delta 378 zcmZoTz}9epZ39by02|LV2L9Rnf_!?sGkN8Brfn7!XyU1FWaZ#sP|bEU<}`OIO?N6S zE=es?C^HHu%FjwoE>Xx$%u7s9%}vcKQE)6MP{_S9Aza2x!N9-@j0_D;4J-{TO^rX;aCUTZ)|F&uHfNk1XfG$a0{Fzp%yT*Z(pa+80H|r#&5^K|A*g>|1$q7{zm=?pf)*v f0ZnHYLvu@4Cv#n6N4OS_>5cV_8rvJ{85 {!isAuthenticated ? ( diff --git a/client/src/components/Footer.tsx b/client/src/components/Footer.tsx index ce709cc..b6cda25 100644 --- a/client/src/components/Footer.tsx +++ b/client/src/components/Footer.tsx @@ -1,4 +1,5 @@ import React, { FC } from "react"; +import { Link as RouterLink } from "react-router-dom"; import { Container, Typography, Link } from "@material-ui/core"; import { makeStyles } from "@material-ui/core/styles"; @@ -16,7 +17,7 @@ const Copyright: FC = ({ brand, text }) => { return ( {"© "} - + {brand} {" "} {new Date().getFullYear()} diff --git a/client/src/components/Modals/NewProjectModal.tsx b/client/src/components/Modals/NewProjectModal.tsx index 6477a7f..a9acc2d 100644 --- a/client/src/components/Modals/NewProjectModal.tsx +++ b/client/src/components/Modals/NewProjectModal.tsx @@ -22,7 +22,7 @@ const NewProjectModal: FC = ({ show, handleClose }) => { title: title, description: description, endingDate: new Date(endingDate).toISOString(), - managerId: getUID(user), // get current User id + managerId: getUID(user), }; const token = await getTokenSilently();