change post timesheet entry endpoint to take an array of entries

three-consulting · Oct 19, 2022 · 4e0ea11 · 4e0ea11
1 parent c21c66b
commit 4e0ea11
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 83 deletions.
diff --git a/src/main/kotlin/three/consulting/epoc/controller/TimesheetEntryController.kt b/src/main/kotlin/three/consulting/epoc/controller/TimesheetEntryController.kt
@@ -39,13 +39,8 @@ class TimesheetEntryController(private val timesheetEntryService: TimesheetEntry
         response.writer.print(csvString)
     }
 
-    @PreAuthorize("hasAuthority('ADMIN') or #timesheetEntry.timesheet.employee.email == authentication.principal.getClaim(\"email\")")
-    @PostMapping(value = ["/timesheet-entry"], consumes = [APPLICATION_JSON_VALUE], produces = [APPLICATION_JSON_VALUE])
-    fun createTimesheetEntry(@Valid @RequestBody timesheetEntry: TimesheetEntryDTO) =
-        timesheetEntryService.createTimesheetEntry(timesheetEntry)
-
     @PreAuthorize("hasAuthority('ADMIN') or #timesheetEntryService.hasValidEmails(timesheetEntries, authentication.principal.getClaim(\"email\"))")
-    @PostMapping(value = ["/timesheet-entries"], consumes = [APPLICATION_JSON_VALUE], produces = [APPLICATION_JSON_VALUE])
+    @PostMapping(value = ["/timesheet-entry"], consumes = [APPLICATION_JSON_VALUE], produces = [APPLICATION_JSON_VALUE])
     fun createTimesheetEntries(@Valid @RequestBody timesheetEntries: List<TimesheetEntryDTO>) =
         timesheetEntryService.createTimesheetEntries(timesheetEntries)
 

diff --git a/src/test/kotlin/three/consulting/epoc/controller/TimesheetEntryControllerIntegrationTest.kt b/src/test/kotlin/three/consulting/epoc/controller/TimesheetEntryControllerIntegrationTest.kt
@@ -17,16 +17,10 @@ class TimesheetEntryControllerIntegrationTest : ControllerIntegrationTest() {
         assertThat(response.statusCode).isEqualTo(HttpStatus.OK)
     }
 
-    @Test
-    fun `add timesheetEntry returns 200`() {
-        val httpEntity = jsonPostEntity("timesheetEntry/validCreation.json")
-        val response = restTemplate.postForEntity("/timesheet-entry", httpEntity, ObjectNode::class.java)
-        assertThat(response.statusCode).isEqualTo(HttpStatus.OK)
-    }
     @Test
     fun `add timesheetEntries returns 200`() {
         val httpEntity = jsonPostEntity("timesheetEntry/validCreateMany.json")
-        val response = restTemplate.postForEntity("/timesheet-entries", httpEntity, ArrayNode::class.java)
+        val response = restTemplate.postForEntity("/timesheet-entry", httpEntity, ArrayNode::class.java)
         assertThat(response.statusCode).isEqualTo(HttpStatus.OK)
     }
 

diff --git a/src/test/resources/timesheetEntry/validCreation.json b/src/test/resources/timesheetEntry/validCreation.json