From a50140b8fad8918de3d953f2c82d470240119b08 Mon Sep 17 00:00:00 2001 From: Justin Sadakhom Date: Fri, 4 Apr 2025 09:35:02 -0400 Subject: [PATCH 1/3] Add login info --- build.gradle.kts | 2 +- src/main/graphql/zenhub/fragments/IssueFragment.graphql | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 961da57..152b299 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ -var currentVersion = "4.0.2" +var currentVersion = "4.1.0" if (project.hasProperty("snapshot")) { currentVersion = "${currentVersion}-SNAPSHOT" diff --git a/src/main/graphql/zenhub/fragments/IssueFragment.graphql b/src/main/graphql/zenhub/fragments/IssueFragment.graphql index 233630a..4ece6f2 100644 --- a/src/main/graphql/zenhub/fragments/IssueFragment.graphql +++ b/src/main/graphql/zenhub/fragments/IssueFragment.graphql @@ -2,6 +2,11 @@ fragment IssueFragment on Issue { id title number + assignees { + nodes { + login + } + } estimate { value } From 32b93d25216e55cf9d131a961db0177f7b091e76 Mon Sep 17 00:00:00 2001 From: Justin Sadakhom Date: Fri, 4 Apr 2025 10:56:45 -0400 Subject: [PATCH 2/3] Refactor code to use Sprint fragments --- src/main/graphql/zenhub/GetSprints.graphql | 11 +---------- src/main/graphql/zenhub/GetSprintsByState.graphql | 13 +------------ .../graphql/zenhub/fragments/SprintFragment.graphql | 12 ++++++++++++ 3 files changed, 14 insertions(+), 22 deletions(-) create mode 100644 src/main/graphql/zenhub/fragments/SprintFragment.graphql diff --git a/src/main/graphql/zenhub/GetSprints.graphql b/src/main/graphql/zenhub/GetSprints.graphql index b0c048f..723c8cc 100644 --- a/src/main/graphql/zenhub/GetSprints.graphql +++ b/src/main/graphql/zenhub/GetSprints.graphql @@ -6,16 +6,7 @@ query GetSprints($workspaceId: ID!, $sprintsEndCursor: String) { endCursor } nodes { - id - name - startAt - endAt - # No need to get all issues as we rarely exceed 50 issues in a sprint - issues(first: 100) { - nodes { - id - } - } + ...SprintFragment } } } diff --git a/src/main/graphql/zenhub/GetSprintsByState.graphql b/src/main/graphql/zenhub/GetSprintsByState.graphql index 3d3f6be..c96f12d 100644 --- a/src/main/graphql/zenhub/GetSprintsByState.graphql +++ b/src/main/graphql/zenhub/GetSprintsByState.graphql @@ -1,7 +1,5 @@ query GetSprintsByState($workspaceId: ID!, $sprintFilters: SprintFiltersInput!, $firstSprints: Int!, $orderSprintsBy: SprintOrderInput!, $endCursor: String) { workspace(id: $workspaceId) { - id - displayName sprints( first: $firstSprints filters: $sprintFilters @@ -13,16 +11,7 @@ query GetSprintsByState($workspaceId: ID!, $sprintFilters: SprintFiltersInput!, endCursor } nodes { - id - name - startAt - endAt - # No need to get all issues as we rarely exceed 50 issues in a sprint - issues(first: 100) { - nodes { - id - } - } + ...SprintFragment } } } diff --git a/src/main/graphql/zenhub/fragments/SprintFragment.graphql b/src/main/graphql/zenhub/fragments/SprintFragment.graphql new file mode 100644 index 0000000..8c1376e --- /dev/null +++ b/src/main/graphql/zenhub/fragments/SprintFragment.graphql @@ -0,0 +1,12 @@ +fragment SprintFragment on Sprint { + id + name + startAt + endAt + # No need to get all issues as we rarely exceed 50 issues in a sprint + issues(first: 100) { + nodes { + id + } + } +} From d444228b5497f44e873752929c61a7dc76bc16f4 Mon Sep 17 00:00:00 2001 From: Justin Sadakhom Date: Tue, 8 Apr 2025 10:02:12 -0400 Subject: [PATCH 3/3] Remove milestones --- src/main/graphql/zenhub/GetMilestone.graphql | 7 ------- .../zenhub/SetMilestoneStartDate.graphql | 8 -------- src/main/kotlin/zenhub/ZenHubClient.kt | 19 ------------------- 3 files changed, 34 deletions(-) delete mode 100644 src/main/graphql/zenhub/GetMilestone.graphql delete mode 100644 src/main/graphql/zenhub/SetMilestoneStartDate.graphql diff --git a/src/main/graphql/zenhub/GetMilestone.graphql b/src/main/graphql/zenhub/GetMilestone.graphql deleted file mode 100644 index 087454a..0000000 --- a/src/main/graphql/zenhub/GetMilestone.graphql +++ /dev/null @@ -1,7 +0,0 @@ -query GetMilestone($repositoryGhId: Int!, $milestoneNumber: Int!) { - milestoneByRepoGhIdAndNumber(milestoneNumber: $milestoneNumber, repositoryGhId: $repositoryGhId) { - id - number - startDate - } -} \ No newline at end of file diff --git a/src/main/graphql/zenhub/SetMilestoneStartDate.graphql b/src/main/graphql/zenhub/SetMilestoneStartDate.graphql deleted file mode 100644 index 8d8f57a..0000000 --- a/src/main/graphql/zenhub/SetMilestoneStartDate.graphql +++ /dev/null @@ -1,8 +0,0 @@ -mutation SetMilestoneStartDate($input: SetMilestoneStartDateInput!) { - setMilestoneStartDate(input: $input) { - clientMutationId - milestone { - id - } - } -} diff --git a/src/main/kotlin/zenhub/ZenHubClient.kt b/src/main/kotlin/zenhub/ZenHubClient.kt index d0ff2fc..ebcab6a 100644 --- a/src/main/kotlin/zenhub/ZenHubClient.kt +++ b/src/main/kotlin/zenhub/ZenHubClient.kt @@ -437,25 +437,6 @@ class ZenHubClient( apolloClient.query(query).toFlow().single().data?.workspace?.epics } - fun getMilestone( - githubRepoId: Int, - milestoneNumber: Int - ): GetMilestoneQuery.MilestoneByRepoGhIdAndNumber? = runBlocking { - val query = GetMilestoneQuery(githubRepoId, milestoneNumber) - apolloClient.query(query).toFlow().single().data?.milestoneByRepoGhIdAndNumber - } - - fun setMilestoneStartDate( - milestoneId: String, - startDate: Instant? - ): SetMilestoneStartDateMutation.Milestone? = runBlocking { - val input = - SetMilestoneStartDateInput( - Optional.absent(), milestoneId, Optional.present(startDate.toString())) - val mutation = SetMilestoneStartDateMutation(input) - apolloClient.mutation(mutation).toFlow().single().data?.setMilestoneStartDate?.milestone - } - fun getEpicsByIds(epicIds: List): List = runBlocking { val epics = mutableListOf() val numPages = epicIds.size / DEFAULT_PAGE_SIZE