Added question blocking

src/main/java/com/bernard/misael/model/Quizz.java

@@ -29,10 +29,6 @@ public class Quizz {
     @JoinColumn(name="owner")
     private User owner;
 
-    @Column(nullable=false) 
-    @ColumnDefault("false")
-    private boolean isPublic;
-
     @Column(nullable=false)
     @ColumnDefault("false")
     private boolean isComplete;
@@ -43,4 +39,7 @@ public class Quizz {
 
     @OneToMany(mappedBy="quizz")
     private Set<Question> questions;
+
+    @Column(nullable=true)
+    private Integer publicQuestionCount;
 }

src/main/java/com/bernard/misael/repository/QuizzRepository.java

@@ -13,7 +13,7 @@ public interface QuizzRepository extends JpaRepository<Quizz,Long> {
 
     public @NonNull Optional<Quizz> findById(@NonNull Long id);
 
-    public @NonNull Set<Quizz> findByIsPublicTrueAndIsCompleteTrue();
+    public @NonNull Set<Quizz> findByPublicQuestionCountIsNotNullAndIsCompleteTrue();
     public @NonNull Set<Quizz> findByOwnerAndIsCompleteTrue(@NonNull User owner);
     public @NonNull Set<Quizz> findByOwnerAndIsCompleteFalse(@NonNull User owner);
 

src/main/java/com/bernard/misael/service/QuizzManagerImpl.java

@@ -26,9 +26,7 @@ import com.bernard.misael.service.exception.MalformedAnswerException;
 import com.bernard.misael.service.exception.MalformedClientAnswerException;
 import com.bernard.misael.service.exception.QuestionTypeException;
 import com.bernard.misael.web.QuestionsController;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -83,6 +81,8 @@ public class QuizzManagerImpl implements QuizzManager {
         if(qindex != data.get("index").intValue())
             return errorNode("You are not answering the right question (you answer question "+data.get("index").intValue()
                 +" where you should answer question "+qindex+")");
+        if(qindex >= quizz.getPublicQuestionCount())
+            return errorNode("La question suivante est encore bloquée");
         Question q = questionRepository.findByQuizzAndIndex(quizz,qindex);
         if(q == null)
             return errorNode("Could not find question "+qindex);
@@ -143,6 +143,8 @@ public class QuizzManagerImpl implements QuizzManager {
         if(qf.isDone())
             return errorNode("No more questions");
         int qindex = qf.getCurrentQuestion();
+        if(qindex >= quizz.getPublicQuestionCount())
+            return errorNode("La question suivante est encore bloquée");
         Question q = questionRepository.findByQuizzAndIndex(quizz,qindex);
         if(q == null)
             return errorNode("Could not find question "+qindex);
@@ -206,7 +208,7 @@ public class QuizzManagerImpl implements QuizzManager {
     public boolean canAccessQuizz(User user, long quizzId) {
         try{
             Quizz quizz = qRepository.getReferenceById(quizzId);
-            return quizz.isPublic() || quizz.getOwner().equals(user);
+            return quizz.getPublicQuestionCount()!=null || quizz.getOwner().equals(user);
         } catch (EntityNotFoundException e) {
             return false;
         }
@@ -215,7 +217,7 @@ public class QuizzManagerImpl implements QuizzManager {
     @Override
     public List<Quizz> answerableQuizz(User user) {
         Set<Quizz> ownQuizz = qRepository.findByOwnerAndIsCompleteTrue(user);
-        Set<Quizz> publicQuizz = qRepository.findByIsPublicTrueAndIsCompleteTrue();
+        Set<Quizz> publicQuizz = qRepository.findByPublicQuestionCountIsNotNullAndIsCompleteTrue();
         publicQuizz.removeAll(ownQuizz);
         
         return Stream.concat(
@@ -534,7 +536,7 @@ public class QuizzManagerImpl implements QuizzManager {
         nq.setName(q.getName() + "("+ Integer.toHexString((int)(Math.random()*0xFFFFFFF)) +")");
         nq.setOwner(q.getOwner());
         nq.setQuestionCount(q.getQuestionCount());
-        nq.setPublic(q.isPublic());
+        nq.setPublicQuestionCount(q.getPublicQuestionCount());
         nq.setComplete(q.isComplete());
 
         nq = qRepository.save(nq);

src/main/java/com/bernard/misael/web/AuthController.java

@@ -6,7 +6,6 @@ import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.annotation.Secured;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;

src/main/java/com/bernard/misael/web/QuestionsController.java

@@ -10,7 +10,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.stereotype.Controller;

src/main/resources/db/migration/V6__complex_public_column.sql

@@ -0,0 +1,2 @@
+alter table if exists quizz add column public_question_count integer default NULL;
+alter table if exists quizz drop column is_public;

src/main/resources/templates/form.html

@@ -47,6 +47,9 @@
                 console.log(txt)
                 $("#error-textbox").text(txt)
             }
+            function clearerror() {
+                $("#error-textbox").text("")
+            }
             function next() {
                 $.ajax({
                     url: "/questions/question/"+qid,
@@ -61,6 +64,7 @@
                             error(res["message"])
                             return
                         }
+                        clearerror()
                         $("#question-counter").text((res["index"]+1)+"/"+qlength)
                         $("#question-text").text(res["data"]["text"])
                         if(qstep==0){
@@ -108,6 +112,7 @@
                     success: function(res) {
                         console.log(res)
                         if(res["success"]){
+                            clearerror()
                             next()
                         } else {
                             error(res["message"])
@@ -130,14 +135,15 @@
                     success: function(res) {
                         console.log(res)
                         if(res["success"]){
+                            clearerror()
+                            $("#answer-select").hide()
+                            $("#answer-duo").hide()
+                            $("#answer-carre").hide()
+                            $("#answer-cache").hide()
                             if(qindex+1 >= qlength) {
                                 $("#question-text").text("Plus de questions !")
-                                $("#answer-select").hide()
-                                $("#answer-duo").hide()
-                                $("#answer-carre").hide()
-                                $("#answer-cache").hide()
-                                
                             } else {
+                                $("#question-text").text("Question suivante ...")
                                 next()
                             }
                         } else {