Merge pull request #1160 from PublicisSapient/DTS-38151-update-projec…

…t-deets DTS-38151: save createdBy updatedBy details
PublicisSapient · Jul 31, 2024 · 0a89217 · 0a89217
2 parents c681541 + 8f0b539
commit 0a89217
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/...in/java/com/publicissapient/kpidashboard/common/model/application/ProjectBasicConfig.java b/...in/java/com/publicissapient/kpidashboard/common/model/application/ProjectBasicConfig.java
@@ -48,7 +48,9 @@ public class ProjectBasicConfig extends BasicModel {
 
 	private String projectName;
 	private String createdAt;
+	private String createdBy;
 	private String updatedAt;
+	private String updatedBy;
 	private boolean kanban;
 	private List<HierarchyValue> hierarchy;
 	private boolean saveAssigneeDetails;

diff --git a/.../com/publicissapient/kpidashboard/common/model/application/dto/ProjectBasicConfigDTO.java b/.../com/publicissapient/kpidashboard/common/model/application/dto/ProjectBasicConfigDTO.java
@@ -43,7 +43,9 @@ public class ProjectBasicConfigDTO {
 	private ObjectId id;
 	private String projectName;
 	private String createdAt;
+	private String createdBy;
 	private String updatedAt;
+	private String updatedBy;
 
 	private String consumerCreatedOn;
 	private boolean kanban;

diff --git a/.../publicissapient/kpidashboard/common/model/application/dto/ProjectBasicConfigDTOTest.java b/.../publicissapient/kpidashboard/common/model/application/dto/ProjectBasicConfigDTOTest.java
@@ -125,9 +125,9 @@ public void testConstructor() {
     @Test
     public void testConstructor2() {
         ObjectId id = ObjectId.get();
-        ProjectBasicConfigDTO actualProjectBasicConfigDTO = new ProjectBasicConfigDTO(id, "Project Name",
-                "Jan 1, 2020 8:00am GMT+0100", "2020-03-01", "Jan 1, 2020 8:00am GMT+0100", true, new ArrayList<>(),
-                true);
+		ProjectBasicConfigDTO actualProjectBasicConfigDTO = new ProjectBasicConfigDTO(id, "Project Name",
+				"Jan 1, 2020 8:00am GMT+0100", "", "2020-03-01", "", "Jan 1, 2020 8:00am GMT+0100", true,
+				new ArrayList<>(), true);
         actualProjectBasicConfigDTO.setConsumerCreatedOn("Jan 1, 2020 8:00am GMT+0100");
         actualProjectBasicConfigDTO.setCreatedAt("Jan 1, 2020 8:00am GMT+0100");
         ArrayList<HierarchyValueDTO> hierarchyValueDTOList = new ArrayList<>();
@@ -214,7 +214,7 @@ public void testEquals3() {
     public void testEquals4() {
         ObjectId id = ObjectId.get();
         ProjectBasicConfigDTO projectBasicConfigDTO = new ProjectBasicConfigDTO(id, "Project Name",
-                "Jan 1, 2020 8:00am GMT+0100", "2020-03-01", "Jan 1, 2020 8:00am GMT+0100", true, new ArrayList<>(),
+                "Jan 1, 2020 8:00am GMT+0100", "user1", "2020-03-01", "user1", "Jan 1, 2020 8:00am GMT+0100", true, new ArrayList<>(),
                 true);
         assertNotEquals(projectBasicConfigDTO, new ProjectBasicConfigDTO());
     }

diff --git a/...ssapient/kpidashboard/apis/projectconfig/basic/service/ProjectBasicConfigServiceImpl.java b/...ssapient/kpidashboard/apis/projectconfig/basic/service/ProjectBasicConfigServiceImpl.java
@@ -168,6 +168,7 @@ public ServiceResponse addBasicConfig(ProjectBasicConfigDTO projectBasicConfigDT
 			ModelMapper mapper = new ModelMapper();
 			basicConfig = mapper.map(projectBasicConfigDTO, ProjectBasicConfig.class);
 			basicConfig.setCreatedAt(DateUtil.dateTimeFormatter(LocalDateTime.now(), DateUtil.TIME_FORMAT));
+			basicConfig.setCreatedBy(authenticationService.getLoggedInUser());
 			tokenAuthenticationService.updateExpiryDate(username, LocalDateTime.now().toString());
 			String accessRoleOfParent = projectAccessManager.getAccessRoleOfNearestParent(basicConfig, username);
 
@@ -242,6 +243,7 @@ public ServiceResponse updateBasicConfig(String basicConfigId, ProjectBasicConfi
 				}
 				basicConfig.setCreatedAt(savedConfig.getCreatedAt());
 				basicConfig.setUpdatedAt(DateUtil.dateTimeFormatter(LocalDateTime.now(), DateUtil.TIME_FORMAT));
+				basicConfig.setUpdatedBy(authenticationService.getLoggedInUser());
 				ProjectBasicConfig updatedBasicConfig = basicConfigRepository.save(basicConfig);
 				performFilterOperation(basicConfigDtoCreation(updatedBasicConfig, mapper), true);
 				response = new ServiceResponse(true, "Updated Successfully.", updatedBasicConfig);