From fa681bd9abd34eb46e0644c352588b1ce5b45d39 Mon Sep 17 00:00:00 2001 From: gsd Date: Wed, 15 Mar 2023 21:16:09 +0300 Subject: [PATCH] mda --- .../app/controllers/admin/VIPController.java | 17 +++++++---- src/main/java/app/services/db/VIPService.java | 28 +++++++++++++------ 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/main/java/app/controllers/admin/VIPController.java b/src/main/java/app/controllers/admin/VIPController.java index d96966a..b9f4b36 100644 --- a/src/main/java/app/controllers/admin/VIPController.java +++ b/src/main/java/app/controllers/admin/VIPController.java @@ -32,12 +32,15 @@ public class VIPController { @RequestParam(value = "steam64") String user_steam64, @RequestParam int amount ) { - return new ResponseEntity(vipService.addVIP( + int result = vipService.addVIP( SteamIDConverter.getSteamID(user_steam64), amount, VipGiveMethod.MANUAL, - SteamIDConverter.getSteamID(admin_steam64).steam2 - ), HttpStatus.OK); + SteamIDConverter.getSteamID(admin_steam64).steam2); + if (result == 0) return new ResponseEntity(HttpStatus.CONFLICT); + if (result > 0) return new ResponseEntity(HttpStatus.CREATED); + if (result < 0) return new ResponseEntity(HttpStatus.RESET_CONTENT); + return new ResponseEntity(HttpStatus.BAD_REQUEST); } @DeleteMapping @@ -49,10 +52,14 @@ public class VIPController { @CookieValue(value = "steam64") String admin_steam64, @RequestParam(value = "steam64") String user_steam64 ) { - return new ResponseEntity(vipService.removeVIP( + int result = vipService.removeVIP( SteamIDConverter.getSteamID(user_steam64), SteamIDConverter.getSteamID(admin_steam64), VipGiveMethod.MANUAL - ), HttpStatus.OK); + ); + if (result == 0) return new ResponseEntity(HttpStatus.CONFLICT); + if (result > 0) return new ResponseEntity(HttpStatus.OK); + if (result < 0) return new ResponseEntity(HttpStatus.NOT_FOUND); + return new ResponseEntity(HttpStatus.BAD_REQUEST); } } diff --git a/src/main/java/app/services/db/VIPService.java b/src/main/java/app/services/db/VIPService.java index bf9b377..9d6d92c 100644 --- a/src/main/java/app/services/db/VIPService.java +++ b/src/main/java/app/services/db/VIPService.java @@ -99,26 +99,36 @@ public class VIPService { switch (vipGiveMethod){ case FREE -> { result = permitionService.addFreeVIP(steamID, amount); - regesterGiveVIP(steamID, amount, vipGiveMethod, extra, false); - publishWebhook(steamID, amount, "Free", true); + if (result != 0) { + regesterGiveVIP(steamID, amount, vipGiveMethod, extra, false); + publishWebhook(steamID, amount, "Free", true); + } } case QIWI -> { result = permitionService.addVIP(steamID, amount); - regesterGiveVIP(steamID, amount, vipGiveMethod, extra, result < 0); - publishWebhook(steamID, amount, "Qiwi", false); + if (result != 0) { + regesterGiveVIP(steamID, amount, vipGiveMethod, extra, result < 0); + publishWebhook(steamID, amount, "Qiwi", false); + } } case STEAM -> { result = permitionService.addVIP(steamID, amount); - regesterGiveVIP(steamID, amount, vipGiveMethod, extra, result < 0); - publishWebhook(steamID, amount, "Steam", false); + if (result != 0) { + regesterGiveVIP(steamID, amount, vipGiveMethod, extra, result < 0); + publishWebhook(steamID, amount, "Steam", false); + } } case MANUAL -> { result = permitionService.addVIP(steamID, amount); - regesterGiveVIP(steamID, amount, vipGiveMethod, extra, result < 0); - publishWebhook(steamID, amount, "Admin", false); + if (result != 0) { + regesterGiveVIP(steamID, amount, vipGiveMethod, extra, result < 0); + publishWebhook(steamID, amount, "Admin", false); + } } } - serverService.executeRCONOnAllServers("sm_reloadadmins"); + if (result != 0) { + serverService.executeRCONOnAllServers("sm_reloadadmins"); + } return result; }