128 organizer would like to vote too

backend/src/main/java/io/diveni/backend/controller/RoutesController.java

@@ -89,7 +89,9 @@ public ResponseEntity<Map<String, Object>> createSession(
             null,
             accessToken,
             null,
-            LocalDate.now());
+            LocalDate.now(),
+            false,
+            null);
     databaseService.saveSession(session);
     val responseMap = Map.of("session", session, "adminCookie", session.getAdminCookie());
 

backend/src/main/java/io/diveni/backend/controller/WebsocketController.java

@@ -73,6 +73,10 @@ public void joinMember(MemberPrincipal principal) {
       webSocketService.sendTimerStartMessageToUser(
           session, session.getTimerTimestamp(), principal.getMemberID());
     }
+    webSocketService.sendUpdatedHostVotingToMember(session, principal.getMemberID());
+    if (session.getHostVoting() && session.getSessionState().equals(SessionState.VOTING_FINISHED)) {
+      webSocketService.sendMembersAdminVote(session);
+    }
     webSocketService.sendNotification(
         session,
         new Notification(
@@ -96,7 +100,7 @@ public void removeMember(Principal principal) {
           new Notification(
               NotificationType.MEMBER_LEFT,
               new MemberPayload(((MemberPrincipal) principal).getMemberID())));
-      boolean votingCompleted = checkIfAllMembersVoted(session.getMembers());
+      boolean votingCompleted = checkIfAllMembersVoted(session.getMembers(), session);
       if (votingCompleted) {
         votingFinished(
             new AdminPrincipal(
@@ -150,14 +154,16 @@ public void getMemberUpdate(AdminPrincipal principal) {
   }
 
   @MessageMapping("/startVoting")
-  public void startEstimation(AdminPrincipal principal) {
+  public void startEstimation(AdminPrincipal principal, @Payload Boolean stateOfHostVoting) {
     LOGGER.debug("--> startEstimation()");
     val session =
         ControllerUtils.getSessionOrThrowResponse(databaseService, principal.getSessionID())
             .updateSessionState(SessionState.START_VOTING)
             .resetCurrentHighlights()
+            .setHostVoting(stateOfHostVoting)
             .setTimerTimestamp(Utils.getTimestampISO8601(new Date()));
     databaseService.saveSession(session);
+    webSocketService.sendMembersHostVoting(session);
     webSocketService.sendSessionStateToMembers(session);
     webSocketService.sendTimerStartMessage(session, session.getTimerTimestamp());
     LOGGER.debug("<-- startEstimation()");
@@ -172,11 +178,28 @@ public void votingFinished(AdminPrincipal principal) {
             .selectHighlightedMembers()
             .resetTimerTimestamp();
     databaseService.saveSession(session);
+    if (session.getHostVoting()) {
+      webSocketService.sendMembersAdminVote(session);
+    }
     webSocketService.sendMembersUpdate(session);
     webSocketService.sendSessionStateToMembers(session);
     LOGGER.debug("<-- votingFinished()");
   }
 
+  @MessageMapping("/vote/admin")
+  public synchronized void processVoteAdmin(@Payload String vote, AdminPrincipal admin) {
+    LOGGER.debug("--> processVoteAdmin()");
+    val session =
+        ControllerUtils.getSessionOrThrowResponse(databaseService, admin.getSessionID())
+            .setHostEstimation(vote);
+    // webSocketService.sendMembersUpdate(session);
+    databaseService.saveSession(session);
+    if (checkIfAllMembersVoted(session.getMembers(), session)) {
+      votingFinished(new AdminPrincipal(admin.getSessionID(), admin.getAdminID()));
+    }
+    LOGGER.debug("<-- processVoteAdmin()");
+  }
+
   @MessageMapping("/vote")
   public synchronized void processVote(@Payload String vote, MemberPrincipal member) {
     LOGGER.debug("--> processVote()");
@@ -186,7 +209,7 @@ public synchronized void processVote(@Payload String vote, MemberPrincipal membe
     webSocketService.sendMembersUpdate(session);
     databaseService.saveSession(session);
 
-    boolean votingCompleted = checkIfAllMembersVoted(session.getMembers());
+    boolean votingCompleted = checkIfAllMembersVoted(session.getMembers(), session);
     if (votingCompleted) {
       votingFinished(
           new AdminPrincipal(
@@ -196,22 +219,31 @@ public synchronized void processVote(@Payload String vote, MemberPrincipal membe
     LOGGER.debug("<-- processVote()");
   }
 
-  private boolean checkIfAllMembersVoted(List<Member> members) {
-    return members.stream().filter(m -> m.getCurrentEstimation() == null).count() == 0;
+  private boolean checkIfAllMembersVoted(List<Member> members, Session session) {
+    if (session.getHostVoting() == false) {
+      return members.stream().filter(m -> m.getCurrentEstimation() == null).count() == 0;
+    }
+    return members.stream().filter(m -> m.getCurrentEstimation() == null).count() == 0
+        && null != session.getHostEstimation()
+        && !"".equals(session.getHostEstimation().getHostEstimation());
   }
 
   @MessageMapping("/restart")
-  public synchronized void restartVote(AdminPrincipal principal) {
+  public synchronized void restartVote(
+      AdminPrincipal principal, @Payload Boolean stateOfHostVoting) {
     LOGGER.debug("--> restartVote()");
     val session =
         ControllerUtils.getSessionOrThrowResponse(databaseService, principal.getSessionID())
             .updateSessionState(SessionState.START_VOTING)
             .resetEstimations()
+            .setHostVoting(stateOfHostVoting)
             .setTimerTimestamp(Utils.getTimestampISO8601(new Date()));
     databaseService.saveSession(session);
     webSocketService.sendMembersUpdate(session);
+    webSocketService.sendMembersHostVoting(session);
     webSocketService.sendSessionStateToMembers(session);
     webSocketService.sendTimerStartMessage(session, session.getTimerTimestamp());
+    webSocketService.sendMembersAdminVote(session);
     LOGGER.debug("<-- restartVote()");
   }
 

backend/src/main/java/io/diveni/backend/model/AdminVote.java

@@ -0,0 +1,15 @@
+package io.diveni.backend.model;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@EqualsAndHashCode
+@AllArgsConstructor
+public class AdminVote {
+
+  private String hostEstimation;
+}