Unarchive then archive version

urielsalis · urielsalis · commit 77e4165ba98b · 2025-12-06T00:09:16.000+01:00
diff --git a/docs/ApiToken.md b/docs/ApiToken.md
@@ -9,6 +9,7 @@ Classic scopes:
 - `read:jira-work`
 - `write:jira-work`
 - `read:jira-user`
+- `manage:jira-project`
 
 ## Cloud ID
 
@@ -103,4 +104,9 @@ Scopes (classic): `read:jira-work`
 
 ### [POST /issue/{issueIdOrKey}/transitions](https://developer.atlassian.com/cloud/jira/platform/rest/v2/api-group-issues/#api-rest-api-2-issue-issueidorkey-transitions-post)
 
-Scopes (classic): `write:jira-work`
+Scopes (classic): `write:jira-work`
+
+
+### [PUT /version/{id}](https://developer.atlassian.com/cloud/jira/platform/rest/v2/api-group-project-versions/#api-rest-api-2-version-id-put)
+
+Scopes (classic): `manage:jira-project`
diff --git a/src/main/kotlin/io/github/mojira/arisa/apiclient/JiraClient.kt b/src/main/kotlin/io/github/mojira/arisa/apiclient/JiraClient.kt
@@ -16,6 +16,7 @@ import io.github.mojira.arisa.apiclient.models.Project
 import io.github.mojira.arisa.apiclient.models.SearchResults
 import io.github.mojira.arisa.apiclient.models.Transitions
 import io.github.mojira.arisa.apiclient.models.User
+import io.github.mojira.arisa.apiclient.models.Version
 import io.github.mojira.arisa.apiclient.models.Visibility
 import io.github.mojira.arisa.apiclient.requestModels.AddCommentBody
 import io.github.mojira.arisa.apiclient.requestModels.CreateIssueLinkBody
@@ -24,6 +25,7 @@ import io.github.mojira.arisa.apiclient.requestModels.JiraSearchRequest
 import io.github.mojira.arisa.apiclient.requestModels.TransitionIssueBody
 import io.github.mojira.arisa.apiclient.requestModels.UpdateCommentBody
 import io.github.mojira.arisa.apiclient.requestModels.UpdateCommentQueryParams
+import io.github.mojira.arisa.apiclient.requestModels.UpdateVersionBody
 import io.github.mojira.arisa.log
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -149,6 +151,12 @@ interface JiraApi {
         @Path("issueIdOrKey") issueIdOrKey: String,
         @Body body: TransitionIssueBody
     ): Call<Unit>
