From a9745eeec002b0f93ff3d132ebe6e6cdf82d6e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lys=C3=BD?= <jan.lysy@automattic.com>
Date: Mon, 22 Mar 2021 15:23:54 +0100
Subject: [PATCH] Add sort versions from Jira by release date

[MAILPOET-3510]
---
 tasks/release/JiraController.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tasks/release/JiraController.php b/tasks/release/JiraController.php
index a7b2d0ef7a..67c4ea6bf1 100644
--- a/tasks/release/JiraController.php
+++ b/tasks/release/JiraController.php
@@ -47,7 +47,11 @@ class JiraController {
    * @see https://developer.atlassian.com/cloud/jira/platform/rest/v3/#api-api-3-project-projectIdOrKey-versions-get
    */
   public function getVersion($versionName = null) {
-    $response = $this->httpClient->get("project/$this->project/versions");
+    $response = $this->httpClient->get("project/$this->project/versions", [
+      'query' => [
+        'orderBy' => '-releaseDate',
+      ],
+    ]);
     $versions = json_decode($response->getBody()->getContents(), true);
     if ($versionName === null) {
       return end($versions);
@@ -64,7 +68,7 @@ class JiraController {
     $response = $this->httpClient->get("project/$this->project/version", [
       'query' => [
         'maxResults' => 1,
-        'orderBy' => '-sequence',
+        'orderBy' => '-releaseDate',
       ],
     ]);
     $version = json_decode($response->getBody()->getContents(), true);
@@ -79,7 +83,7 @@ class JiraController {
     $response = $this->httpClient->get("project/$project/version", [
       'query' => [
         'maxResults' => 1,
-        'orderBy' => '-sequence',
+        'orderBy' => '-releaseDate',
         'status' => 'released',
       ],
     ]);
@@ -95,7 +99,7 @@ class JiraController {
     $response = $this->httpClient->get("project/$project/version", [
       'query' => [
         'maxResults' => 1,
-        'orderBy' => '-sequence',
+        'orderBy' => '-releaseDate',
         'status' => 'unreleased',
       ],
     ]);