Erik/DataDash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '11-add-api-for-getting-home-page-data' into 22-integrate-api-and-frontend

Browse Source
This commit is contained in:
Erik Foris 2024-07-05 14:14:14 +02:00
commit afeca6b780
13 changed files with 28 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java → src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Dataset.java
View File

@ -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;

10
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/DatasetController.java → src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java
View File

@ -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

6
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/DatasetService.java → src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetService.java
View File

@ -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

6
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Type.java Normal file
View File

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

4
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataRepository.java → src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/dataRepository.java
View File

@ -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);

3
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Category.java → src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/Category.java
View File

@ -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;

6
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/CategoryController.java → src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryController.java
View File

@ -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;

2
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryDto.java → src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryDto.java
View File

@ -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;

2
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryDtoMapper.java → src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryDtoMapper.java
View File

@ -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 {

2
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryRepository.java → src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryRepository.java
View File

@ -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;

2
src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryService.java → src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryService.java
View File

@ -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;

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

@ -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());};
}
}

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

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