mirrors/swt23w23
1
0
Fork 0
mirror of https://github.com/st-tu-dresden-praktikum/swt23w23 synced 2024-07-19 21:04:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove employee if associated with order

Browse source
This commit is contained in:
Denis Natusch 2024-01-15 14:18:52 +01:00 committed by Mathis
parent d75234d172
commit f808c2497d
3 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/catering/order/CustomOrder.java
View file

@ -91,6 +91,13 @@ public class CustomOrder extends Order {
return false; return false;
} }
/**
* Removes an employee from all order.
*/
public boolean removeEmployee(Employee employee) {
return staff.remove(employee);
}
public Set<Employee> getStaff() { public Set<Employee> getStaff() {
return staff; return staff;
} }

8
src/main/java/catering/staff/StaffManagement.java
View file

@ -44,6 +44,14 @@ public class StaffManagement {
} }
public void delete(Long id) { public void delete(Long id) {
Employee e = staffRepository.findById(id).orElse(null);
if (e == null) return;
orderManagement.findAll(Pageable.unpaged())
.stream()
.forEach(o -> {
o.removeEmployee(e);
orderManagement.save(o);
});
staffRepository.deleteById(id); staffRepository.deleteById(id);
} }

25
src/test/java/catering/staff/StaffControllerIntegrationTests.java
View file

@ -18,6 +18,8 @@ import java.time.LocalDateTime;
import java.time.YearMonth; import java.time.YearMonth;
import java.util.Set; import java.util.Set;
import javax.money.MonetaryAmount;
import org.javamoney.moneta.Money; import org.javamoney.moneta.Money;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -68,6 +70,8 @@ class StaffControllerIntegrationTests {
User defaultCustomer; User defaultCustomer;
Employee orderEmployee; Employee orderEmployee;
CustomOrder defaultStaffOrder; CustomOrder defaultStaffOrder;
Employee removeEmployeeAssociatedWithOrder;
CustomOrder removeEmployeeAssociatedWithOrderCustomOrder;
CustomOrder createCustomOrder(LocalDateTime start, LocalDateTime end, Set<Employee> staff) { CustomOrder createCustomOrder(LocalDateTime start, LocalDateTime end, Set<Employee> staff) {
CustomOrder order = orderManagement.save(new CustomOrder(defaultCustomer.getUserAccount().getId(), CustomOrder order = orderManagement.save(new CustomOrder(defaultCustomer.getUserAccount().getId(),
@ -92,6 +96,11 @@ class StaffControllerIntegrationTests {
orderEmployee = staffManagement.save(new Employee("Tyler Baum", JobType.COOK, Money.of(10, EURO))); orderEmployee = staffManagement.save(new Employee("Tyler Baum", JobType.COOK, Money.of(10, EURO)));
defaultStaffOrder = createCustomOrder(LocalDateTime.of(2023, 12, 20, 10, 0), defaultStaffOrder = createCustomOrder(LocalDateTime.of(2023, 12, 20, 10, 0),
LocalDateTime.of(2023, 12, 20, 21, 0), Set.of(orderEmployee)); LocalDateTime.of(2023, 12, 20, 21, 0), Set.of(orderEmployee));
removeEmployeeAssociatedWithOrder = staffManagement
.save(new Employee("Mark Baum", JobType.COOK, Money.of(10, EURO)));
removeEmployeeAssociatedWithOrderCustomOrder = createCustomOrder(LocalDateTime.of(2022, 12, 20, 10, 0),
LocalDateTime.of(2022, 12, 20, 21, 0), Set.of(removeEmployeeAssociatedWithOrder));
} }
@AfterEach @AfterEach
@ -230,4 +239,20 @@ class StaffControllerIntegrationTests {
.andExpect(status().is3xxRedirection()) .andExpect(status().is3xxRedirection())
.andExpect(header().string(HttpHeaders.LOCATION, endsWith("/login"))); .andExpect(header().string(HttpHeaders.LOCATION, endsWith("/login")));
} }
@Test
@WithMockUser(username = "admin", password = "admin", roles = "ADMIN")
void removeStaffAssoicatetWithAnOrder() throws Exception {
MonetaryAmount price = removeEmployeeAssociatedWithOrderCustomOrder.getTotal();
assertThat(removeEmployeeAssociatedWithOrderCustomOrder.getStaff().contains(removeEmployeeAssociatedWithOrder))
.isTrue();
assertThat(staffManagement.findAll().stream())
.extracting("name")
.contains("Mark Baum");
mvc.perform(post("/staff/remove").param("id", removeEmployeeAssociatedWithOrder.getId().toString()));
assertThat(staffManagement.findAll().stream())
.extracting("name")
.doesNotContain("Mark Baum");
assertThat(removeEmployeeAssociatedWithOrderCustomOrder.getTotal().isEqualTo(price)).isTrue();
}
} }