Uni/dps-webshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Image Adder Adminpanel BE

Browse Source
This commit is contained in:
Tim
2025-06-18 22:35:00 +02:00
parent 8d3596c677
commit e568a4a1bf
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
00-backend/src/main/java/de/htwsaar/webshop/controller/FarmImageController.java
View File

@@ -3,6 +3,7 @@ package de.htwsaar.webshop.controller;
import de.htwsaar.webshop.model.ArticleWithFarmImageModel; import de.htwsaar.webshop.model.ArticleWithFarmImageModel;
import de.htwsaar.webshop.model.FarmImageModel; import de.htwsaar.webshop.model.FarmImageModel;
import de.htwsaar.webshop.repository.entities.FarmImage; import de.htwsaar.webshop.repository.entities.FarmImage;
import de.htwsaar.webshop.repository.entities.Image;
import de.htwsaar.webshop.service.ArticleService; import de.htwsaar.webshop.service.ArticleService;
import de.htwsaar.webshop.service.FarmImageService; import de.htwsaar.webshop.service.FarmImageService;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
@@ -71,13 +72,17 @@ public class FarmImageController {
@RequestMapping(path = FARM_IMAGE_BASE, method = RequestMethod.PUT, produces = "application/json") @RequestMapping(path = FARM_IMAGE_BASE, method = RequestMethod.PUT, produces = "application/json")
public ResponseEntity<Boolean> update(HttpServletRequest request, public ResponseEntity<Boolean> update(HttpServletRequest request,
@RequestParam(value = PARAM_ID) Long imageId, @RequestParam(value = PARAM_UUID) UUID uuid,
@RequestBody FarmImageModel image) { @RequestBody String base64) {
logRequest(request); logRequest(request);
if (imageId == null || farmImageService.getImageById(imageId) == null) { FarmImage image = farmImageService.getImageByUUID(uuid);
if (uuid == null || base64 == null) {
return ResponseEntity.badRequest().body(false); return ResponseEntity.badRequest().body(false);
} }
image.setId(farmImageService.getImageById(imageId).getId()); if (image == null) {
return ResponseEntity.ok(farmImageService.save(uuid, base64, false) != null);
}
image.setBase64(base64);
return ResponseEntity.ok(farmImageService.save(image) != null); return ResponseEntity.ok(farmImageService.save(image) != null);
} }

12
00-backend/src/main/java/de/htwsaar/webshop/controller/ImageController.java
View File

@@ -74,13 +74,17 @@ public class ImageController {
@RequestMapping(path = IMAGE_BASE, method = RequestMethod.PUT, produces = "application/json") @RequestMapping(path = IMAGE_BASE, method = RequestMethod.PUT, produces = "application/json")
public ResponseEntity<Boolean> update(HttpServletRequest request, public ResponseEntity<Boolean> update(HttpServletRequest request,
@RequestParam(value = PARAM_ID) Long imageId, @RequestParam(value = PARAM_UUID) UUID uuid,
@RequestBody ImageModel image) { @RequestBody String base64) {
logRequest(request); logRequest(request);
if (imageId == null || imageService.getImageById(imageId) == null) { Image image = imageService.getImageByUUID(uuid);
if (uuid == null || base64 == null) {
return ResponseEntity.badRequest().body(false); return ResponseEntity.badRequest().body(false);
} }
image.setId(imageService.getImageById(imageId).getId()); if (image == null) {
return ResponseEntity.ok(imageService.save(uuid, base64) != null);
}
image.setBase64(base64);
return ResponseEntity.ok(imageService.save(image) != null); return ResponseEntity.ok(imageService.save(image) != null);
} }