From 8587bc1d879c8066a80581e7e9f05940231be048 Mon Sep 17 00:00:00 2001 From: xiphon Date: Thu, 14 Mar 2019 23:55:04 +0000 Subject: [PATCH] sort proposals by date --- app/Console/Commands/UpdateSiteProposals.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/UpdateSiteProposals.php b/app/Console/Commands/UpdateSiteProposals.php index 558a047..be9f1ec 100644 --- a/app/Console/Commands/UpdateSiteProposals.php +++ b/app/Console/Commands/UpdateSiteProposals.php @@ -55,6 +55,14 @@ class UpdateSiteProposals extends Command \Storage::put('complete.json', $json); } + private function sortProposalsByDateDesc($responseProposals) + { + usort($responseProposals, function($a, $b){ + return strtotime($a->date) < strtotime($b->date) ? 1 : -1; + }); + return $responseProposals; + } + private function ideaProposals() { $group = new stdClass(); @@ -78,7 +86,7 @@ class UpdateSiteProposals extends Command if (basename($filename) != $filename) { $this->error("Skipping MR #$mergeRequest->id '$mergeRequest->title': $filename must be in the root folder"); continue; - } + } if (in_array($filename, $ideas)) { $this->error("Skipping MR #$mergeRequest->id '$mergeRequest->title': duplicated $filename, another MR #$ideas[$filename]->id"); continue; @@ -98,7 +106,7 @@ class UpdateSiteProposals extends Command $responseProposals[] = $prop; } - $group->proposals = $responseProposals; + $group->proposals = $this->sortProposalsByDateDesc($responseProposals); return $group; } @@ -131,7 +139,7 @@ class UpdateSiteProposals extends Command foreach ($proposals as $proposal) { $responseProposals[] = $this->formatProposal($proposal); } - $group->proposals = $responseProposals; + $group->proposals = $this->sortProposalsByDateDesc($responseProposals); return $group; } } -- GitLab