Fix ImageController (UUID)
This commit is contained in:
@@ -33,9 +33,9 @@ public class ImageController {
|
||||
|
||||
@RequestMapping(path = IMAGE_GET_ALL, method = RequestMethod.GET, produces = "application/json")
|
||||
public ResponseEntity<List<ImageModel>> getAll(HttpServletRequest request,
|
||||
@RequestParam(value = PARAM_ARTICLE_ID) Long articleId) {
|
||||
@RequestParam(value = PARAM_UUID) UUID uuid) {
|
||||
logRequest(request);
|
||||
List<Image> images = imageService.getImagesByArticleId(articleId);
|
||||
List<Image> images = imageService.getImagesByUUID(uuid);
|
||||
if(images.isEmpty()) {
|
||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
@@ -44,9 +44,9 @@ public class ImageController {
|
||||
|
||||
@RequestMapping(path = IMAGE_BASE, method = RequestMethod.GET, produces = "application/json")
|
||||
public ResponseEntity<ImageModel> getFirst(HttpServletRequest request,
|
||||
@RequestParam(value = PARAM_ARTICLE_ID) Long articleId) {
|
||||
@RequestParam(value = PARAM_UUID) UUID uuid) {
|
||||
logRequest(request);
|
||||
Image image = imageService.getImageByArticleId(articleId);
|
||||
Image image = imageService.getImageByUUID(uuid);
|
||||
if(image == null) {
|
||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Repository
|
||||
public interface ImageRepository extends JpaRepository<Image, Long> {
|
||||
@@ -15,4 +16,8 @@ public interface ImageRepository extends JpaRepository<Image, Long> {
|
||||
Image findImageByArticleId(@NotNull Long articleId);
|
||||
|
||||
Image findImageById(Long id);
|
||||
|
||||
List<Image> findImagesByArticle_Uuid(UUID articleUuid);
|
||||
|
||||
Image findImageByArticle_Uuid(UUID articleUuid);
|
||||
}
|
||||
|
||||
@@ -9,6 +9,10 @@ import java.util.UUID;
|
||||
public interface ImageService {
|
||||
List<Image> getImagesByArticleId(Long articleId);
|
||||
|
||||
List<Image> getImagesByUUID(UUID uuid);
|
||||
|
||||
Image getImageByUUID(UUID uuid);
|
||||
|
||||
Image getImageByArticleId(Long imageId);
|
||||
|
||||
Image getImageById(Long imageId);
|
||||
|
||||
@@ -38,6 +38,16 @@ public class ImageServiceImpl implements ImageService {
|
||||
return imageRepository.findImageByArticleId(imageId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Image> getImagesByUUID(UUID uuid) {
|
||||
return imageRepository.findImagesByArticle_Uuid(uuid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Image getImageByUUID(UUID uuid) {
|
||||
return imageRepository.findImageByArticle_Uuid(uuid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Image getImageById(Long imageId) {
|
||||
return imageRepository.findImageById(imageId);
|
||||
|
||||
Reference in New Issue
Block a user