From 14dc478e413520fbdbffcd693a40c7992bfe8ed1 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
Date: Thu, 23 Nov 2023 16:42:56 +0100
Subject: [PATCH] Unify naming of employee id

---
 src/main/java/catering/staff/StaffController.java         | 2 +-
 src/main/java/catering/staff/StaffManagement.java         | 8 ++++----
 src/main/resources/templates/staff.html                   | 2 +-
 .../catering/staff/StaffControllerIntegrationTests.java   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/catering/staff/StaffController.java b/src/main/java/catering/staff/StaffController.java
index 917b4c7..6ee2261 100644
--- a/src/main/java/catering/staff/StaffController.java
+++ b/src/main/java/catering/staff/StaffController.java
@@ -27,7 +27,7 @@ public class StaffController {
 
 	@PostMapping("/staff/remove")
 	@PreAuthorize("hasRole('ADMIN')")
-	public String removeStaff(@RequestParam("staffID") Staff staff, Model model) {
+	public String removeStaff(@RequestParam("id") Staff staff, Model model) {
 		staffManagement.deleteStaff(staff.getId());
 		return "redirect:/staff";
 	}
diff --git a/src/main/java/catering/staff/StaffManagement.java b/src/main/java/catering/staff/StaffManagement.java
index 426e20e..e91b660 100644
--- a/src/main/java/catering/staff/StaffManagement.java
+++ b/src/main/java/catering/staff/StaffManagement.java
@@ -17,8 +17,8 @@ public class StaffManagement {
 		this.staffRepository = staffRepository;
 	}
 
-	public Optional<Staff> findById(Long staffID) {
-		return staffRepository.findById(staffID);
+	public Optional<Staff> findById(Long id) {
+		return staffRepository.findById(id);
 	}
 
 	public Staff save(Staff staff) {
@@ -29,8 +29,8 @@ public class StaffManagement {
 		return staffRepository.findAll();
 	}
 
-	public void deleteStaff(Long staffID) {
-		staffRepository.deleteById(staffID);
+	public void deleteStaff(Long id) {
+		staffRepository.deleteById(id);
 	}
 
 }
diff --git a/src/main/resources/templates/staff.html b/src/main/resources/templates/staff.html
index 5a0db34..d600088 100644
--- a/src/main/resources/templates/staff.html
+++ b/src/main/resources/templates/staff.html
@@ -28,7 +28,7 @@
 						</td>
 						<td>
 							<form th:action="@{/staff/remove}" method="post">
-								<input type="hidden" th:name="staffID" th:value="${staff.id}" />
+								<input type="hidden" th:name="id" th:value="${staff.id}" />
 								<button type="submit" class="btn btn-danger">Entfernen</button>
 							</form>
 						</td>
diff --git a/src/test/java/catering/staff/StaffControllerIntegrationTests.java b/src/test/java/catering/staff/StaffControllerIntegrationTests.java
index 206c391..aa1f040 100644
--- a/src/test/java/catering/staff/StaffControllerIntegrationTests.java
+++ b/src/test/java/catering/staff/StaffControllerIntegrationTests.java
@@ -81,7 +81,7 @@ class StaffControllerIntegrationTests {
 	@Test
 	@WithMockUser(username = "admin", password = "admin", roles = "ADMIN")
 	void removeStaff() throws Exception {
-		mvc.perform(post("/staff/remove").param("staffID",defaultEmployeeId.toString()));
+		mvc.perform(post("/staff/remove").param("id", defaultEmployeeId.toString()));
 		// this should be replaced once we have proper access to all employees
 		mvc.perform(get("/staff/edit/" + defaultEmployeeId.toString()))
 			.andExpect(status().isInternalServerError());