fix: allow to reset cancelled sessions

Author: codescape

docs/changelog.md

@@ -11,7 +11,7 @@ category: Administration
 
 ### [Unreleased]
 
-* ...
+* fix: allow to reset cancelled sessions
 
 ### [25.12.0] - 2025-12-12
 

src/main/java/de/codescape/jira/plugins/scrumpoker/rest/SessionResource.java

@@ -93,7 +93,7 @@ public Response updateCard(@PathParam("issueKey") String issueKey, @PathParam("c
             return Response.status(Response.Status.FORBIDDEN).build();
         }
 
-        // return not-found for missing session
+        // return not-found for missing active session
         if (!scrumPokerSessionService.hasActiveSession(issueKey)) {
             return Response.status(Response.Status.NOT_FOUND).build();
         }
@@ -127,7 +127,7 @@ public Response revealCards(@PathParam("issueKey") String issueKey) {
             return Response.status(Response.Status.FORBIDDEN).build();
         }
 
-        // return not-found for missing session
+        // return not-found for missing active session
         if (!scrumPokerSessionService.hasActiveSession(issueKey)) {
             return Response.status(Response.Status.NOT_FOUND).build();
         }
@@ -168,7 +168,7 @@ public Response cancelSession(@PathParam("issueKey") String issueKey) {
             return Response.status(Response.Status.FORBIDDEN).build();
         }
 
-        // return not-found for missing session
+        // return not-found for missing active session
         if (!scrumPokerSessionService.hasActiveSession(issueKey)) {
             return Response.status(Response.Status.NOT_FOUND).build();
         }
@@ -188,8 +188,8 @@ public Response cancelSession(@PathParam("issueKey") String issueKey) {
      * Reset the Scrum Poker session.
      * <ul>
      *  <li>user is not allowed to see the issue -> FORBIDDEN</li>
-     *  <li>no active session exists -> NOT FOUND</li>
-     *  <li>session is not visible or has no votes -> FORBIDDEN</li>
+     *  <li>no session exists -> NOT FOUND</li>
+     *  <li>session is neither cancelled nor visible and has votes -> FORBIDDEN</li>
      * </ul>
      */
     @POST
@@ -201,13 +201,13 @@ public Response resetSession(@PathParam("issueKey") String issueKey) {
         }
 
         // return not-found for missing session
-        if (!scrumPokerSessionService.hasActiveSession(issueKey)) {
+        if (!scrumPokerSessionService.hasSession(issueKey)) {
             return Response.status(Response.Status.NOT_FOUND).build();
         }
 
         // return forbidden if session reset is not allowed
         ScrumPokerSession scrumPokerSession = scrumPokerSessionService.byIssueKey(issueKey, currentUser());
-        if (!(scrumPokerSession.isVisible() && scrumPokerSession.getVotes().length > 0)) {
+        if (!(scrumPokerSession.isCancelled() || scrumPokerSession.isVisible() && scrumPokerSession.getVotes().length > 0)) {
             return Response.status(Response.Status.FORBIDDEN).build();
         }
 
@@ -238,7 +238,7 @@ public Response confirmEstimation(@PathParam("issueKey") String issueKey,
             return Response.status(Response.Status.FORBIDDEN).build();
         }
 
-        // return not-found for missing session
+        // return not-found for missing active session
         if (!scrumPokerSessionService.hasActiveSession(issueKey)) {
             return Response.status(Response.Status.NOT_FOUND).build();
         }

src/main/java/de/codescape/jira/plugins/scrumpoker/service/ScrumPokerSessionService.java

@@ -85,8 +85,16 @@ public interface ScrumPokerSessionService {
      * Returns whether an active Scrum Poker session for this issue exists.
      *
      * @param issueKey key of the issue
-     * @return <code>true</code> if session exists, otherwise <code>false</code>
+     * @return <code>true</code> if active session exists, otherwise <code>false</code>
      */
     boolean hasActiveSession(String issueKey);
 
+    /**
+     * Returns whether a Scrum Poker sessions for this issue exists.
+     *
+     * @param issueKey key of the issue
+     * @return <code>true</code> if session exists, otherwise <code>false</code>
+     */
+    boolean hasSession(String issueKey);
+
 }

src/main/java/de/codescape/jira/plugins/scrumpoker/service/ScrumPokerSessionServiceImpl.java

@@ -147,6 +147,11 @@ public boolean hasActiveSession(String issueKey) {
             && !(scrumPokerSession.getUpdateDate().before(sessionTimeout()));
     }
 
+    @Override
+    public boolean hasSession(String issueKey) {
+        return findScrumPokerSession(issueKey) != null;
+    }
+
     private Date sessionTimeout() {
         long sessionTimeoutMillis = hoursToMillis(globalSettingsService.load().getSessionTimeout());
         return new Date(System.currentTimeMillis() - sessionTimeoutMillis);

src/test/java/de/codescape/jira/plugins/scrumpoker/rest/SessionResourceTest.java

@@ -152,7 +152,7 @@ public void revealingCardShouldRevealCardsForUnderlyingSession() {
         givenCurrentUserCanSeeIssue(ISSUE_KEY, true);
         givenCurrentSessionCreatedByUser(ISSUE_KEY, USER_KEY);
         givenCurrentSessionIsVisible(false);
-        when(scrumPokerSession.getVotes()).thenReturn(new ScrumPokerVote[]{Mockito.mock(ScrumPokerVote.class)});
+        givenCurrentSessionHasVote();
         when(globalSettingsService.load()).thenReturn(globalSettings);
         when(globalSettings.getAllowRevealDeck()).thenReturn(AllowRevealDeck.EVERYONE);
 
@@ -169,14 +169,13 @@ public void resettingSessionShouldResetTheUnderlyingSession() {
         givenCurrentUserCanSeeIssue(ISSUE_KEY, true);
         givenCurrentSessionCreatedByUser(ISSUE_KEY, USER_KEY);
         givenCurrentSessionIsVisible(true);
-        when(scrumPokerSession.getVotes()).thenReturn(new ScrumPokerVote[]{Mockito.mock(ScrumPokerVote.class)});
+        givenCurrentSessionHasVote();
 
         sessionResource.resetSession(ISSUE_KEY);
 
         verify(scrumPokerSessionService, times(1)).reset(ISSUE_KEY, USER_KEY);
     }
 
-
     /* tests for cancelSession */
 
     @Test
@@ -246,6 +245,7 @@ private void givenCurrentSessionCreatedByUser(String issueKey, String userKey) {
         when(sessionEntity.getIssueKey()).thenReturn(issueKey);
         when(scrumPokerSession.getCreatorUserKey()).thenReturn(userKey);
         when(scrumPokerSessionService.hasActiveSession(issueKey)).thenReturn(true);
+        when(scrumPokerSessionService.hasSession(issueKey)).thenReturn(true);
     }
 
     private void givenCurrentSessionIsVisible(boolean visible) {
@@ -261,4 +261,8 @@ private void givenCardsInCardSet(String... cardValues) {
             Arrays.stream(cardValues).map(val -> new Card(val, true)).toList());
     }
 
+    private void givenCurrentSessionHasVote() {
+        when(scrumPokerSession.getVotes()).thenReturn(new ScrumPokerVote[]{Mockito.mock(ScrumPokerVote.class)});
+    }
+
 }