ajout méthode question suivente

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/PartieKahootController.java

@@ -102,17 +102,14 @@ public class PartieKahootController {
     @ResponseStatus(HttpStatus.OK)
     public PartieKahootStatusDTO demarrerPartie(@PathVariable String codeInvitation){
         PartieKahoot partieKahoot = this.partieKahootService.getPartieKahootByIdOrCodeInvitation(codeInvitation);
-        Calendar tempsLimiteReponse = Calendar.getInstance();
+
-        tempsLimiteReponse.setTime(new Date());
-        tempsLimiteReponse.add(Calendar.MINUTE, 1);
 
         if(partieKahoot.getStatus() == Status.Started){
             throw new PartyAlreadyStartedException();
         }
         partieKahoot.setStatus(Status.Started);
-        partieKahoot.setQuestionActuel(partieKahoot.getQuestions().getFirst().getQuestion());
+
-        partieKahoot.setTempsLimiteReponse(tempsLimiteReponse);
+        partieKahoot = this.partieKahootService.questionSuivante(partieKahoot);
-        partieKahoot = this.partieKahootService.update(partieKahoot);
         return this.modelMapper.map(partieKahoot, PartieKahootStatusDTO.class);
     }
 

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/entities/QuestionPartieKahoot.java

@@ -28,4 +28,7 @@ public class QuestionPartieKahoot {
     @MapsId("idPartieKahoot")
     @JoinColumn(name="idpartiekahoot")
     private PartieKahoot partie;
+
+    @Column(name = "aetepose")
+    private boolean aEtePose = false;
 }

SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/PartieKahootService.java

@@ -1,16 +1,26 @@
 package fr.iut.sciencequest.sae.services;
 
 import fr.iut.sciencequest.sae.entities.PartieKahoot;
+import fr.iut.sciencequest.sae.entities.Question;
+import fr.iut.sciencequest.sae.entities.QuestionPartieKahoot;
+import fr.iut.sciencequest.sae.entities.Status;
 import fr.iut.sciencequest.sae.exceptions.DuplicatedIdException;
 import fr.iut.sciencequest.sae.exceptions.notFound.PartieKahootNotFoundException;
+import fr.iut.sciencequest.sae.exceptions.partie.PartyNotStartedException;
 import fr.iut.sciencequest.sae.repositories.*;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Optional;
+
 @AllArgsConstructor
 @Service
 public class PartieKahootService {
+    private static final int TEMPS_REPONSE_QUESTION = 60; //secondes
     private final PartieKahootRepository partieKahootRepository;
+    private final QuestionPartieKahootRepository questionPartieKahootRepository;
     private final PartieRepository partieRepository;
 
     public PartieKahoot findById(int id) {
@@ -54,4 +64,27 @@ public class PartieKahootService {
         return this.findById(savedPartie.getId());
     }
 
+    public PartieKahoot questionSuivante(PartieKahoot partieKahoot){
+        if(partieKahoot.getStatus() != Status.Started){
+            throw new PartyNotStartedException();
+        }
+        Optional<QuestionPartieKahoot> questionPartieKahoot = partieKahoot.getQuestions().stream().filter(q -> !q.isAEtePose()).findFirst();
+        if (questionPartieKahoot.isEmpty()){
+            partieKahoot.setStatus(Status.Ended);
+            partieKahoot.setQuestionActuel(null);
+            partieKahoot.setTempsLimiteReponse(null);
+        }else{
+            Calendar tempsLimiteReponse = Calendar.getInstance();
+            tempsLimiteReponse.setTime(new Date());
+            tempsLimiteReponse.add(Calendar.SECOND, PartieKahootService.TEMPS_REPONSE_QUESTION);
+
+            questionPartieKahoot.get().setAEtePose(true);
+            partieKahoot.setQuestionActuel(questionPartieKahoot.get().getQuestion());
+            partieKahoot.setTempsLimiteReponse(tempsLimiteReponse);
+
+            this.questionPartieKahootRepository.save(questionPartieKahoot.get());
+        }
+        return this.update(partieKahoot);
+    }
+
 }

SpringBootProject/src/main/resources/schema.sql

@@ -178,6 +178,7 @@ CREATE TABLE ThematiqueSelectionnee(
 CREATE TABLE QuestionPartieKahoot(
                           idPartieKahoot integer REFERENCES PartieKahoot(idPartie),
                           idQuestion integer REFERENCES Question(id),
+                          aetepose boolean DEFAULT false,
                           PRIMARY KEY (idPartieKahoot, idQuestion)
 );