+
+    @PUT("version/{id}")
+    fun updateVersion(
+        @Path("id") versionId: String,
+        @Body body: UpdateVersionBody
+    ): Call<Version>
 }
 
 /**
@@ -335,4 +343,8 @@ class JiraClient(
     fun performTransition(issueIdOrKey: String, body: TransitionIssueBody) {
         jiraApi.performTransition(issueIdOrKey, body).executeOrThrow()
     }
+
+    fun updateVersion(versionId: String, body: UpdateVersionBody): Version {
+        return jiraApi.updateVersion(versionId, body).executeOrThrow()
+    }
 }
diff --git a/src/main/kotlin/io/github/mojira/arisa/domain/IssueUpdateContext.kt b/src/main/kotlin/io/github/mojira/arisa/domain/IssueUpdateContext.kt
@@ -19,5 +19,9 @@ data class IssueUpdateContext(
     var transitionName: String? = null,
     val otherOperations: MutableList<() -> Either<Throwable, Unit>> =
         emptyList<() -> Either<Throwable, Unit>>().toMutableList(),
+    val preOperations: MutableList<() -> Either<Throwable, Unit>> =
+        emptyList<() -> Either<Throwable, Unit>>().toMutableList(),
+    val postOperations: MutableList<() -> Either<Throwable, Unit>> =
+        emptyList<() -> Either<Throwable, Unit>>().toMutableList(),
     var triggeredBy: String? = null
 )
diff --git a/src/main/kotlin/io/github/mojira/arisa/domain/cloud/CloudIssue.kt b/src/main/kotlin/io/github/mojira/arisa/domain/cloud/CloudIssue.kt
@@ -52,6 +52,8 @@ data class CloudIssue(
 //    val updateLinked: (Double) -> Unit,
     val setPrivate: () -> Unit,
     val addAffectedVersionById: (id: String) -> Unit,
+    val unarchiveVersion: (id: String) -> Unit,
+    val archiveVersion: (id: String) -> Unit,
 //    val addAffectedVersion: (version: Version) -> Unit,
 //    val removeAffectedVersion: (version: Version) -> Unit,
 //    val createLink: (type: String, key: String, outwards: Boolean) -> Unit,
diff --git a/src/main/kotlin/io/github/mojira/arisa/infrastructure/jira/Functions.kt b/src/main/kotlin/io/github/mojira/arisa/infrastructure/jira/Functions.kt
@@ -14,6 +14,7 @@ import io.github.mojira.arisa.apiclient.models.Visibility
 import io.github.mojira.arisa.apiclient.requestModels.EditIssueBody
 import io.github.mojira.arisa.apiclient.requestModels.TransitionIssueBody
 import io.github.mojira.arisa.apiclient.requestModels.UpdateCommentBody
+import io.github.mojira.arisa.apiclient.requestModels.UpdateVersionBody
 import io.github.mojira.arisa.domain.IssueUpdateContext
 import io.github.mojira.arisa.infrastructure.CommentCache
 import io.github.mojira.arisa.jiraClient
@@ -185,7 +186,18 @@ fun updateDescription(context: Lazy<IssueUpdateContext>, description: String) {
 }
 
 fun applyIssueChanges(context: IssueUpdateContext): Either<FailedModuleResponse, ModuleResponse> {
-    val functions = context.otherOperations.toMutableList()
+    val functions = mutableListOf<() -> Either<Throwable, Unit>>()
+
+    // Build execution list in reverse order for transitions/updates/edits
+    // since they're added at index 0
+
+    // Step 6: Add postOperations last (will run after everything)
+    functions.addAll(context.postOperations)
+
+    // Step 5: Add otherOperations (will run after edits)
+    functions.addAll(0, context.otherOperations)
+
+    // Step 4: Add edits (will run after updates)
     if (context.hasEdits) {
         functions.add(
             0,
@@ -194,6 +206,8 @@ fun applyIssueChanges(context: IssueUpdateContext): Either<FailedModuleResponse,
                 .partially1(context.edit)
         )
     }
+
+    // Step 3: Add updates (will run after transitions)
     if (context.hasUpdates) {
         functions.add(
             0,
@@ -203,6 +217,8 @@ fun applyIssueChanges(context: IssueUpdateContext): Either<FailedModuleResponse,
                 .partially1("Update issue")
         )
     }
+
+    // Step 2: Add transitions (will run after preOperations)
     if (context.transitionName != null) {
         functions.add(
             0,
@@ -212,6 +228,10 @@ fun applyIssueChanges(context: IssueUpdateContext): Either<FailedModuleResponse,
                 .partially1(context.transitionName!!)
         )
     }
+
+    // Step 1: Add preOperations first (will run FIRST)
+    functions.addAll(0, context.preOperations)
+
     return tryRunAll(functions, context)
 }
 
@@ -438,6 +458,58 @@ fun deleteLink(context: Lazy<IssueUpdateContext>, link: MojiraIssueLink) {
     }
 }
 
+fun unarchiveVersion(context: Lazy<IssueUpdateContext>, versionId: String) {
+    context.value.preOperations.add {
+        runBlocking {
+            Either.catch {
+                withContext(Dispatchers.IO) {
+                    try {
+                        context.value.jiraClient.updateVersion(
+                            versionId,
+                            UpdateVersionBody(archived = false)
+                        )
+                    } catch (e: ClientErrorException) {
+                        if (e.code == HttpStatus.SC_NOT_FOUND ||
+                            e.code >= HttpStatus.SC_INTERNAL_SERVER_ERROR
+                        ) {
+                            log.warn("Failed to unarchive version $versionId")
+                        } else {
+                            throw e
+                        }
+                    }
+                }
+                Unit
+            }
+        }
+    }
+}
+
+fun archiveVersion(context: Lazy<IssueUpdateContext>, versionId: String) {
+    context.value.postOperations.add {
+        runBlocking {
+            Either.catch {
+                withContext(Dispatchers.IO) {
+                    try {
+                        context.value.jiraClient.updateVersion(
+                            versionId,
+                            UpdateVersionBody(archived = true)
+                        )
+                    } catch (e: ClientErrorException) {
+                        if (e.code == HttpStatus.SC_NOT_FOUND ||
+                            e.code >= HttpStatus.SC_INTERNAL_SERVER_ERROR
+                        ) {
+                            log.warn("Failed to archive version $versionId")
+                        } else {
+                            throw e
+                        }
+                    }
+                }
+                Unit
+            }
+        }
+    }
+}
+
 fun updateCommentBody(context: Lazy<IssueUpdateContext>, comment: MojiraComment, body: String) {
     context.value.otherOperations.add {
         runBlocking {
diff --git a/src/main/kotlin/io/github/mojira/arisa/infrastructure/jira/Mappers.kt b/src/main/kotlin/io/github/mojira/arisa/infrastructure/jira/Mappers.kt
@@ -135,6 +135,8 @@ fun MojiraIssue.toDomain(
         setPrivate = ::updateSecurity.partially1(context)
             .partially1(project.getSecurityLevelId(config)),
         ::addAffectedVersionById.partially1(context),
+        ::unarchiveVersion.partially1(context),
+        ::archiveVersion.partially1(context),
 //        { version -> addAffectedVersionById(context, version.id) },
 //        { version -> removeAffectedVersionById(context, version.id) },
 //        ::createLink.partially1(context).partially1(::getOtherUpdateContext.partially1(jiraClient)),
diff --git a/src/main/kotlin/io/github/mojira/arisa/modules/commands/AddVersionCommand.kt b/src/main/kotlin/io/github/mojira/arisa/modules/commands/AddVersionCommand.kt
@@ -7,11 +7,21 @@ class AddVersionCommand {
         if (issue.affectedVersions.any { it.name == version }) {
             throw CommandExceptions.VERSION_ALREADY_AFFECTED.create(version)
         }
-        if (issue.project.versions.none { it.name == version }) {
-            throw CommandExceptions.NO_SUCH_VERSION.create(version)
+        val projectVersion = issue.project.versions.firstOrNull { it.name == version }
+            ?: throw CommandExceptions.NO_SUCH_VERSION.create(version)
+
+        val id = projectVersion.id
+
+        // If version is archived, we need to unarchive it, add it, then re-archive
+        if (projectVersion.archived) {
+            issue.unarchiveVersion(id)
+            issue.addAffectedVersionById(id)
+            issue.archiveVersion(id)
+        } else {
+            // Normal case: just add the version
+            issue.addAffectedVersionById(id)
         }
-        val id = issue.project.versions.first { it.name == version }.id
-        issue.addAffectedVersionById(id)
+
         return 1
     }
 }
diff --git a/src/test/kotlin/io/github/mojira/arisa/utils/MockCloudDomain.kt b/src/test/kotlin/io/github/mojira/arisa/utils/MockCloudDomain.kt
@@ -39,6 +39,8 @@ fun mockCloudIssue(
     addRawRestrictedComment: (body: String, restriction: String) -> Unit = { _, _ -> },
     addRawBotComment: (rawMessage: String) -> Unit = { },
     addAffectedVersionById: (id: String) -> Unit = { },
+    unarchiveVersion: (id: String) -> Unit = { },
+    archiveVersion: (id: String) -> Unit = { },
     addAttachmentFromFile: (file: File, cleanupCallback: () -> Unit) -> Unit = { _, cleanupCallback -> cleanupCallback() }
 ) = CloudIssue(
     key = key,
@@ -63,6 +65,8 @@ fun mockCloudIssue(
     addRawRestrictedComment = addRawRestrictedComment,
     addRawBotComment = addRawBotComment,
     addAffectedVersionById = addAffectedVersionById,
+    unarchiveVersion = unarchiveVersion,
+    archiveVersion = archiveVersion,
     addAttachmentFromFile = addAttachmentFromFile
 )
 
