Merge branch '37-restructure-backend-according-to-seperation-by-concerns' into '11-add-api-for-getting-home-page-data'

Resolve "Restructure backend according to seperation by concerns"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!37

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Dataset.java

@@ -1,10 +1,13 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.model;
+package de.uni_passau.fim.PADAS.group3.DataDash.Dataset;
 
 import java.net.URL;
 import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
+
+import de.uni_passau.fim.PADAS.group3.DataDash.category.Category;
+
 import java.sql.Date;
 
 import jakarta.persistence.Entity;

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java

@@ -1,15 +1,9 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.controler;
+package de.uni_passau.fim.PADAS.group3.DataDash.Dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.web.bind.annotation.*;
-
-import de.uni_passau.fim.PADAS.group3.DataDash.model.Category;
-import de.uni_passau.fim.PADAS.group3.DataDash.model.Dataset;
-import de.uni_passau.fim.PADAS.group3.DataDash.model.DatasetService;
-import de.uni_passau.fim.PADAS.group3.DataDash.model.Type;
-
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.http.HttpStatus;
@@ -20,6 +14,8 @@ 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

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetService.java

@@ -1,4 +1,4 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.model;
+package de.uni_passau.fim.PADAS.group3.DataDash.Dataset;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -7,6 +7,10 @@ import java.util.UUID;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+
+import de.uni_passau.fim.PADAS.group3.DataDash.category.Category;
+import de.uni_passau.fim.PADAS.group3.DataDash.category.CategoryRepository;
+
 import org.springframework.data.domain.Page;
 
 @Service

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Type.java

@@ -0,0 +1,6 @@
+package de.uni_passau.fim.PADAS.group3.DataDash.Dataset;
+
+public enum Type {
+    DATASET,
+    API
+}

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/dataRepository.java

@@ -1,4 +1,4 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.model;
+package de.uni_passau.fim.PADAS.group3.DataDash.Dataset;
 
 import java.util.List;
 import java.util.Optional;
@@ -11,6 +11,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.uni_passau.fim.PADAS.group3.DataDash.category.Category;
+
 public interface dataRepository extends JpaRepository<Dataset, UUID> {
 
         Dataset getDatasetById(UUID id);

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/Category.java

@@ -1,10 +1,11 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.model;
+package de.uni_passau.fim.PADAS.group3.DataDash.category;
 
 import java.util.List;
 import java.util.UUID;
 
 import org.springframework.context.annotation.Lazy;
 
+import de.uni_passau.fim.PADAS.group3.DataDash.Dataset.Dataset;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryController.java

@@ -1,14 +1,10 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.controler;
+package de.uni_passau.fim.PADAS.group3.DataDash.category;
 import java.util.List;
 import java.util.UUID;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-
-import de.uni_passau.fim.PADAS.group3.DataDash.model.CategoryDto;
-import de.uni_passau.fim.PADAS.group3.DataDash.model.CategoryService;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryDto.java

@@ -1,4 +1,4 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.model;
+package de.uni_passau.fim.PADAS.group3.DataDash.category;
 
 import java.util.UUID;
 

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryDtoMapper.java

@@ -1,4 +1,4 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.model;
+package de.uni_passau.fim.PADAS.group3.DataDash.category;
 
 public class CategoryDtoMapper {
 

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryRepository.java

@@ -1,4 +1,4 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.model;
+package de.uni_passau.fim.PADAS.group3.DataDash.category;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryService.java

@@ -1,4 +1,4 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.model;
+package de.uni_passau.fim.PADAS.group3.DataDash.category;
 
 import org.springframework.stereotype.Service;
 import java.util.List;

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/LoadDummyDatabase.java

@@ -1,40 +0,0 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.model;
-
-import java.util.List;
-import java.util.Random;
-
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-
-
-@Configuration
-public class LoadDummyDatabase {
-    
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(LoadDummyDatabase.class);
-
-    //@Bean  
-    CommandLineRunner initDatabase(dataRepository repository, CategoryRepository categoryRepository) {
-
-      
-
-        return args -> {
-        for (int i = 0; i < 100; i++) {
-            Category category = new Category("Category" + i);
-            log.info("Preloading" + categoryRepository.save(category));
-
-            Dataset dataset = new Dataset("Title" + i, "Abst" + i, "Description" + i, "Author" + i,null, category, Type.API, "MIT");
-            for (int j = 0; j < new Random().nextInt(50); j++) {
-                dataset.upvote();
-            }
-            log.info("Preloading" + repository.save(dataset));
-            log.info("Preloading" + categoryRepository.save(category));
-        }
-        List<Dataset> s = repository.findByTitleLike("%Title%");
-        log.info("Found Entry with ID: " + s.get(1).getId());};
-    }
-
-
-}

src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Type.java

@@ -1,6 +0,0 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.model;
-
-public enum Type {
-    DATASET,
-    API
-}