create micro-services

implement connection between employee and leave management services

Author: PartheOmkar

LeaveManagement.sqlite

@@ -24,10 +24,11 @@
 public class LeaveController {
 
 	@Autowired
-	LeaveService leaveService;
+	private LeaveService leaveService;
 
 	@PostMapping
-	public ResponseEntity<LeaveRequestDto> leaveRequest(@RequestBody LeaveRequestDto leaveRequest) throws LeaveTypeNotFound, LeaveStatusNotFound {
+	public ResponseEntity<LeaveRequestDto> leaveRequest(@RequestBody LeaveRequestDto leaveRequest)
+			throws LeaveTypeNotFound, LeaveStatusNotFound {
 		LeaveRequestDto savedLeaveRequest = leaveService.leaveRequest(leaveRequest);
 		return ResponseEntity.ok(savedLeaveRequest);
 	}
@@ -46,19 +47,32 @@ public ResponseEntity<List<LeaveRequestDto>> getLeaveRequests() {
 		}
 		return ResponseEntity.ok(leaveRequests);
 	}
-	
+
 	@PatchMapping
-	public ResponseEntity<LeaveRequestDto> updateLeaveRequest(@RequestBody LeaveRequestDto leaveRequest) throws LeaveRequestNotFound, LeaveStatusNotFound{
-		LeaveRequestDto updatedleaveRequest=leaveService.updateLeaveRequest(leaveRequest);
-		if(updatedleaveRequest==null) {
+	public ResponseEntity<LeaveRequestDto> updateLeaveRequest(@RequestBody LeaveRequestDto leaveRequest)
+			throws LeaveRequestNotFound, LeaveStatusNotFound {
+		LeaveRequestDto updatedleaveRequest = leaveService.updateLeaveRequest(leaveRequest);
+		if (updatedleaveRequest == null) {
 			return ResponseEntity.noContent().build();
 		}
 		return ResponseEntity.ok(updatedleaveRequest);
 	}
-	
+
 	@DeleteMapping("/{leaveId}")
-	public ResponseEntity<String> deleteLeaveRequest(@PathVariable int leaveId){
+	public ResponseEntity<String> deleteLeaveRequest(@PathVariable int leaveId) {
 		leaveService.deleteLeaveRequest(leaveId);
 		return ResponseEntity.ok("");
 	}
+
+	@GetMapping("/employee/{employeeId}")
+	public ResponseEntity<List<LeaveRequestDto>> getLeaveRequestByEmployeeId(@PathVariable int employeeId) {
+		List<LeaveRequestDto> leaves = leaveService.getLeaveRequestByEmployeeId(employeeId);
+		return ResponseEntity.ok(leaves);
+	}
+
+	@GetMapping("/approver/{approvarId}")
+	public ResponseEntity<List<LeaveRequestDto>> getLeaveRequestByApprovalId(@PathVariable int approvarId) {
+		List<LeaveRequestDto> leaves = leaveService.getLeaveRequestByApprovalId(approvarId);
+		return ResponseEntity.ok(leaves);
+	}
 }

src/main/java/com/erpm/leaveManagementService/controllers/LeaveController.java

@@ -21,7 +21,7 @@
 public class LeaveStatusController {
 
 	@Autowired
-	LeaveStatusService leaveStatusService;
+	private LeaveStatusService leaveStatusService;
 
 	@PostMapping
 	public ResponseEntity<LeaveStatus> addLeaveStatus(@RequestBody LeaveStatus leaveStatus) {

src/main/java/com/erpm/leaveManagementService/controllers/LeaveStatusController.java

@@ -21,7 +21,7 @@
 public class LeaveTypeController {
 
 	@Autowired
-	LeaveTypeService leaveTypeService;
+	private LeaveTypeService leaveTypeService;
 
 	@PostMapping
 	public ResponseEntity<LeaveType> addLeaveType(@RequestBody LeaveType newleaveType) {

src/main/java/com/erpm/leaveManagementService/controllers/LeaveTypeController.java

@@ -15,11 +15,11 @@ public class LeaveRequestDto {
 	private String reason;
 	private String additionalComments;
 	private int approverId;
-	
+
 	public LeaveRequestDto() {
-		
+
 	}
-	
+
 	public LeaveRequestDto(LeaveRequest leaveRequest) {
 		this.id = leaveRequest.getId();
 		this.employeeId = leaveRequest.getEmployeeId();
@@ -31,7 +31,7 @@ public LeaveRequestDto(LeaveRequest leaveRequest) {
 		this.additionalComments = leaveRequest.getAdditionalComments();
 		this.approverId = leaveRequest.getApproverId();
 	}
-	
+
 	public int getId() {
 		return id;
 	}

src/main/java/com/erpm/leaveManagementService/dtos/LeaveRequestDto.java

@@ -2,6 +2,8 @@
 
 import java.time.LocalDate;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -18,8 +20,10 @@ public class LeaveRequest {
 	private int employeeId;
 	private LocalDate startDate;
 	private LocalDate endDate;
+	@JsonManagedReference
 	@ManyToOne(cascade = CascadeType.ALL)
 	private LeaveType leaveType;
+	@JsonManagedReference
 	@ManyToOne(cascade = CascadeType.ALL)
 	private LeaveStatus status;
 	private String reason;

src/main/java/com/erpm/leaveManagementService/entitys/LeaveRequest.java

@@ -2,6 +2,8 @@
 
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -14,6 +16,7 @@ public class LeaveStatus {
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	private int id;
 	private String leaveStatus;
+	@JsonBackReference
 	@OneToMany(mappedBy = "status")
 	private Set<LeaveRequest> leaveRequests;
 

src/main/java/com/erpm/leaveManagementService/entitys/LeaveStatus.java

@@ -2,6 +2,8 @@
 
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -14,6 +16,7 @@ public class LeaveType {
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	private int id;
 	private String leaveType;
+	@JsonBackReference
 	@OneToMany(mappedBy = "leaveType")
 	private Set<LeaveRequest> leaveRequests;
 

src/main/java/com/erpm/leaveManagementService/entitys/LeaveType.java

@@ -1,5 +1,7 @@
 package com.erpm.leaveManagementService.repositorys;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.stereotype.Repository;
@@ -8,6 +10,9 @@
 
 @Repository
 @EnableJpaRepositories
-public interface LeaveRepository extends JpaRepository<LeaveRequest,Integer>{
+public interface LeaveRepository extends JpaRepository<LeaveRequest, Integer> {
+
+	public List<LeaveRequest> findByEmployeeId(int employeeId);
 
+	public List<LeaveRequest> findByApproverId(int approverId);
 }

src/main/java/com/erpm/leaveManagementService/repositorys/LeaveRepository.java

@@ -18,11 +18,11 @@
 public class LeaveService {
 
 	@Autowired
-	LeaveRepository leaveRepository;
+	private LeaveRepository leaveRepository;
 	@Autowired
-	LeaveTypeService leaveTypeService;
+	private LeaveTypeService leaveTypeService;
 	@Autowired
-	LeaveStatusService leaveStatusService;
+	private LeaveStatusService leaveStatusService;
 
 	public LeaveRequestDto leaveRequest(LeaveRequestDto newleaveRequest) throws LeaveTypeNotFound, LeaveStatusNotFound {
 		LeaveRequestDto leaveRequest = null;
@@ -52,7 +52,8 @@ public List<LeaveRequestDto> getLeaveRequests() {
 		return leaveRepository.findAll().stream().map(leaveRequest -> new LeaveRequestDto(leaveRequest)).toList();
 	}
 
-	public LeaveRequestDto updateLeaveRequest(LeaveRequestDto newleaveRequest) throws LeaveRequestNotFound, LeaveStatusNotFound {
+	public LeaveRequestDto updateLeaveRequest(LeaveRequestDto newleaveRequest)
+			throws LeaveRequestNotFound, LeaveStatusNotFound {
 		LeaveRequestDto leaveRequestDto = null;
 		try {
 			LeaveRequest leaveRequest = leaveRepository.findById(newleaveRequest.getId()).get();
@@ -70,7 +71,7 @@ public void deleteLeaveRequest(int leaveId) {
 	}
 
 	public LeaveRequest getLeaveRequest(LeaveRequestDto leaveRequestDto) throws LeaveTypeNotFound, LeaveStatusNotFound {
-		LeaveRequest leaveRequest= new LeaveRequest();
+		LeaveRequest leaveRequest = new LeaveRequest();
 		leaveRequest.setEmployeeId(leaveRequestDto.getEmployeeId());
 		leaveRequest.setStartDate(leaveRequestDto.getStartDate());
 		leaveRequest.setEndDate(leaveRequestDto.getEndDate());
@@ -81,4 +82,16 @@ public LeaveRequest getLeaveRequest(LeaveRequestDto leaveRequestDto) throws Leav
 		leaveRequest.setApproverId(leaveRequestDto.getApproverId());
 		return leaveRequest;
 	}
+
+	public List<LeaveRequestDto> getLeaveRequestByEmployeeId(int employeeId) {
+		List<LeaveRequestDto> leaves = leaveRepository.findByEmployeeId(employeeId).stream()
+				.map(leave -> new LeaveRequestDto(leave)).toList();
+		return leaves;
+	}
+
+	public List<LeaveRequestDto> getLeaveRequestByApprovalId(int approvarId) {
+		List<LeaveRequestDto> leaves = leaveRepository.findByApproverId(approvarId).stream()
+				.map(leave -> new LeaveRequestDto(leave)).toList();
+		return leaves;
+	}
 }

src/main/java/com/erpm/leaveManagementService/services/LeaveService.java

@@ -19,4 +19,7 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.community.dialect.SQLiteDi
 eureka.instance.prefer-ip-address=true
 eureka.client.fetch-registry=true
 eureka.client.register-with-eureka=true
-eureka.client.service-url.defaultZone=http://localhost:8761/eureka
+eureka.client.service-url.defaultZone=http://localhost:8761/eureka
+#eureka helth configuration
+eureka.instance.leaseRenewalIntervalInSeconds=30
+eureka.instance.leaseExpirationDurationInSeconds=90