Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>

<dependency>
<groupId>org.flywaydb</groupId>
Expand All @@ -49,6 +53,25 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
<version>3.1.1</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.28</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.zoomcare.candidatechallenge.config;

import com.zoomcare.candidatechallenge.repository.EmployeeRepository;
import com.zoomcare.candidatechallenge.service.EmployeeService;
import org.modelmapper.ModelMapper;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
public class CandidateChallengeConfig {
@Bean
public ModelMapper modelMapper() {
return new ModelMapper();
}

@Bean
public EmployeeService employeeService(ModelMapper modelMapper, EmployeeRepository employeeRepository) {
return new EmployeeService(employeeRepository, modelMapper);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.zoomcare.candidatechallenge.controller;

import com.zoomcare.candidatechallenge.dto.EmployeeDTO;
import com.zoomcare.candidatechallenge.service.EmployeeService;
import java.util.List;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/api/employees")
public class EmployeeController {
@Autowired
private EmployeeService employeeService;

@GetMapping("/{id}")
ResponseEntity<EmployeeDTO> getById(@PathVariable Long id) {
Optional<EmployeeDTO> employeeDTO = employeeService.findById(id);
if (!employeeDTO.isPresent()) {
return ResponseEntity.notFound().build();
}
return ResponseEntity.ok(employeeDTO.get());
}

@GetMapping("/topLevel")
ResponseEntity<List<EmployeeDTO>> getTopLevelEmployees() {
List<EmployeeDTO> employeeDTOs = employeeService.getTopLevelEmployee();
if (employeeDTOs.isEmpty()) {
return ResponseEntity.notFound().build();
}
return ResponseEntity.ok(employeeDTOs);
}
}
18 changes: 18 additions & 0 deletions src/main/java/com/zoomcare/candidatechallenge/dto/EmployeeDTO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.zoomcare.candidatechallenge.dto;

import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class EmployeeDTO {
private Long id;
private Long supervisorId;
private List<PropertyDTO> properties;
private List<EmployeeDTO> directReports;
}
11 changes: 11 additions & 0 deletions src/main/java/com/zoomcare/candidatechallenge/dto/PropertyDTO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.zoomcare.candidatechallenge.dto;

import lombok.Data;
import lombok.NoArgsConstructor;

@Data
@NoArgsConstructor
public class PropertyDTO {
private PropertyPKDTO id;
private String value;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.zoomcare.candidatechallenge.dto;

import lombok.Data;
import lombok.NoArgsConstructor;

@Data
@NoArgsConstructor
public class PropertyPKDTO {
private String key;
}
59 changes: 59 additions & 0 deletions src/main/java/com/zoomcare/candidatechallenge/model/Employee.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package com.zoomcare.candidatechallenge.model;

import java.io.Serializable;
import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
import lombok.Builder;

@Builder
@Entity
public class Employee implements Serializable {
@Id
@GeneratedValue
private Long id;

@Column(name = "supervisor_id")
private Long supervisorId;

@OneToMany(fetch = FetchType.LAZY)
@JoinColumn(name = "employee_id")
private List<Property> properties;

@OneToMany(fetch = FetchType.LAZY)
@JoinColumn(name = "supervisor_id")
private List<Employee> directReports;

public Long getSupervisorId() {
return supervisorId;
}

public void setSupervisorId(Long supervisorId) {
this.supervisorId = supervisorId;
}

public List<Employee> getDirectReports() {
return directReports;
}

public void setDirectReports(List<Employee> directReports) {
this.directReports = directReports;
}

public Long getId() {
return id;
}

public List<Property> getProperties() {
return properties;
}

public void setProperties(List<Property> properties) {
this.properties = properties;
}
}
30 changes: 30 additions & 0 deletions src/main/java/com/zoomcare/candidatechallenge/model/Property.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.zoomcare.candidatechallenge.model;

import java.io.Serializable;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import lombok.Builder;

@Entity
@Builder
public class Property implements Serializable {
@EmbeddedId
private PropertyPK id;
private String value;

public PropertyPK getId() {
return id;
}

public void setId(PropertyPK id) {
this.id = id;
}

public String getValue() {
return value;
}

public void setValue(String value) {
this.value = value;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.zoomcare.candidatechallenge.model;

import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import lombok.Builder;

@Embeddable
@Builder
public class PropertyPK implements Serializable {

private String key;

@Column(name = "employee_id")
private Long employeeId;

public String getKey() {
return key;
}

public void setKey(String key) {
this.key = key;
}

public Long getEmployeeId() {
return employeeId;
}

public void setEmployeeId(Long employeeId) {
this.employeeId = employeeId;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.zoomcare.candidatechallenge.repository;

import com.zoomcare.candidatechallenge.model.Employee;
import java.util.List;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;

public interface EmployeeRepository extends JpaRepository<Employee, Long> {
Optional<Employee> findById(Long id);
List<Employee> findAllBySupervisorIdIsNull();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.zoomcare.candidatechallenge.service;

import com.zoomcare.candidatechallenge.dto.EmployeeDTO;
import com.zoomcare.candidatechallenge.model.Employee;
import com.zoomcare.candidatechallenge.repository.EmployeeRepository;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import org.modelmapper.ModelMapper;
import org.springframework.stereotype.Service;

@Service
public class EmployeeService {
private final EmployeeRepository employeeRepository;
private final ModelMapper modelMapper;

public EmployeeService(EmployeeRepository employeeRepository, ModelMapper modelMapper) {
this.employeeRepository = employeeRepository;
this.modelMapper = modelMapper;
}

public Optional<EmployeeDTO> findById(Long id) {
return employeeRepository.findById(id).map(this::convertToDto);
}

public List<EmployeeDTO> getTopLevelEmployee() {
return employeeRepository.findAllBySupervisorIdIsNull().stream()
.map(this::convertToDto)
.collect(Collectors.toList());
}

public EmployeeDTO convertToDto(Employee employee) {
return modelMapper.map(employee, EmployeeDTO.class);
}

}
2 changes: 2 additions & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
spring:
main:
allow-bean-definition-overriding: true
h2:
console:
enabled: true
Expand Down
Loading