From bf9b411c9bc8f6e6b04cb12ead0ad4d956fb4a04 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Fri, 5 Jul 2024 19:31:19 +0200 Subject: [PATCH] chore: Remove unused DatasetController endpoint and method --- .../DataDash/Dataset/DatasetController.java | 20 --------- .../DataDash/Dataset/DatasetService.java | 44 ------------------- 2 files changed, 64 deletions(-) diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java index 8665acb..1d1ef41 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java @@ -14,8 +14,6 @@ import java.util.UUID; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import de.uni_passau.fim.PADAS.group3.DataDash.category.Category; - @RestController @RequestMapping("/api/v1/datasets") @EnableSpringDataWebSupport @@ -79,24 +77,6 @@ public class DatasetController { return new ResponseEntity<>(datasetService.getDatasetById(id), HttpStatus.OK); } - @GetMapping - public Page getDatasetsByDateAfter(@RequestParam(value = "author", required = false) String author, - @RequestParam(value = "title", required = false) String title, - @RequestParam(value = "description", required = false) String description, - @RequestParam(value = "abst", required = false) String abst, - @RequestParam(value = "type", required = false) Type type, - @RequestParam(value = "min-rating", required = false) Float rating, - @RequestParam(value = "page", required = false, defaultValue = "0") int page, - @RequestParam(value = "size", required = false, defaultValue = "20") int size, - @RequestParam(value = "sort", required = false, defaultValue = "upvotes") String sort, - @RequestParam(value = "direction", required = false, defaultValue = "desc") String direction, - @RequestParam(value = "category", required = false) Category category) { - Pageable pageable = PageRequest.of(page, size, - Sort.by(Sort.Direction.fromString(direction), sort)); - return datasetService.getDatasetsByOptionalCriteria(title, description, author, abst, type, rating, category, - pageable); - } - @GetMapping("/search") public ResponseEntity> search( @RequestParam(value = "search", required = false, defaultValue = "%") String search, diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetService.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetService.java index 7762f31..93d1388 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetService.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetService.java @@ -23,10 +23,6 @@ public class DatasetService { this.categoryRepository = categoryRepository; } - public List getAllDatasets() { - return datasetRepository.findAll(); - } - public Dataset getDatasetById(UUID id) { return datasetRepository.getDatasetById(id); } @@ -36,10 +32,6 @@ public class DatasetService { return datasetRepository.save(dataset); } - public void updateDatasetTitle(UUID id, String title) { - datasetRepository.getDatasetById(id).setTitle(title); - } - public void voteDataset(UUID id, int vote) { Dataset dataset = datasetRepository.getDatasetById(id); dataset.vote(vote); @@ -51,34 +43,6 @@ public class DatasetService { datasetRepository.delete(dataset); } - public List getDatasetsByTitle(String title) { - return datasetRepository.findByTitle(title); - } - - public List getDatasetsByTitleLike(String title) { - return datasetRepository.findByTitleLike(title); - } - - public List findByDescriptionLike(String description) { - return datasetRepository.findByDescriptionLike(description); - } - - public List getDatasetsByAuthorLike(String author) { - return datasetRepository.findByAuthorLike(author); - } - - public List getDatasetsByType(Type type) { - return datasetRepository.findByType(type); - } - - public List getDatasetsByAbstLike(String abst) { - return datasetRepository.findByAbstLike(abst); - } - - public List getDatasetsByRaitingGreaterThan(float raiting) { - return datasetRepository.findByRaitingGreaterThan(raiting); - } - public void upvoteDataset(UUID id) { Dataset dataset = datasetRepository.getDatasetById(id); dataset.upvote(); @@ -91,14 +55,6 @@ public class DatasetService { datasetRepository.save(dataset); } - public Page getDatasetsByOptionalCriteria(String title, String description, String author, String abst, - Type type, Float raiting, Category category, Pageable pageable) { - return datasetRepository.findByOptionalCriteria(Optional.ofNullable(title), Optional.ofNullable(description), - Optional.ofNullable(author), Optional.ofNullable(abst), Optional.ofNullable(type), - Optional.ofNullable(category), - Optional.ofNullable(raiting), pageable); - } - public Page searchByOptionalCriteria(String search, String categories, String type, Pageable pageable) { Category category = categories.equals("%") ? null : categoryRepository.getCategoryById(UUID.fromString(categories));