From ba6257059d5c405260da9e84d8ad05c3679d93c7 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Sat, 6 Jul 2024 21:11:27 +0200 Subject: [PATCH] Refactor DatasetService and CategoryService for better code organization and encapsulation --- .../group3/DataDash/Dataset/DatasetService.java | 16 ++++++++-------- .../DataDash/category/CategoryService.java | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) 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 52e6ef6..757739e 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 @@ -17,44 +17,44 @@ public class DatasetService { private dataRepository datasetRepository; private CategoryRepository categoryRepository; - public DatasetService(dataRepository datasetRepository, CategoryRepository categoryRepository) { + DatasetService(dataRepository datasetRepository, CategoryRepository categoryRepository) { this.datasetRepository = datasetRepository; this.categoryRepository = categoryRepository; } - public Dataset getDatasetById(UUID id) { + Dataset getDatasetById(UUID id) { return datasetRepository.getDatasetById(id); } - public Dataset addDataset(Dataset dataset) { + Dataset addDataset(Dataset dataset) { dataset.setDate(LocalDate.now()); return datasetRepository.save(dataset); } - public void voteDataset(UUID id, int vote) { + void voteDataset(UUID id, int vote) { Dataset dataset = datasetRepository.getDatasetById(id); dataset.vote(vote); datasetRepository.save(dataset); } - public void deleteDataset(UUID id) { + void deleteDataset(UUID id) { Dataset dataset = datasetRepository.getDatasetById(id); datasetRepository.delete(dataset); } - public void upvoteDataset(UUID id) { + void upvoteDataset(UUID id) { Dataset dataset = datasetRepository.getDatasetById(id); dataset.upvote(); datasetRepository.save(dataset); } - public void downvoteDataset(UUID id) { + void downvoteDataset(UUID id) { Dataset dataset = datasetRepository.getDatasetById(id); dataset.downvote(); datasetRepository.save(dataset); } - public Page searchByOptionalCriteria(String search, String categories, String type, Pageable pageable) { + Page searchByOptionalCriteria(String search, String categories, String type, Pageable pageable) { Category category = categories.equals("%") ? null : categoryRepository.getCategoryById(UUID.fromString(categories)); Type t = type.equals("%") ? null : Type.valueOf(type); diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryService.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryService.java index 3e2698f..6065620 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryService.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryService.java @@ -8,22 +8,22 @@ import java.util.UUID; public class CategoryService { private CategoryRepository categoryRepository; - public CategoryService(CategoryRepository categoryRepository) { + CategoryService(CategoryRepository categoryRepository) { this.categoryRepository = categoryRepository; } - public void addCategory(CategoryDto category) { + void addCategory(CategoryDto category) { Category cat = new Category(category.getName()); categoryRepository.save(cat); } - public List getAllCategories() { + List getAllCategories() { List tmp = categoryRepository.findAll(); List s = tmp.stream().map(CategoryDtoMapper::toDto).toList(); return s; } - public CategoryDto getCategoryById(UUID id) { + CategoryDto getCategoryById(UUID id) { Category c = categoryRepository.getCategoryById(id); if (c == null) { return null;