fallback comments

ccims · Oct 10, 2024 · f853997 · f853997
1 parent dffa657
commit f853997
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 21 deletions.
diff --git a/sync-github/src/main/kotlin/gropius/sync/github/GithubSync.kt b/sync-github/src/main/kotlin/gropius/sync/github/GithubSync.kt
@@ -4,7 +4,7 @@ import gropius.model.architecture.IMSProject
 import gropius.model.issue.Issue
 import gropius.model.issue.Label
 import gropius.model.issue.timeline.IssueComment
-import gropius.model.issue.timeline.TemplatedFieldChangedEvent
+import gropius.model.issue.timeline.TimelineItem
 import gropius.model.template.IMSTemplate
 import gropius.model.template.IssueState
 import gropius.model.user.User
@@ -177,6 +177,21 @@ final class GithubSync(
         return null
     }
 
+    override suspend fun syncFallbackComment(
+        imsProject: IMSProject, issueId: String, comment: String, original: TimelineItem?, users: List<User>
+    ): TimelineItemConversionInformation? {
+        val response = githubDataService.mutation(
+            imsProject, users, MutateCreateCommentMutation(issueId, comment), gropiusUserList(users)
+        ).second
+        val item = response.data?.addComment?.commentEdge?.node?.asIssueTimelineItems()
+        if (item != null) {
+            return TODOTimelineItemConversionInformation(imsProject.rawId!!, item.id)
+        }
+        logger.error("${response.data} ${response.errors}")
+        //TODO("ERROR HANDLING")
+        return null
+    }
+
     override suspend fun syncAddedLabel(
         imsProject: IMSProject, issueId: String, label: Label, users: List<User>
     ): TimelineItemConversionInformation? {
@@ -214,12 +229,6 @@ final class GithubSync(
         return null
     }
 
-    override suspend fun syncTemplatedField(
-        imsProject: IMSProject, issueId: String, fieldChangedEvent: TemplatedFieldChangedEvent, users: List<User>
-    ): TimelineItemConversionInformation? {
-        TODO("Remove this, as soon as the fallback is done in AbstractSync")
-    }
-
     override suspend fun syncStateChange(
         imsProject: IMSProject, issueId: String, newState: IssueState, users: List<User>
     ): TimelineItemConversionInformation? {

diff --git a/sync-jira/src/main/kotlin/gropius/sync/jira/JiraSync.kt b/sync-jira/src/main/kotlin/gropius/sync/jira/JiraSync.kt
@@ -5,6 +5,7 @@ import gropius.model.issue.Issue
 import gropius.model.issue.Label
 import gropius.model.issue.timeline.IssueComment
 import gropius.model.issue.timeline.TemplatedFieldChangedEvent
+import gropius.model.issue.timeline.TimelineItem
 import gropius.model.template.IMSTemplate
 import gropius.model.template.IssueState
 import gropius.model.user.User
@@ -328,6 +329,24 @@ final class JiraSync(
         return JiraTimelineItemConversionInformation(imsProject.rawId!!, iid)
     }
 
+    override suspend fun syncFallbackComment(
+        imsProject: IMSProject, issueId: String, comment: String, original: TimelineItem?, users: List<User>
+    ): TimelineItemConversionInformation? {
+        val response = jiraDataService.request(
+            imsProject,
+            users,
+            HttpMethod.Post,
+            gropiusUserList(users),
+            JsonObject(mapOf("body" to JsonPrimitive(comment)))
+        ) {
+            appendPathSegments("issue")
+            appendPathSegments(issueId)
+            appendPathSegments("comment")
+        }.second.body<JsonObject>()
+        val iid = response["id"]!!.jsonPrimitive.content
+        return JiraTimelineItemConversionInformation(imsProject.rawId!!, iid)
+    }
+
     override suspend fun syncTitleChange(
         imsProject: IMSProject, issueId: String, newTitle: String, users: List<User>
     ): TimelineItemConversionInformation? {

diff --git a/sync/src/main/kotlin/gropius/sync/AbstractSync.kt b/sync/src/main/kotlin/gropius/sync/AbstractSync.kt
@@ -122,8 +122,22 @@ abstract class AbstractSync(
      * @param users List of users involved in this timeline item, sorted with most relevant first
      * @return Conversion information
      */
-    abstract suspend fun syncComment(
+    open suspend fun syncComment(
         imsProject: IMSProject, issueId: String, issueComment: IssueComment, users: List<User>
+    ): TimelineItemConversionInformation? {
+        return syncFallbackComment(imsProject, issueId, issueComment.body, issueComment, users)
+    }
+
+    /**
+     * Incorporate a fallback comment
+     * @param imsProject IMS project to sync
+     * @param issueId GitHub ID of the issue
+     * @param issueComment Comment to sync
+     * @param users List of users involved in this timeline item, sorted with most relevant first
+     * @return Conversion information
+     */
+    abstract suspend fun syncFallbackComment(
+        imsProject: IMSProject, issueId: String, comment: String, original: TimelineItem?, users: List<User>
     ): TimelineItemConversionInformation?
 
     /**
@@ -134,9 +148,11 @@ abstract class AbstractSync(
      * @param users List of users involved in this timeline item, sorted with most relevant first
      * @return Conversion information
      */
-    abstract suspend fun syncTitleChange(
+    open suspend fun syncTitleChange(
         imsProject: IMSProject, issueId: String, newTitle: String, users: List<User>
-    ): TimelineItemConversionInformation?
+    ): TimelineItemConversionInformation? {
+        return syncFallbackComment(imsProject, issueId, "Gropius Title changed to $newTitle", null, users)
+    }
 
     /**
      * Incorporate a state change
@@ -158,9 +174,17 @@ abstract class AbstractSync(
      * @param users List of users involved in this timeline item, sorted with most relevant first
      * @return Conversion information
      */
-    abstract suspend fun syncTemplatedField(
+    open suspend fun syncTemplatedField(
         imsProject: IMSProject, issueId: String, fieldChangedEvent: TemplatedFieldChangedEvent, users: List<User>
-    ): TimelineItemConversionInformation?
+    ): TimelineItemConversionInformation? {
+        return syncFallbackComment(
+            imsProject,
+            issueId,
+            "Gropius Field ${fieldChangedEvent.fieldName} changed to ${fieldChangedEvent.newValue}",
+            fieldChangedEvent,
+            users
+        )
+    }
 
     /**
      * Incorporate an added label
@@ -170,9 +194,11 @@ abstract class AbstractSync(
      * @param users List of users involved in this timeline item, sorted with most relevant first
      * @return Conversion information
      */
-    abstract suspend fun syncAddedLabel(
+    open suspend fun syncAddedLabel(
         imsProject: IMSProject, issueId: String, label: Label, users: List<User>
-    ): TimelineItemConversionInformation?
+    ): TimelineItemConversionInformation? {
+        return syncFallbackComment(imsProject, issueId, "Gropius Label ${label.name} added", null, users)
+    }
 
     /**
      * Incorporate a removed label
@@ -182,9 +208,11 @@ abstract class AbstractSync(
      * @param users List of users involved in this timeline item, sorted with most relevant first
      * @return Conversion information
      */
-    abstract suspend fun syncRemovedLabel(
+    open suspend fun syncRemovedLabel(
         imsProject: IMSProject, issueId: String, label: Label, users: List<User>
-    ): TimelineItemConversionInformation?
+    ): TimelineItemConversionInformation? {
+        return syncFallbackComment(imsProject, issueId, "Gropius Label ${label.name} removed", null, users)
+    }
 
     /**
      * Create an issue on the IMS
@@ -779,7 +807,8 @@ abstract class AbstractSync(
                     imsProject, finalBlock, relevantTimeline, true, virtualIDs
                 )
             ) {
-                val conversionInformation = syncRemovedLabel(imsProject,
+                val conversionInformation = syncRemovedLabel(
+                    imsProject,
                     issueInfo.githubId,
                     label!!,
                     finalBlock.map { it.lastModifiedBy().value })
@@ -794,7 +823,8 @@ abstract class AbstractSync(
                     imsProject, finalBlock, relevantTimeline, false, virtualIDs
                 )
             ) {
-                val conversionInformation = syncAddedLabel(imsProject,
+                val conversionInformation = syncAddedLabel(
+                    imsProject,
                     issueInfo.githubId,
                     label!!,
                     finalBlock.map { it.lastModifiedBy().value })
@@ -853,7 +883,8 @@ abstract class AbstractSync(
                     imsProject.rawId!!, it.rawId!!
                 ) != null
             }) {
-            val conversionInformation = syncTitleChange(imsProject,
+            val conversionInformation = syncTitleChange(
+                imsProject,
                 issueInfo.githubId,
                 finalBlock.first().newTitle,
                 finalBlock.map { it.createdBy().value })
@@ -884,7 +915,8 @@ abstract class AbstractSync(
                     imsProject.rawId!!, it.rawId!!
                 ) != null
             }) {
-            val conversionInformation = syncTemplatedField(imsProject,
+            val conversionInformation = syncTemplatedField(
+                imsProject,
                 issueInfo.githubId,
                 finalBlock.first(),
                 finalBlock.map { it.createdBy().value })

diff --git a/sync/src/main/kotlin/gropius/sync/TokenManager.kt b/sync/src/main/kotlin/gropius/sync/TokenManager.kt
@@ -12,6 +12,7 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
+import kotlinx.coroutines.delay
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import org.slf4j.LoggerFactory
@@ -235,7 +236,10 @@ abstract class TokenManager<ResponseType : BaseResponseType>(
     ): Pair<IMSUser, T> {
         val users = user.map { getPossibleUsersForUser(imsProject.ims().value, it) }.flatten().distinct()
         logger.info("Expanding ${user.map { "${it::class.simpleName}:${it.rawId}(${it.username})" }} to ${users.map { "${it::class.simpleName}:${it.rawId}(${it.username})" }}")
-        return executeUntilWorking(imsProject, users, executor, owner)
+        return executeUntilWorking(imsProject, users, {
+            delay(1100)
+            executor(it)
+        }, owner)
     }
 
     /**