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
12 changes: 9 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,30 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.26</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
public class CandidateChallengeApplication
{

public static void main(String[] args)
{
SpringApplication.run(CandidateChallengeApplication.class, args);
}

public class CandidateChallengeApplication {
public static void main(String[] args) {
SpringApplication.run(CandidateChallengeApplication.class, args);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.zoomcare.candidatechallenge.controller;

import com.zoomcare.candidatechallenge.model.EmployeeResponse;
import com.zoomcare.candidatechallenge.service.EmployeeService;
import lombok.AllArgsConstructor;
import org.springframework.http.HttpStatus;
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;

import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Optional;

@RestController
@RequestMapping("/api/v1/employees")
@AllArgsConstructor
public class EmployeeController {
private EmployeeService service;

@GetMapping("/{id}")
public ResponseEntity<EmployeeResponse> getEmployee(@PathVariable @NotNull Long id) {
Optional<EmployeeResponse> employee = service.getEmployee(id);
return employee.isPresent() ? ResponseEntity.ok(employee.get()) : new ResponseEntity<>(null, HttpStatus.NOT_FOUND);
}

@GetMapping
public List<EmployeeResponse> getEmployees() {
return service.getEmployees();
}
}
20 changes: 20 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,20 @@
package com.zoomcare.candidatechallenge.model;

import lombok.Data;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;

@Data
@Entity
@Table(name = "employee")
public class Employee implements Serializable {
@Id
@Column
private Long id;
@Column(name = "supervisor_id")
private Long supervisorId;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.zoomcare.candidatechallenge.model;

import lombok.Builder;
import lombok.Data;

import java.util.List;

@Data
@Builder
public class EmployeeResponse {
private Long id;
private Long supervisorId;
private List<Property> propertyList;
private List<Employee> reporterList;
}
25 changes: 25 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,25 @@
package com.zoomcare.candidatechallenge.model;

import lombok.Data;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.IdClass;
import javax.persistence.Table;
import java.io.Serializable;

@Data
@Entity
@IdClass(PropertyId.class)
@Table(name = "property")
public class Property implements Serializable {
@Id
@Column(name = "employee_id")
private Long employeeId;
@Id
@Column
private String key;
@Column
private String value;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.zoomcare.candidatechallenge.model;

import lombok.Data;

import java.io.Serializable;

@Data
public class PropertyId implements Serializable {
private Long employeeId;
private String key;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.zoomcare.candidatechallenge.repository;

import com.zoomcare.candidatechallenge.model.Employee;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import javax.transaction.Transactional;
import java.util.List;

@Repository
@Transactional
public interface EmployeeRepository extends JpaRepository<Employee, Long> {
List<Employee> findAllBySupervisorId(Long id);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.zoomcare.candidatechallenge.repository;

import com.zoomcare.candidatechallenge.model.Property;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import javax.transaction.Transactional;
import java.util.List;

@Repository
@Transactional
public interface PropertyRepository extends JpaRepository<Property, Long> {
List<Property> findAllPropertyByEmployeeId(Long employee_id);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.zoomcare.candidatechallenge.service;

import com.zoomcare.candidatechallenge.model.EmployeeResponse;

import java.util.List;
import java.util.Optional;

public interface EmployeeService {
Optional<EmployeeResponse> getEmployee(Long id);

List<EmployeeResponse> getEmployees();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package com.zoomcare.candidatechallenge.service;

import com.zoomcare.candidatechallenge.model.Employee;
import com.zoomcare.candidatechallenge.model.EmployeeResponse;
import com.zoomcare.candidatechallenge.model.Property;
import com.zoomcare.candidatechallenge.repository.EmployeeRepository;
import com.zoomcare.candidatechallenge.repository.PropertyRepository;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

@Service
@AllArgsConstructor
public class EmployeeServiceImpl implements EmployeeService {
EmployeeRepository employeeRepository;
PropertyRepository propertyRepository;

@Override
public Optional<EmployeeResponse> getEmployee(Long id) {
Optional<Employee> employeeOptional = employeeRepository.findById(id);
if (employeeOptional.isPresent()) {
Employee employee = employeeOptional.get();
return Optional.of(EmployeeResponse.builder()
.id(employee.getId())
.supervisorId(employee.getSupervisorId())
.propertyList(propertyRepository.findAllPropertyByEmployeeId(id))
.reporterList(employeeRepository.findAllBySupervisorId(employee.getId()))
.build());
}
return Optional.empty();
}

@Override
public List<EmployeeResponse> getEmployees() {
Set<Long> supervisorIds = employeeRepository.findAll().stream()
.filter(e -> Objects.nonNull(e.getSupervisorId()))
.map(e -> e.getSupervisorId()).collect(Collectors.toSet());
List<Employee> employeeList = employeeRepository.findAllById(supervisorIds);
List<Property> propertyList = propertyRepository.findAll();
return employeeList.stream().map(employee -> EmployeeResponse.builder()
.id(employee.getId())
.supervisorId(employee.getSupervisorId())
.propertyList(propertyList.stream()
.filter(property -> Objects.equals(property.getEmployeeId(), employee.getId()))
.collect(Collectors.toList()))
.reporterList(employeeRepository.findAllBySupervisorId(employee.getId()))
.build())
.collect(Collectors.toList());
}
}
7 changes: 6 additions & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@ spring:
h2:
console:
enabled: true
datasource:
url: jdbc:h2:mem:testdb
username: sa
main:
allow-bean-definition-overriding: true
management:
endpoints:
web:
exposure:
include: "*"
endpoint:
health:
show-details: always
show-details: always
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package com.zoomcare.candidatechallenge.controller;

import com.zoomcare.candidatechallenge.model.Employee;
import com.zoomcare.candidatechallenge.model.EmployeeResponse;
import com.zoomcare.candidatechallenge.model.Property;
import com.zoomcare.candidatechallenge.service.EmployeeServiceImpl;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;

public class EmployeeControllerTest {

private EmployeeController controller;
EmployeeServiceImpl service;

@Before
public void setUp() {
service = Mockito.mock(EmployeeServiceImpl.class);
controller = new EmployeeController(service);
}

@Test
public void test_getEmployee_success() {
EmployeeResponse employeeResponse = getEmployeeResponse(1L, null, "title", "CEO");
Mockito.when(service.getEmployee(Mockito.any())).thenReturn(Optional.ofNullable(employeeResponse));
ResponseEntity<EmployeeResponse> controllerResponse = controller.getEmployee(1L);
assertNotNull(controllerResponse);
assertEquals(employeeResponse, controllerResponse.getBody());
assertEquals(HttpStatus.OK, controllerResponse.getStatusCode());
}

@Test
public void test_getEmployees_success() {
List<EmployeeResponse> employeesResponse = new ArrayList<>();
Mockito.when(service.getEmployees()).thenReturn(employeesResponse);
List<EmployeeResponse> controllerResponse = controller.getEmployees();
assertNotNull(employeesResponse);
assertEquals(employeesResponse, controllerResponse);
}

@Test
public void test_getEmployee_notFound() {
Mockito.when(service.getEmployee(Mockito.any())).thenReturn(Optional.empty());
ResponseEntity<EmployeeResponse> controllerResponse = controller.getEmployee(0L);
assertNull(controllerResponse.getBody());
assertEquals(HttpStatus.NOT_FOUND, controllerResponse.getStatusCode());
}

private EmployeeResponse getEmployeeResponse(Long id, Long supervisorId, String key, String title) {
Property property = new Property();
property.setEmployeeId(id);
property.setKey(key);
property.setValue(title);
List<Property> propertyByEmployeeId = new ArrayList<>();
propertyByEmployeeId.add(property);
List<Employee> reporterList = new ArrayList<>();
Employee employee2 = new Employee();
employee2.setId(2L);
employee2.setSupervisorId(1L);
Employee employee6 = new Employee();
employee6.setId(6L);
employee6.setSupervisorId(1L);
Employee employee7 = new Employee();
employee7.setId(7L);
employee7.setSupervisorId(1L);
reporterList.add(employee2);
reporterList.add(employee6);
reporterList.add(employee7);
EmployeeResponse employeeResponse = EmployeeResponse.builder()
.id(id)
.supervisorId(supervisorId)
.propertyList(propertyByEmployeeId)
.reporterList(reporterList)
.build();
return employeeResponse;
}

}
Loading