use services for SdkJiraIssueTypeOperator

Author: HighKo

kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraIssueTypeOperator.kt

@@ -20,33 +20,39 @@
 package com.linkedplanet.kotlinjiraclient.sdk
 
 import arrow.core.Either
+import com.atlassian.jira.bc.project.ProjectService
 import com.atlassian.jira.component.ComponentAccessor
-import com.atlassian.jira.config.IssueTypeManager
+import com.atlassian.jira.config.IssueTypeService
 import com.atlassian.jira.issue.fields.screen.issuetype.IssueTypeScreenSchemeManager
 import com.atlassian.jira.issue.issuetype.IssueType
 import com.atlassian.jira.issue.operation.IssueOperations
 import com.linkedplanet.kotlinjiraclient.api.error.JiraClientError
 import com.linkedplanet.kotlinjiraclient.api.interfaces.JiraIssueTypeOperator
 import com.linkedplanet.kotlinjiraclient.api.model.JiraIssueType
 import com.linkedplanet.kotlinjiraclient.api.model.JiraIssueTypeAttribute
-import com.linkedplanet.kotlinjiraclient.sdk.util.catchJiraClientError
+import com.linkedplanet.kotlinjiraclient.sdk.util.eitherAndCatch
+import com.linkedplanet.kotlinjiraclient.sdk.util.toEither
 import javax.inject.Named
 
 @Named
 object SdkJiraIssueTypeOperator : JiraIssueTypeOperator {
 
-    private val projectManager by lazy { ComponentAccessor.getProjectManager() }
-    private val issueTypeManager by lazy { ComponentAccessor.getComponent(IssueTypeManager::class.java) }
-    private val issueTypeScreenSchemeManager by lazy { ComponentAccessor.getComponent(IssueTypeScreenSchemeManager::class.java) }
+    private val projectService = ComponentAccessor.getComponent(ProjectService::class.java)
+    private val issueTypeService = ComponentAccessor.getComponent(IssueTypeService::class.java)
+    private val issueTypeScreenSchemeManager = ComponentAccessor.getComponent(IssueTypeScreenSchemeManager::class.java)
+    private val jiraAuthenticationContext = ComponentAccessor.getJiraAuthenticationContext()
+
+    private fun user() = jiraAuthenticationContext.loggedInUser
 
     override suspend fun getAttributesOfIssueType(
         projectId: Number,
         issueTypeId: Number
     ): Either<JiraClientError, List<JiraIssueTypeAttribute>> =
-        Either.catchJiraClientError {
-            val issueType = issueTypeManager.getIssueType(issueTypeId.toString())
+        eitherAndCatch {
+            val issueType = issueTypeService.getIssueType(user(), issueTypeId.toString()).orNull
+                ?: return@getAttributesOfIssueType issueTypeNotFound(issueTypeId)
             val screenSchemes = issueTypeScreenSchemeManager.getIssueTypeScreenScheme(
-                projectManager.getProjectObj(projectId.toLong())
+                projectService.getProjectById(user(), projectId.toLong()).toEither().bind().project
             )
             val screenScheme = screenSchemes.getEffectiveFieldScreenScheme(issueType)
             val createScreen = screenScheme.getFieldScreen(IssueOperations.CREATE_ISSUE_OPERATION)
@@ -58,16 +64,22 @@ object SdkJiraIssueTypeOperator : JiraIssueTypeOperator {
             fields
         }
 
+    private fun <T> issueTypeNotFound(issueTypeId: Number): Either<JiraClientError, T> = Either.Left(
+        JiraClientError("IssueType not found", "No IssueType with id:$issueTypeId found.", statusCode = 404)
+    )
+
     override suspend fun getIssueType(issueTypeId: Number): Either<JiraClientError, JiraIssueType?> =
-        Either.catchJiraClientError {
-            issueTypeManager.getIssueType(issueTypeId.toString())?.let { it: IssueType ->
+        eitherAndCatch {
+            val issueType = issueTypeService.getIssueType(user(), issueTypeId.toString()).orNull
+                ?: return@getIssueType issueTypeNotFound(issueTypeId)
+            issueType.let { it: IssueType ->
                 JiraIssueType(it.id, it.name)
             }
         }
 
     override suspend fun getIssueTypes(projectId: Number): Either<JiraClientError, List<JiraIssueType>> =
-        Either.catchJiraClientError {
-            projectManager.getProjectObj(projectId.toLong())?.issueTypes
+        eitherAndCatch {
+            projectService.getProjectById(user(), projectId.toLong()).toEither().bind().project?.issueTypes
                 ?.map { it: IssueType ->
                     JiraIssueType(it.id, it.name)
                 } ?: emptyList()

kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraProjectOperator.kt

@@ -25,7 +25,6 @@ import com.atlassian.jira.component.ComponentAccessor
 import com.linkedplanet.kotlinjiraclient.api.error.JiraClientError
 import com.linkedplanet.kotlinjiraclient.api.interfaces.JiraProjectOperator
 import com.linkedplanet.kotlinjiraclient.api.model.JiraProject
-import com.linkedplanet.kotlinjiraclient.sdk.util.catchJiraClientError
 import com.linkedplanet.kotlinjiraclient.sdk.util.eitherAndCatch
 import com.linkedplanet.kotlinjiraclient.sdk.util.toEither
 

kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraTransitionOperator.kt

@@ -32,7 +32,7 @@ import com.linkedplanet.kotlinjiraclient.sdk.util.toEither
 
 object SdkJiraTransitionOperator : JiraTransitionOperator {
 
-    private val issueService by lazy { ComponentAccessor.getIssueService() }
+    private val issueService = ComponentAccessor.getIssueService()
     private val workflowManager by lazy { ComponentAccessor.getWorkflowManager() }
     private val transitionManager by lazy { ComponentAccessor.getComponent(TransitionManager::class.java) }
     private val jiraAuthenticationContext by lazy { ComponentAccessor.getJiraAuthenticationContext() }