Jira data center

jira/src/main/kotlin/gropius/sync/jira/JiraDataService.kt

@@ -152,8 +152,10 @@ class JiraDataService(
      * @return the IMSUser for the Jira user
      */
     suspend fun mapUser(imsProject: IMSProject, user: JsonElement): User {
-        val encodedAccountId =
-            jsonNodeMapper.jsonNodeToDeterministicString(objectMapper.valueToTree<JsonNode>(user.jsonObject["accountId"]!!.jsonPrimitive.content))
+        val encodedAccountId = if (user.jsonObject["accountId"] != null) jsonNodeMapper.jsonNodeToDeterministicString(
+            objectMapper.valueToTree<JsonNode>(user.jsonObject["accountId"]!!.jsonPrimitive.content)
+        )
+        else jsonNodeMapper.jsonNodeToDeterministicString(objectMapper.valueToTree<JsonNode>(user.jsonObject["key"]!!.jsonPrimitive.content))
         val foundImsUser =
             imsProject.ims().value.users().firstOrNull { it.templatedFields["jira_id"] == encodedAccountId }
         if (foundImsUser != null) {
@@ -221,7 +223,36 @@ class JiraDataService(
         val cloudId =
             token.cloudIds?.filter { URI(it.url + "/rest/api/2") == URI(imsConfig.rootUrl.toString()) }?.map { it.id }
                 ?.firstOrNull()
-        if (cloudId != null) {
+        if (token.type == "PAT") {
+            try {
+                val res = client.request(imsConfig.rootUrl.toString()) {
+                    method = requestMethod
+                    url {
+                        appendPathSegments("/rest/api/2/")
+                        urlBuilder(this)
+                    }
+                    headers {
+                        append(
+                            HttpHeaders.Authorization, "Bearer ${token.token}"
+                        )
+                    }
+                    if (body != null) {
+                        contentType(ContentType.parse(JSON_CHARSET_MIME_TYPE))
+                        setBody(body)
+                    }
+                }
+                logger.info("Response Code for request with token token is ${res.status}(${res.status.isSuccess()}): $body is ${res.bodyAsText()}")
+                return if (res.status.isSuccess()) {
+                    logger.trace("Response for {} {}", res.request.url, res.bodyAsText())
+                    Optional.of(res)
+                } else {
+                    Optional.empty()
+                }
+            } catch (e: ClientRequestException) {
+                e.printStackTrace()
+                return Optional.empty()
+            }
+        } else if (cloudId != null) {
             try {
                 val res = client.request("https://api.atlassian.com/ex/jira/") {
                     method = requestMethod

jira/src/main/kotlin/gropius/sync/jira/JiraTokenManager.kt

@@ -18,10 +18,15 @@ data class JiraCloudId(val id: String, val url: String, val name: String, val sc
  * Response of the getIMSToken login endpoint
  * @param token Token if available
  * @param isImsUserKnown True if the user exists and just has no token
+ * @param cloudIds List of cloud ids
+ * @param type Type of the token
  */
 @Serializable
 data class JiraTokenResponse(
-    override val token: String?, override val isImsUserKnown: Boolean, val cloudIds: List<JiraCloudId>? = null
+    override val token: String?,
+    override val isImsUserKnown: Boolean,
+    val cloudIds: List<JiraCloudId>? = null,
+    val type: String? = null
 ) : BaseResponseType
 
 @Component
@@ -30,6 +35,6 @@ class JiraTokenManager(
     neoOperations: ReactiveNeo4jOperations, syncConfigurationProperties: SyncConfigurationProperties
 ) : TokenManager<JiraTokenResponse>(neoOperations, syncConfigurationProperties) {
     override suspend fun parseHttpBody(response: HttpResponse): JiraTokenResponse? {
-        return response.body()
+        return response.body<JiraTokenResponse>()
     }
 }

jira/src/main/kotlin/gropius/sync/jira/model/IssueData.kt

@@ -62,13 +62,14 @@ class JiraTimelineItem(val id: String, val created: String, val author: JsonObje
         issue: Issue
     ): Pair<List<TimelineItem>, TimelineItemConversionInformation> {
         val jiraService = (service as JiraDataService)
-        if (data.fieldId == "summary") {
+        val fieldId = data.fieldId ?: data.field
+        if (fieldId == "summary") {
             return gropiusSummary(timelineItemConversionInformation, imsProject, service, jiraService)
-        } else if (data.fieldId == "resolution") {
+        } else if (fieldId == "resolution") {
             return gropiusState(
                 timelineItemConversionInformation, imsProject, service, jiraService
             )
-        } else if (data.fieldId == "labels") {
+        } else if (fieldId == "labels") {
             return gropiusLabels(
                 timelineItemConversionInformation, imsProject, service, jiraService
             )
@@ -360,8 +361,7 @@ data class IssueData(
     }
 
     override suspend fun fillImsIssueTemplatedFields(
-        templatedFields: MutableMap<String, String>,
-        service: SyncDataService
+        templatedFields: MutableMap<String, String>, service: SyncDataService
     ) {
     }
 

jira/src/main/kotlin/gropius/sync/jira/model/ProjectQuery.kt

@@ -133,7 +133,7 @@ data class JiraComment(
     val updateAuthor: JsonObject,
     val created: String,
     val updated: String,
-    val jsdPublic: Boolean
+    val jsdPublic: Boolean? = null
 ) {}
 
 /**

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.serialization.Serializable
 import kotlinx.serialization.json.Json
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Qualifier
@@ -34,6 +35,7 @@ interface BaseResponseType {
     val isImsUserKnown: Boolean
 }
 
+@Serializable
 data class LinkImsUserQuery(val imsUserIds: List<String>)
 
 /**
@@ -203,7 +205,8 @@ abstract class TokenManager<ResponseType : BaseResponseType>(
                 } else {
                     logger.trace("User ${user.rawId} had no token")
                 }
-            }
+            } else
+                logger.trace("User $user does not allow sync from $owner")
         }
         TODO("Error Message for no working users")
     }
@@ -234,7 +237,7 @@ abstract class TokenManager<ResponseType : BaseResponseType>(
      * @param user The user AFTER BEING SAVED TO DB (valid, non-null rawId)
      */
     suspend fun advertiseIMSUser(user: IMSUser) {
-        client.post(syncConfigurationProperties.loginServiceBase.toString()) {
+        client.put(syncConfigurationProperties.loginServiceBase.toString()) {
             url {
                 appendPathSegments("auth", "api", "sync", "link-ims-users")
             }