Add pullRequestUrl to RiScContentResultDTO (#138)

* Add pullRequestUrl to RiScContentResultDTO * make pull request url optional
kartverket · Jun 26, 2024 · b355125 · b355125
1 parent 670f618
commit b355125
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/kotlin/no/risc/github/GithubConnector.kt b/src/main/kotlin/no/risc/github/GithubConnector.kt
@@ -489,7 +489,7 @@ class GithubConnector(
             .map { RiScIdentifier(it.value.substringBefore(".$filenamePostfix"), RiScStatus.Published) }
 
     private fun List<GithubPullRequestObject>.riScIdentifiersSentForApproval(): List<RiScIdentifier> =
-        this.map { RiScIdentifier(it.head.ref.split("/").last(), RiScStatus.SentForApproval) }
+        this.map { RiScIdentifier(it.head.ref.split("/").last(), RiScStatus.SentForApproval, it.url) }
             .filter { it.id.startsWith("$filenamePrefix-") }
 
     private fun List<GithubReferenceObject>.riScIdentifiersDrafted(): List<RiScIdentifier> =

diff --git a/src/main/kotlin/no/risc/risc/RiScService.kt b/src/main/kotlin/no/risc/risc/RiScService.kt
@@ -39,6 +39,7 @@ data class RiScContentResultDTO(
     val status: ContentStatus,
     val riScStatus: RiScStatus?,
     val riScContent: String?,
+    val pullRequestUrl: String? = null,
 ) {
     companion object {
         val INVALID_ACCESS_TOKENS =
@@ -94,6 +95,7 @@ enum class ProcessingStatus(val message: String) {
 data class RiScIdentifier(
     val id: String,
     val status: RiScStatus,
+    val pullRequestUrl: String? = null,
 )
 
 enum class RiScStatus {
@@ -143,13 +145,14 @@ class RiScService(
                             RiScStatus.SentForApproval, RiScStatus.Draft -> githubConnector::fetchDraftedRiScContent
                         }
                         fetchRisc(owner, repository, id.id, accessTokens.githubAccessToken.value)
-                            .responseToRiScResult(id.id, id.status, accessTokens.gcpAccessToken)
+                            .responseToRiScResult(id.id, id.status, accessTokens.gcpAccessToken, id.pullRequestUrl)
                     } catch (e: Exception) {
                         RiScContentResultDTO(
                             riScId = id.id,
                             status = ContentStatus.Failure,
                             riScStatus = id.status,
-                            riScContent = null
+                            riScContent = null,
+                            pullRequestUrl = null,
                         )
                     }
                 }
@@ -163,11 +166,12 @@ class RiScService(
         riScId: String,
         riScStatus: RiScStatus,
         gcpAccessToken: GCPAccessToken,
+        pullRequestUrl: String?,
     ): RiScContentResultDTO =
         when (status) {
             GithubStatus.Success ->
                 try {
-                    RiScContentResultDTO(riScId, ContentStatus.Success, riScStatus, decryptContent(gcpAccessToken))
+                    RiScContentResultDTO(riScId, ContentStatus.Success, riScStatus, decryptContent(gcpAccessToken), pullRequestUrl)
                 } catch (e: Exception) {
                     when (e) {
                         is SOPSDecryptionException ->