From 9fe0ce047a473228db83a5bacdd1cb3f69c57aaa Mon Sep 17 00:00:00 2001
From: Andrey Belousov <groundhog448@gmail.com>
Date: Thu, 19 Dec 2019 01:49:39 +0000
Subject: [PATCH] Added missing delete methods for Ticket and User controllers
---
.../com/s3ai/controllers/cinemas/CinemaFill.java | 2 +-
.../com/s3ai/controllers/tickets/TicketsEdit.java | 15 +++++++++++++++
.../com/s3ai/controllers/users/UsersEdit.java | 15 +++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/s3ai/controllers/cinemas/CinemaFill.java b/src/main/java/com/s3ai/controllers/cinemas/CinemaFill.java
index 8611f43..511956b 100644
--- a/src/main/java/com/s3ai/controllers/cinemas/CinemaFill.java
+++ b/src/main/java/com/s3ai/controllers/cinemas/CinemaFill.java
@@ -28,7 +28,7 @@ public class CinemaFill extends HttpServlet {
var random = new Random();
for (int i = 0; i < 300; i++) {
var cinema = new Cinema();
- cinemaService.fillCinemaFields(cinema, names.get(random.nextInt(names.size())), locations.get(random.nextInt(locations.size())), Math.abs(random.nextInt()));
+ cinemaService.fillCinemaFields(cinema, names.get(random.nextInt(names.size())), locations.get(random.nextInt(locations.size())), random.nextInt(300) + 50);
cinemaService.saveCinema(cinema);
writer.println(cinema);
}
diff --git a/src/main/java/com/s3ai/controllers/tickets/TicketsEdit.java b/src/main/java/com/s3ai/controllers/tickets/TicketsEdit.java
index 1adbf19..086f3eb 100644
--- a/src/main/java/com/s3ai/controllers/tickets/TicketsEdit.java
+++ b/src/main/java/com/s3ai/controllers/tickets/TicketsEdit.java
@@ -70,4 +70,19 @@ public class TicketsEdit extends HttpServlet {
session.setAttribute("ticket", ticket);
dispatcher.forward(req, resp);
}
+
+ protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ String id = req.getParameter("id");
+ if (null == id) {
+ resp.sendError(420, "Object cannot be found");
+ return;
+ }
+ var ticket = ticketService.getTicketById(UUID.fromString(id));
+ if (null == ticket) {
+ resp.sendError(420, "Object cannot be found");
+ return;
+ }
+ ticketService.deleteTicket(ticket);
+ resp.setStatus(200);
+ }
}
diff --git a/src/main/java/com/s3ai/controllers/users/UsersEdit.java b/src/main/java/com/s3ai/controllers/users/UsersEdit.java
index e3dd648..09c136c 100644
--- a/src/main/java/com/s3ai/controllers/users/UsersEdit.java
+++ b/src/main/java/com/s3ai/controllers/users/UsersEdit.java
@@ -46,4 +46,19 @@ public class UsersEdit extends HttpServlet {
session.setAttribute("user", user);
dispatcher.forward(req, resp);
}
+
+ protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ String id = req.getParameter("id");
+ if (null == id) {
+ resp.sendError(420, "Object cannot be found");
+ return;
+ }
+ var user = userService.getUserById(UUID.fromString(id));
+ if (null == user) {
+ resp.sendError(420, "Object cannot be found");
+ return;
+ }
+ userService.deleteUser(user);
+ resp.setStatus(200);
+ }
}
--
GitLab