Merge pull request #32 from SelimHorri/develop

Develop

Author: SelimHorri

pom.xml

@@ -7,12 +7,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.5</version>
+		<version>2.4.7</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.pfa</groupId>
 	<artifactId>project-tracking-system</artifactId>
-	<version>5.2</version>
+	<version>9.0</version>
 	<name>Project-Tracking-System</name>
 	<description>Manage projects and their status along with managers and employees</description>
 	<packaging>jar</packaging>

src/main/java/com/pfa/pack/controller/api/AssignmentResource.java

@@ -81,6 +81,11 @@ public ResponseEntity<DtoCollection<ProjectCommit>> findByEmployeeIdAndProjectId
 		return ResponseEntity.ok(new DtoCollection<>(this.assignmentService.findByEmployeeIdAndProjectId(Integer.parseInt(employeeId), Integer.parseInt(projectId))));
 	}
 
+	@GetMapping(value = {"/data/project-commit/{employeeId}/{projectId}/{commitDate}"})
+	public ResponseEntity<ProjectCommit> findByEmployeeIdAndProjectIdAndCommitDate(@PathVariable("employeeId")final String employeeId, @PathVariable("projectId") String projectId, @PathVariable("commitDate") final String commitDate) {
+		return ResponseEntity.ok(this.assignmentService.findByEmployeeIdAndProjectIdAndCommitDate(Integer.parseInt(employeeId), Integer.parseInt(projectId), LocalDateTime.parse(commitDate, DateTimeFormatter.ofPattern("dd-MM-yyyyHH:mm:ss"))));
+	}
+	
 
 
 }