Skip to content

Complete #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package io.zipcoder.persistenceapp.controllers;

import io.zipcoder.persistenceapp.entities.Department;
import io.zipcoder.persistenceapp.services.DepartmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

@Controller
public class DepartmentController {

@Autowired
DepartmentService departmentService;

@PutMapping("/departments/{id}")
public ResponseEntity<Department> updateDepartment (@RequestBody Department department) {
return new ResponseEntity<Department>(departmentService.updateDepartment(department), HttpStatus.OK);
}

@PostMapping("/departments")
public ResponseEntity<Department> addDepartment (@RequestBody Department department) {
return new ResponseEntity<Department>(departmentService.createDepartment(department), HttpStatus.CREATED);
}

@GetMapping("/departments/{id}")
public ResponseEntity<Department> getDepartment (@PathVariable Integer id) {
return new ResponseEntity<Department>(departmentService.getDepartment(id), HttpStatus.OK);
}

@PostMapping("/departments/{id}-{managerId}")
public ResponseEntity<Department> setManager (@PathVariable int id, @PathVariable int managerId) {
Department response = departmentService.setManager(id,managerId);
if (response != null) {
return new ResponseEntity<Department>(response, HttpStatus.OK);
} else {
return new ResponseEntity<Department>(HttpStatus.BAD_REQUEST);
}

}

@PutMapping("/merge/{deptAId}-{deotBId}")
public ResponseEntity<Department> mergeDepartments (@PathVariable int deptAId, @PathVariable int deptBId) {
Department response = departmentService.mergeDepartments(deptAId, deptBId);
if (response != null) {
return new ResponseEntity<Department>(response, HttpStatus.OK);
} else {
return new ResponseEntity<Department>(HttpStatus.BAD_REQUEST);
}

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
package io.zipcoder.persistenceapp.controllers;

import io.zipcoder.persistenceapp.entities.Employee;
import io.zipcoder.persistenceapp.services.EmployeeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@Controller
public class EmployeeController {

@Autowired
EmployeeService employeeService;

@GetMapping("/employees")
public ResponseEntity<Iterable<Employee>> getAllEmployees () {
return new ResponseEntity<Iterable<Employee>>(employeeService.getAllEmployees(), HttpStatus.OK);
}

@GetMapping("/employees/{id}")
public ResponseEntity<Employee> getEmployee (@PathVariable Integer id) {
return new ResponseEntity<Employee>(employeeService.getEmployee(id), HttpStatus.OK);
}

@PutMapping("/employees/{id}")
public ResponseEntity<Employee> updateEmployee (@RequestBody Employee employee) {
return new ResponseEntity<Employee>(employeeService.updateEmployee(employee), HttpStatus.OK);
}

@PostMapping("/employees")
public ResponseEntity<Employee> addEmployee (@RequestBody Employee employee) {
return new ResponseEntity<Employee>(employeeService.createEmployee(employee), HttpStatus.CREATED);
}

@DeleteMapping("/employees/{id}")
public ResponseEntity<Employee> deleteEmployee (@PathVariable Integer id) {
employeeService.deleteEmployee(id);
return new ResponseEntity<Employee>(HttpStatus.OK);
}

@DeleteMapping("/employees")
public ResponseEntity<Employee> deleteEmployees (@RequestBody List<Employee> employees) {
employeeService.deleteEmployees(employees);
return new ResponseEntity<Employee>(HttpStatus.OK);
}

@DeleteMapping("/employees/deptPurge/{deptId}")
public ResponseEntity<Employee> deleteEmployeesFromDepartment (@PathVariable int deptId) {
employeeService.deleteEmployeesFromDepartment(deptId);
return new ResponseEntity<Employee>(HttpStatus.OK);
}

@DeleteMapping("/employees/managerPurge/{managerId}")
public ResponseEntity<Employee> deleteEmployeesManagedByRecursive (@PathVariable int managerId) {
employeeService.deleteEmployeesManagedByRecursive(managerId);
return new ResponseEntity<Employee>(HttpStatus.OK);
}

@DeleteMapping("/employees/managerRemap/{managerId}")
public ResponseEntity<Employee> deleteEmployeesManagedByRemap (@PathVariable int managerId) {
employeeService.deleteEmployeesManagedByRemap(managerId);
return new ResponseEntity<Employee>(HttpStatus.OK);
}

@PostMapping("/employees/{id}-{managerId}")
public ResponseEntity<Employee> setManager (@PathVariable int id, @PathVariable int managerId) {
return new ResponseEntity<Employee>(employeeService.setManager(id,managerId), HttpStatus.OK);
}

@GetMapping("/employees/managed/{managerId}")
public ResponseEntity<Iterable<Employee>> getEmployeesManagedBy (@PathVariable int managerId) {
return new ResponseEntity<Iterable<Employee>>(employeeService.getEmployeesManagedBy(managerId), HttpStatus.OK);
}

@GetMapping("/employees/dept/{deptId}")
public ResponseEntity<Iterable<Employee>> getEmployeesOfDepartment (@PathVariable int deptId) {
return new ResponseEntity<Iterable<Employee>>(employeeService.getEmployeesOfDepartment(deptId), HttpStatus.OK);
}

@GetMapping("/employees/nomgr")
public ResponseEntity<Iterable<Employee>> getEmployeesNoManager () {
return new ResponseEntity<Iterable<Employee>>(employeeService.getEmployeesNoManager(), HttpStatus.OK);
}

@GetMapping("/employees/mgrtree/{id}")
public ResponseEntity<Iterable<Employee>> getManagerTree (@PathVariable int id) {
return new ResponseEntity<Iterable<Employee>>(employeeService.getManagerTree(id), HttpStatus.OK);
}

}
38 changes: 38 additions & 0 deletions src/main/java/io/zipcoder/persistenceapp/entities/Department.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package io.zipcoder.persistenceapp.entities;

import javax.persistence.*;

@Entity
public class Department {

@Id
@GeneratedValue
private int id;
private String name;
@ManyToOne
private Employee manager;

public int getId() {
return id;
}

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

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public Employee getManager() {
return manager;
}

public void setManager(Employee manager) {
this.manager = manager;
}
}
99 changes: 99 additions & 0 deletions src/main/java/io/zipcoder/persistenceapp/entities/Employee.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
package io.zipcoder.persistenceapp.entities;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import javax.persistence.*;

@Entity
@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
public class Employee {

@Id
@GeneratedValue
private Integer id;
private String firstName;
private String lastName;
private String title;
private String phoneNumber;
private String email;
@ManyToOne(fetch = FetchType.LAZY)
private Employee manager;
//@ManyToOne(fetch = FetchType.LAZY)
private Integer departmentNum;

public Employee() {
}

public Employee(String firstName, String lastName, String title, String phoneNumber, String email) {
this.firstName = firstName;
this.lastName = lastName;
this.title = title;
this.phoneNumber = phoneNumber;
this.email = email;
}


public Integer getId() {
return id;
}

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

public String getFirstName() {
return firstName;
}

public void setFirstName(String firstName) {
this.firstName = firstName;
}

public String getLastName() {
return lastName;
}

public void setLastName(String lastName) {
this.lastName = lastName;
}

public String getTitle() {
return title;
}

public void setTitle(String title) {
this.title = title;
}

public String getPhoneNumber() {
return phoneNumber;
}

public void setPhoneNumber(String phoneNumber) {
this.phoneNumber = phoneNumber;
}

public String getEmail() {
return email;
}

public void setEmail(String email) {
this.email = email;
}

public Employee getManager() {
return manager;
}

public void setManager(Employee manager) {
this.manager = manager;
}

public Integer getDepartmentNum() {
return departmentNum;
}

public void setDepartmentNum(Integer departmentNum) {
this.departmentNum = departmentNum;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package io.zipcoder.persistenceapp.repositories;

import io.zipcoder.persistenceapp.entities.Department;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;

@Repository
public interface DepartmentRepository extends CrudRepository<Department,Integer> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package io.zipcoder.persistenceapp.repositories;

import io.zipcoder.persistenceapp.entities.Employee;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface EmployeeRepository extends CrudRepository<Employee,Integer> {

List<Employee> findEmployeeByManagerId(int managerId);

List<Employee> findEmployeeByDepartmentNum(int departmentId);

List<Employee> findEmployeeByManagerIsNull();

void deleteEmployeesByDepartmentNum(int departmentId);

void deleteEmployeesByManagerIn(Iterable<Employee> managers);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package io.zipcoder.persistenceapp.services;

import io.zipcoder.persistenceapp.entities.Department;
import io.zipcoder.persistenceapp.entities.Department;
import io.zipcoder.persistenceapp.entities.Department;
import io.zipcoder.persistenceapp.entities.Employee;
import io.zipcoder.persistenceapp.repositories.DepartmentRepository;
import io.zipcoder.persistenceapp.repositories.EmployeeRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@Service
public class DepartmentService {

@Autowired
DepartmentRepository departmentRepository;

@Autowired
EmployeeService employeeService;

public Department createDepartment(Department department) {
return departmentRepository.save(department);
}
public Department updateDepartment(Department department) {
return departmentRepository.save(department);
}

public Department getDepartment(Integer id) {
return departmentRepository.findOne(id);
}

public Department setManager(int id, int managerId) {
Department department = getDepartment(id);
Employee manager = employeeService.getEmployee(managerId);
if (department != null && manager != null) {
department.setManager(manager);
return departmentRepository.save(department);
} else {
return null;
}
}

public Department mergeDepartments(int deptAId, int deptBId) {
Department departmentA = getDepartment(deptAId);
Department departmentB = getDepartment(deptBId);
if (departmentA != null && departmentB != null) {
departmentB.getManager().setDepartmentNum(deptAId); // move mgr
for (Employee e : employeeService.getEmployeesOfDepartment(deptBId)) {
e.setDepartmentNum(deptAId); // move the others
}
departmentRepository.delete(departmentB);
return departmentA;
} else {
return null;
}


}
}
Loading