diff --git a/src/main/kotlin/com/s3ai/corporate_app2/controllers/CinemasController.kt b/src/main/kotlin/com/s3ai/corporate_app2/controllers/CinemasController.kt index 7d6f4a938ff4621c66f54926ffab3b310bb9d2b4..132b58c030359dd4aaff4e842c6cefcf87e02b60 100644 --- a/src/main/kotlin/com/s3ai/corporate_app2/controllers/CinemasController.kt +++ b/src/main/kotlin/com/s3ai/corporate_app2/controllers/CinemasController.kt @@ -3,10 +3,15 @@ package com.s3ai.corporate_app2.controllers import com.s3ai.corporate_app2.Cinema import com.s3ai.corporate_app2.CinemaService import org.springframework.beans.factory.annotation.Autowired +import org.springframework.http.HttpStatus import org.springframework.stereotype.Controller import org.springframework.ui.Model import org.springframework.web.bind.annotation.* +import org.springframework.web.client.HttpClientErrorException +import org.springframework.web.server.ResponseStatusException import org.springframework.web.servlet.view.RedirectView +import java.lang.IllegalArgumentException +import java.util.* import java.util.UUID.fromString import java.util.UUID.randomUUID @@ -30,7 +35,14 @@ class CinemasController { cinema.id = randomUUID() model.addAttribute("action", "Create") } else { - cinema = cinemaService.findById(fromString(id)) + val idParsed: UUID + try { + idParsed = fromString(id) + } + catch (e: IllegalArgumentException){ + throw ResponseStatusException(HttpStatus.BAD_REQUEST) + } + cinema = cinemaService.findById(idParsed) model.addAttribute("action", "Edit") } model.addAttribute("cinema", cinema) diff --git a/src/main/kotlin/com/s3ai/corporate_app2/controllers/TicketsController.kt b/src/main/kotlin/com/s3ai/corporate_app2/controllers/TicketsController.kt index 389362562e7f362a0ef9f33609ad32d32ce0fcd4..4c865d044459e4e58c23d61e66ef90d8e6733ca3 100644 --- a/src/main/kotlin/com/s3ai/corporate_app2/controllers/TicketsController.kt +++ b/src/main/kotlin/com/s3ai/corporate_app2/controllers/TicketsController.kt @@ -5,10 +5,13 @@ import com.s3ai.corporate_app2.Ticket import com.s3ai.corporate_app2.TicketService import com.s3ai.corporate_app2.UserService import org.springframework.beans.factory.annotation.Autowired +import org.springframework.http.HttpStatus import org.springframework.stereotype.Controller import org.springframework.ui.Model import org.springframework.web.bind.annotation.* +import org.springframework.web.server.ResponseStatusException import org.springframework.web.servlet.view.RedirectView +import java.lang.IllegalArgumentException import java.util.* @Controller @@ -35,7 +38,14 @@ class TicketsController { ticket.id = UUID.randomUUID() model.addAttribute("action", "Create") } else { - ticket = ticketService.findById(UUID.fromString(id)) + val idParsed: UUID + try { + idParsed = UUID.fromString(id) + } + catch (e: IllegalArgumentException){ + throw ResponseStatusException(HttpStatus.BAD_REQUEST) + } + ticket = ticketService.findById(idParsed) model.addAttribute("action", "Edit") } model.addAttribute("ticket", ticket) diff --git a/src/main/kotlin/com/s3ai/corporate_app2/controllers/UsersController.kt b/src/main/kotlin/com/s3ai/corporate_app2/controllers/UsersController.kt index 54179542bdaaead96f607c570c8f7046bb4dc781..786a29335b2244650697b1ceae315df49d05959b 100644 --- a/src/main/kotlin/com/s3ai/corporate_app2/controllers/UsersController.kt +++ b/src/main/kotlin/com/s3ai/corporate_app2/controllers/UsersController.kt @@ -3,10 +3,13 @@ package com.s3ai.corporate_app2.controllers import com.s3ai.corporate_app2.User import com.s3ai.corporate_app2.UserService import org.springframework.beans.factory.annotation.Autowired +import org.springframework.http.HttpStatus import org.springframework.stereotype.Controller import org.springframework.ui.Model import org.springframework.web.bind.annotation.* +import org.springframework.web.server.ResponseStatusException import org.springframework.web.servlet.view.RedirectView +import java.lang.IllegalArgumentException import java.util.* @Controller @@ -29,7 +32,14 @@ class UsersController { user.id = UUID.randomUUID() model.addAttribute("action", "Create") } else { - user = userService.findById(UUID.fromString(id)) + val idParsed: UUID + try { + idParsed = UUID.fromString(id) + } + catch (e: IllegalArgumentException){ + throw ResponseStatusException(HttpStatus.BAD_REQUEST) + } + user = userService.findById(idParsed) model.addAttribute("action", "Edit") } model.addAttribute("user", user)