From cf439ba51c6a4c69643c11e6ac221a75526f20e7 Mon Sep 17 00:00:00 2001
From: Arimihanta <aarimihanta@gmail.com>
Date: Wed, 14 Jul 2021 07:16:40 +0300
Subject: [PATCH 1/2] =?UTF-8?q?Regler=20probl=C3=A8me=20sur=20vote=20major?=
 =?UTF-8?q?itaire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lirmm/aren/ws/rest/VMThemeRESTFacade.java | 102 +++++++++---------
 1 file changed, 53 insertions(+), 49 deletions(-)

diff --git a/src/main/java/fr/lirmm/aren/ws/rest/VMThemeRESTFacade.java b/src/main/java/fr/lirmm/aren/ws/rest/VMThemeRESTFacade.java
index 0416c57..57bbba6 100644
--- a/src/main/java/fr/lirmm/aren/ws/rest/VMThemeRESTFacade.java
+++ b/src/main/java/fr/lirmm/aren/ws/rest/VMThemeRESTFacade.java
@@ -63,56 +63,8 @@ public class VMThemeRESTFacade extends AbstractRESTFacade<VMTheme>{
 
 
         themes.forEach(theme -> {
-            Object []choices=theme.getChoices().toArray() ;
-            List<VMChoice> choicesNotVoted=new ArrayList<>() ;
-            List<ProposalTallyInterface> proposalTallyInterfaces=new ArrayList<>() ;
-            for(int i=0 ; i<choices.length ; i++){
-                VMChoice choice=(VMChoice) choices[i] ;
-                if(choice.isVoted()){
-                    proposalTallyInterfaces.add(new ProposalTally(
-                            new Integer[]{choice.getRejected(),
-                                    choice.getInsufficient(),
-                                    choice.getPass(),
-                                    choice.getAcceptable(),
-                                    choice.getGood(),
-                                    choice.getVeryGood(),
-                                    choice.getExcellent()})) ;
-                }else{
-                    choicesNotVoted.add(choice) ;
-                }
-            }
-            VMChoice newChoices[]=new VMChoice[choices.length] ;
-            if(!proposalTallyInterfaces.isEmpty()){
-                ProposalTallyInterface []proposalTallyInterfacesArray=new ProposalTallyInterface[proposalTallyInterfaces.size()] ;
-                for(int i=0 ; i<proposalTallyInterfaces.size() ; i++){
-                    proposalTallyInterfacesArray[i]=proposalTallyInterfaces.get(i) ;
-                }
-                TallyInterface tally = new NormalizedTally(proposalTallyInterfacesArray) ;
-                DeliberatorInterface mj = new MajorityJudgmentDeliberator();
-                ResultInterface result = mj.deliberate(tally);
-
-
-                int index=0 ;
-                for(ProposalResultInterface item : result.getProposalResults()){
-                    newChoices[item.getRank()-1]=(VMChoice) choices[index] ;
-                    System.out.println(item.getRank()+" - "+newChoices[item.getRank()-1].getTitle());
-                    index++ ;
-                }
-            }
-
-            for(int i=0 ; i<choicesNotVoted.size() ; i++){
-                newChoices[newChoices.length-(i+1)]= choicesNotVoted.get(i) ;
-            }
-            LinkedHashSet<VMChoice> setChoices = new LinkedHashSet<>();
-            System.out.println("Rang : ") ;
-            for(int i=0 ; i<newChoices.length ; i++){
-                System.out.println(i+" - "+newChoices[i].getTitle());
-                setChoices.add(newChoices[i]) ;
-            }
-
-            theme.setChoices(setChoices);
+            this.orderChoices(theme);
             newThemes.add(theme) ;
-
         });
 
         return newThemes ;
@@ -131,6 +83,58 @@ public class VMThemeRESTFacade extends AbstractRESTFacade<VMTheme>{
     public VMTheme find(Long id) {
         boolean withChoices = this.overview == null;
         VMTheme theme = themeService.find(id,withChoices,true);
+        this.orderChoices(theme);
         return theme;
     }
+
+    private void orderChoices(VMTheme theme){
+        Object []choices=theme.getChoices().toArray() ;
+        List<VMChoice> choicesNotVoted=new ArrayList<>() ;
+        List<ProposalTallyInterface> proposalTallyInterfaces=new ArrayList<>() ;
+        for(int i=0 ; i<choices.length ; i++){
+            VMChoice choice=(VMChoice) choices[i] ;
+            if(choice.isVoted()){
+                proposalTallyInterfaces.add(new ProposalTally(
+                        new Integer[]{choice.getRejected(),
+                                choice.getInsufficient(),
+                                choice.getPass(),
+                                choice.getAcceptable(),
+                                choice.getGood(),
+                                choice.getVeryGood(),
+                                choice.getExcellent()})) ;
+            }else{
+                choicesNotVoted.add(choice) ;
+            }
+        }
+        VMChoice newChoices[]=new VMChoice[choices.length] ;
+        if(!proposalTallyInterfaces.isEmpty()){
+            ProposalTallyInterface []proposalTallyInterfacesArray=new ProposalTallyInterface[proposalTallyInterfaces.size()] ;
+            for(int i=0 ; i<proposalTallyInterfaces.size() ; i++){
+                proposalTallyInterfacesArray[i]=proposalTallyInterfaces.get(i) ;
+            }
+            TallyInterface tally = new NormalizedTally(proposalTallyInterfacesArray) ;
+            DeliberatorInterface mj = new MajorityJudgmentDeliberator();
+            ResultInterface result = mj.deliberate(tally);
+
+
+            int index=0 ;
+            for(ProposalResultInterface item : result.getProposalResults()){
+                newChoices[item.getRank()-1]=(VMChoice) choices[index] ;
+                System.out.println(item.getRank()+" - "+newChoices[item.getRank()-1].getTitle());
+                index++ ;
+            }
+        }
+
+        for(int i=0 ; i<choicesNotVoted.size() ; i++){
+            newChoices[newChoices.length-(i+1)]= choicesNotVoted.get(i) ;
+        }
+        LinkedHashSet<VMChoice> setChoices = new LinkedHashSet<>();
+        System.out.println("Rang : ") ;
+        for(int i=0 ; i<newChoices.length ; i++){
+            System.out.println(i+" - "+newChoices[i].getTitle());
+            setChoices.add(newChoices[i]) ;
+        }
+
+        theme.setChoices(setChoices);
+    }
 }

From dc5ee5af8d6e8fad45ce5cf52779e73cfd825189 Mon Sep 17 00:00:00 2001
From: Arimihanta <aarimihanta@gmail.com>
Date: Wed, 14 Jul 2021 12:59:23 +0300
Subject: [PATCH 2/2] =?UTF-8?q?Regler=20probl=C3=A8me=20auteur=20sur=20vot?=
 =?UTF-8?q?e=20majoritaire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/fr/lirmm/aren/model/vm/VMVote.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/fr/lirmm/aren/model/vm/VMVote.java b/src/main/java/fr/lirmm/aren/model/vm/VMVote.java
index f63f7e1..cc3ab19 100644
--- a/src/main/java/fr/lirmm/aren/model/vm/VMVote.java
+++ b/src/main/java/fr/lirmm/aren/model/vm/VMVote.java
@@ -27,11 +27,11 @@ public class VMVote extends AbstractEntity implements Serializable {
         EXCELLENT
     }
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne
     @JoinColumn(name = "subThemeId")
     private VMChoice subThemeId;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne
     @JoinColumn(name = "authorId")
     private User authorId ;