diff --git a/src/main/java/hdm/mi/growbros/models/plant/Plant.java b/src/main/java/hdm/mi/growbros/models/plant/Plant.java index c4c4bcec7c4e1c261c13f88e1a8d17178e6ee20d..90d7fb3c0a0aaf3dd86a68187d61eb9a63a21359 100644 --- a/src/main/java/hdm/mi/growbros/models/plant/Plant.java +++ b/src/main/java/hdm/mi/growbros/models/plant/Plant.java @@ -30,6 +30,7 @@ public class Plant { @Column(columnDefinition = "TEXT") private String description; + @Column(columnDefinition = "TEXT") private String origin; diff --git a/src/main/java/hdm/mi/growbros/service/GrandmaService.java b/src/main/java/hdm/mi/growbros/service/GrandmaService.java index a58e5f71383d9f2233caa661123bec1e48d8d49b..5b30c9eb55d761fd9e2d8b2ab137f402499c3472 100644 --- a/src/main/java/hdm/mi/growbros/service/GrandmaService.java +++ b/src/main/java/hdm/mi/growbros/service/GrandmaService.java @@ -1,13 +1,50 @@ package hdm.mi.growbros.service; +import hdm.mi.growbros.models.plant.Plant; +import hdm.mi.growbros.repositories.PlantRepository; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Random; + @Service public class GrandmaService { + private final PlantRepository plantRepository; + + public GrandmaService (PlantRepository plantRepository){ + this.plantRepository = plantRepository; + } + public String getRandomPlantInfo() { - return "Pflanzen-Information-DesTages"; + + String plantInfo = null; + List<Plant> plants = plantRepository.findAll(); + Random random = new Random(); + int randomNumber = random.nextInt(plants.size()); + Plant randomPLant = plants.get(randomNumber); + + + int randomNumber2 = random.nextInt(5); + switch (randomNumber2){ + case 0: + plantInfo = "Did u know that " + randomPLant.getName() + "Is a " + randomPLant.getDescription(); + break; + case 1: + plantInfo = "Did u know that " + randomPLant.getName() + "is originally from " + randomPLant.getOrigin(); + break; + case 2: + plantInfo = "Did u know that " + randomPLant.getName() + "is Planted from " + randomPLant.getPlantWeekStart() + "until " + randomPLant.getPlantWeekEnd(); + break; + case 3: + plantInfo = "Did u know that " + randomPLant.getName() + "is Harvested from " + randomPLant.getHarvestWeekStart() + "until " + randomPLant.getHarvestWeekEnd(); + break; + case 4: + plantInfo = "Did u know that " + randomPLant.getName() + "is Planted in " + randomPLant.getGrowingTips(); + break; + } + return plantInfo; } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1132c3c9bcfa71dea06682653066523cad286353..c9be6cf25a60f62d0111207a9443c4a3679d96ba 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,5 +5,6 @@ spring.datasource.username=admin spring.datasource.password=admin spring.jpa.database-platform=org.hibernate.dialect.H2Dialect spring.h2.console.enabled=true +server.port=8080 app.jwtSecret = ffjsdafhjkfkafSecretjkdlfhw \ No newline at end of file