#12 Add an ability to choose estimation scale. Add support for the two new scales: "Classic", "T-shirt size".

Author: aprey10

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

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2021  Andriy Preizner
+ *
+ * This file is a part of Open Poker jira plugin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.aprey.jira.plugin.openpoker;
+
+import java.util.List;
+
+public interface Deck {
+
+    List<EstimationGrade> getGrades();
+
+    EstimationGrade getGrade(int gradeId);
+}

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

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021  Andriy Preizner
+ *
+ * This file is a part of Open Poker jira plugin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.aprey.jira.plugin.openpoker;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import lombok.Getter;
+
+@Getter
+public enum EstimationScale {
+    CLASSIC_PLANNING("Classic", EstimationUnit.CLASSIC_PLANNING),
+    FIBONACCI("Fibonacci", EstimationUnit.FIBONACCI),
+    T_SHIRT_SIZE("T-shirt size", EstimationUnit.T_SHIRT_SIZE);
+
+    private final String name;
+    private EstimationUnit estimationUnit;
+
+    EstimationScale(String name, EstimationUnit estimationUnit) {
+        this.name = name;
+        this.estimationUnit = estimationUnit;
+    }
+
+    public static Optional<EstimationUnit> findByName(String name) {
+        return Arrays.stream(values())
+                     .filter(e -> e.name.equals(name))
+                     .map(EstimationScale::getEstimationUnit)
+                     .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
+    FIBONACCI, CLASSIC_PLANNING, T_SHIRT_SIZE;
 }

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

@@ -29,6 +29,7 @@
 import com.atlassian.plugin.spring.scanner.annotation.component.Scanned;
 import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
 import java.text.DecimalFormat;
+import java.util.Objects;
 import java.util.Optional;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -56,7 +57,7 @@ public IssueServiceFacade(CustomFieldManager customFieldManager, IssueService is
         this.issueManager = issueManager;
     }
 
-    public void applyEstimate(int estimate, ApplicationUser user, String issueId) {
+    public void applyEstimate(String estimate, ApplicationUser user, String issueId) {
         Issue issue = issueManager.getIssueObject(issueId);
         Optional<CustomField> field = getField(issue);
         if (!field.isPresent()) {
@@ -82,9 +83,9 @@ public void applyEstimate(int estimate, ApplicationUser user, String issueId) {
         log.info("The issue {} has been updated with a new story point value", issueId);
     }
 
-    private IssueInputParameters buildInputParams(long fieldId, int estimate) {
+    private IssueInputParameters buildInputParams(long fieldId, String estimate) {
         IssueInputParameters issueInputParameters = issueService.newIssueInputParameters();
-        issueInputParameters.addCustomFieldValue(fieldId, String.valueOf(estimate));
+        issueInputParameters.addCustomFieldValue(fieldId, estimate);
         issueInputParameters.setSkipScreenCheck(true);
         issueInputParameters.setRetainExistingValuesWhenParameterNotProvided(true, true);
 
@@ -104,7 +105,8 @@ public Optional<String> getStoryPoints(String issueId) {
                                                    .stream()
                                                    .filter(f -> f.getFieldName().equals(STORY_POINT_FILED_NAME))
                                                    .map(f -> f.getValue(issue))
-                                                   .findFirst();
+                                                   .filter(Objects::nonNull)
+                                                   .findAny();
         if (!value.isPresent()) {
             return Optional.empty();
         }

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

@@ -33,4 +33,5 @@ public class PokerSession {
     private final long completionDate;
     private final List<EstimationGrade> estimationGrades;
     private final List<Estimate> estimates;
+    private final EstimationUnit estimationUnit;
 }

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

@@ -38,5 +38,6 @@ default Optional<Integer> getParam(HttpServletRequest request, String paramName)
         }
     }
 
+    //TODO: persistanceService should be injected to prcossors instead of passing as parameter
     void process(PersistenceService persistenceService, HttpServletRequest request, String issueId);
 }

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

@@ -19,7 +19,6 @@
 
 package com.aprey.jira.plugin.openpoker.api;
 
-import com.aprey.jira.plugin.openpoker.IssueServiceFacade;
 import com.aprey.jira.plugin.openpoker.persistence.PersistenceService;
 import com.atlassian.jira.user.ApplicationUser;
 import com.atlassian.jira.user.util.UserManager;
@@ -35,31 +34,28 @@
 @Scanned
 @Slf4j
 public class ApplyVoteProcessor implements ActionProcessor {
-    private static final String ESTIMATE_FILED = "resultingEstimate";
+
+    private static final String ESTIMATE_FILED = "finalEstimateId";
     private static final String USER_ID_FIELD = "userId";
 
     @ComponentImport
     private final UserManager userManager;
-    private final IssueServiceFacade issueServiceFacade;
 
     @Inject
-    public ApplyVoteProcessor(UserManager userManager,
-                              IssueServiceFacade issueServiceFacade) {
+    public ApplyVoteProcessor(UserManager userManager) {
         this.userManager = userManager;
-        this.issueServiceFacade = issueServiceFacade;
     }
 
     @Override
     public void process(PersistenceService persistenceService, HttpServletRequest request, String issueId) {
         final long userId = Long.parseLong(request.getParameter(USER_ID_FIELD));
-        final int estimate = Integer.parseInt(request.getParameter(ESTIMATE_FILED));
+        final int estimateId = Integer.parseInt(request.getParameter(ESTIMATE_FILED));
         Optional<ApplicationUser> applicationUser = userManager.getUserById(userId);
         if (!applicationUser.isPresent()) {
             log.error("Application user is not found by {} id", userId);
             return;
         }
 
-        issueServiceFacade.applyEstimate(estimate, applicationUser.get(), issueId);
-        persistenceService.deleteSessions(issueId);
+        persistenceService.applyFinalEstimate(issueId, estimateId, applicationUser.get());
     }
 }

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

@@ -33,8 +33,7 @@
 @Builder
 public class EstimationViewDTO {
     private final List<EstimateDTO> estimates;
-    private final List<EstimationGrade> gradesToChoose;
-    private final List<EstimationGrade> gradesToApply;
+    private final List<EstimationGrade> estimationGrades;
     private final boolean alreadyVoted;
     private final boolean applicableGrades;
 

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

@@ -20,8 +20,7 @@
 package com.aprey.jira.plugin.openpoker.api;
 
 import com.aprey.jira.plugin.openpoker.Estimate;
-import com.aprey.jira.plugin.openpoker.EstimationGrade;
-import com.aprey.jira.plugin.openpoker.IssueServiceFacade;
+import com.aprey.jira.plugin.openpoker.EstimationScale;
 import com.aprey.jira.plugin.openpoker.PokerSession;
 import com.aprey.jira.plugin.openpoker.persistence.PersistenceService;
 import com.atlassian.jira.issue.Issue;
@@ -47,14 +46,12 @@ public class PlanningPokerWebPanelProvider extends AbstractJiraContextProvider {
 
     private final PersistenceService sessionService;
     private final UserConverter userConverter;
-    private final IssueServiceFacade issueServiceFacade;
 
     @Inject
     public PlanningPokerWebPanelProvider(PersistenceService sessionService,
-                                         UserConverter userConverter, IssueServiceFacade issueServiceFacade) {
+                                         UserConverter userConverter) {
         this.sessionService = sessionService;
         this.userConverter = userConverter;
-        this.issueServiceFacade = issueServiceFacade;
     }
 
     @Override
@@ -66,7 +63,8 @@ public Map<String, Object> getContextMap(ApplicationUser applicationUser, JiraHe
         contextMap.put("contextPath", jiraHelper.getRequest().getContextPath());
         contextMap.put("issueId", issueId);
         contextMap.put("userId", applicationUser.getId());
-        issueServiceFacade.getStoryPoints(issueId).ifPresent(v -> contextMap.put("currentEstimate", v));
+        contextMap.put("estimationUnits", EstimationScale.getValues());
+        sessionService.getFinaleEstimate(issueId).ifPresent(v -> contextMap.put("currentEstimate", v));
         return contextMap;
     }
 
@@ -93,11 +91,8 @@ private EstimationViewDTO buildEstimationView(PokerSession session, ApplicationU
 
         return EstimationViewDTO.builder()
                                 .alreadyVoted(alreadyVoted)
-                                .gradesToChoose(session.getEstimationGrades())
+                                .estimationGrades(session.getEstimationGrades())
                                 .estimates(estimates)
-                                .gradesToApply(session.getEstimationGrades().stream()
-                                                      .filter(EstimationGrade::isApplicable)
-                                                      .collect(Collectors.toList()))
                                 .build();
     }
 

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

@@ -19,6 +19,8 @@
 
 package com.aprey.jira.plugin.openpoker.api;
 
+import com.aprey.jira.plugin.openpoker.EstimationScale;
+import com.aprey.jira.plugin.openpoker.EstimationUnit;
 import com.aprey.jira.plugin.openpoker.persistence.PersistenceService;
 import javax.servlet.http.HttpServletRequest;
 
@@ -27,7 +29,10 @@ public class StartSessionProcessor implements ActionProcessor {
     @Override
     public void process(PersistenceService persistenceService, HttpServletRequest request, String issueId) {
         final long userId = Long.parseLong(request.getParameter("userId"));
+        final String estimationScale = request.getParameter("estimationScale");
+        EstimationUnit estimationUnit = EstimationScale.findByName(estimationScale)
+                                                       .orElse(EstimationUnit.CLASSIC_PLANNING);
 
-        persistenceService.startSession(issueId, userId);
+        persistenceService.startSession(issueId, userId, estimationUnit);
     }
 }