#13 Add an ability to terminate the estimation session.

#14 Add support for the "Linear" estimation scale.

Author: aprey10

src/main/java/com/aprey/jira/plugin/openpoker/EstimationScale.java

@@ -27,8 +27,9 @@
 
 @Getter
 public enum EstimationScale {
-    CLASSIC_PLANNING("Classic", EstimationUnit.CLASSIC_PLANNING),
+    CLASSIC_PLANNING("Planning Cards", EstimationUnit.CLASSIC_PLANNING),
     FIBONACCI("Fibonacci", EstimationUnit.FIBONACCI),
+    LINEAR("Linear", EstimationUnit.LINEAR),
     T_SHIRT_SIZE("T-shirt size", EstimationUnit.T_SHIRT_SIZE);
 
     private final String name;
@@ -46,6 +47,12 @@ public static Optional<EstimationUnit> findByName(String name) {
                      .findFirst();
     }
 
+    public static Optional<EstimationScale> findByUnit(EstimationUnit unit) {
+        return Arrays.stream(values())
+                     .filter(e -> e.estimationUnit.equals(unit))
+                     .findFirst();
+    }
+
     public static List<EstimationScale> getValues() {
         return Arrays.stream(values()).collect(Collectors.toList());
     }

src/main/java/com/aprey/jira/plugin/openpoker/EstimationUnit.java

@@ -20,5 +20,5 @@
 package com.aprey.jira.plugin.openpoker;
 
 public enum EstimationUnit {
-    FIBONACCI, CLASSIC_PLANNING, T_SHIRT_SIZE;
+    FIBONACCI, CLASSIC_PLANNING, T_SHIRT_SIZE, LINEAR;
 }

src/main/java/com/aprey/jira/plugin/openpoker/api/PlanningPokerWebPanelProvider.java

@@ -72,6 +72,8 @@ private void buildSessionView(PokerSession session, Map<String, Object> contextM
         SessionViewDTO viewDTO = SessionViewDTO.builder()
                                                .session(session)
                                                .estimation(buildEstimationView(session, currentUser))
+                                               .currentScale(EstimationScale.findByUnit(session.getEstimationUnit())
+                                                                            .orElse(EstimationScale.CLASSIC_PLANNING))
                                                .moderator(
                                                        userConverter.buildUserDto(session.getModerator(), currentUser))
                                                .build();

src/main/java/com/aprey/jira/plugin/openpoker/api/PokerSessionServlet.java

@@ -42,7 +42,7 @@ public PokerSessionServlet(PersistenceService persistenceService, ApplyVoteProce
                 .put(SessionAction.STOP_SESSION, new StopSessionProcessor())
                 .put(SessionAction.VOTE, new VoteProcessor())
                 .put(SessionAction.RE_ESTIMATE, new StartSessionProcessor())
-                .put(SessionAction.DELETE, new DeleteSessionProcessor())
+                .put(SessionAction.CANCEL, new DeleteSessionProcessor())
                 .put(SessionAction.APPLY_ESTIMATE, applyVoteProcessor)
                 .build();
     }

src/main/java/com/aprey/jira/plugin/openpoker/api/SessionAction.java

@@ -24,11 +24,11 @@
 
 public enum SessionAction {
     START_SESSION("Start Estimation"),
-    VOTE("Vote"),
+    VOTE("Estimate"),
     STOP_SESSION("Stop Estimation"),
     RE_ESTIMATE("Re-estimate"),
-    APPLY_ESTIMATE("Apply Estimate"),
-    DELETE("End Session");
+    APPLY_ESTIMATE("Apply"),
+    CANCEL("Terminate");
 
     private final String actionName;
 

src/main/java/com/aprey/jira/plugin/openpoker/api/SessionViewDTO.java

@@ -19,6 +19,7 @@
 
 package com.aprey.jira.plugin.openpoker.api;
 
+import com.aprey.jira.plugin.openpoker.EstimationScale;
 import com.aprey.jira.plugin.openpoker.PokerSession;
 import lombok.Builder;
 import lombok.Value;
@@ -29,4 +30,5 @@ public class SessionViewDTO {
     private final PokerSession session;
     private final UserDTO moderator;
     private final EstimationViewDTO estimation;
+    private final EstimationScale currentScale;
 }

src/main/java/com/aprey/jira/plugin/openpoker/persistence/EntityToObjConverter.java

@@ -63,6 +63,7 @@ public PokerSession toObj(PokerSessionEntity entity) {
                            .completionDate(entity.getCompletionDate())
                            .estimates(buildEstimates(entity.getEstimates(), entity.getUnitOfMeasure()))
                            .estimationGrades(estimationDeckService.getDeck(entity.getUnitOfMeasure()).getGrades())
+                           .estimationUnit(entity.getUnitOfMeasure())
                            .build();
     }
 

src/main/java/com/aprey/jira/plugin/openpoker/persistence/EstimationDeckService.java

@@ -33,6 +33,7 @@ public class EstimationDeckService {
             .put(EstimationUnit.FIBONACCI, new FibonacciDeck())
             .put(EstimationUnit.CLASSIC_PLANNING, new ClassicPlanningDeck())
             .put(EstimationUnit.T_SHIRT_SIZE, new TshirtSizeDeck())
+            .put(EstimationUnit.LINEAR, new LinearDeck())
             .build();
 
     public Deck getDeck(EstimationUnit estimationUnit) {

src/main/java/com/aprey/jira/plugin/openpoker/persistence/FibonacciNumber.java

@@ -29,13 +29,17 @@
 import static java.util.stream.Collectors.toMap;
 
 public enum FibonacciNumber implements EstimationGrade {
+    ZERO(11, "0", true),
     ONE(1, "1", true),
     TWO(2, "2", true),
     THREE(3, "3", true),
     FIVE(4, "5", true),
     EIGHT(5, "8", true),
     THIRTEEN(6, "13", true),
     TWENTY_ONE(7, "21", true),
+    THIRTY_FOUR(12, "34", true),
+    FIFTY_FIVE(13, "55", true),
+    EIGHTY_NINE(14, "89", true),
     INFINITE(8, "Infinite", false),
     COFFEE(9, "Coffee", false),
     QUESTION(10, "?", false);

…penpoker/persistence/GradesDeckType.java …in/openpoker/persistence/LinearDeck.javasrc/main/java/com/aprey/jira/plugin/openpoker/persistence/GradesDeckType.java renamed to src/main/java/com/aprey/jira/plugin/openpoker/persistence/LinearDeck.java src/main/java/com/aprey/jira/plugin/openpoker/persistence/GradesDeckType.java renamed to src/main/java/com/aprey/jira/plugin/openpoker/persistence/LinearDeck.java

@@ -19,6 +19,19 @@
 
 package com.aprey.jira.plugin.openpoker.persistence;
 
-public enum GradesDeckType {
-    Fibona
+import com.aprey.jira.plugin.openpoker.Deck;
+import com.aprey.jira.plugin.openpoker.EstimationGrade;
+import java.util.List;
+
+public class LinearDeck implements Deck {
+
+    @Override
+    public List<EstimationGrade> getGrades() {
+        return LinearSequence.getValuesList();
+    }
+
+    @Override
+    public EstimationGrade getGrade(int gradeId) {
+        return LinearSequence.findById(gradeId);
+    }
 }