From 17133c4326e8644bcbebcc4df5613ec080382322 Mon Sep 17 00:00:00 2001 From: Giuliano Paschoalino Date: Wed, 21 Jan 2026 15:23:25 -0300 Subject: [PATCH] Refactor groupBy and orderBy clauses in getGrossAnnualEconomy method for improved query logic --- app/Repositories/Economy/EconomyRepository.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Repositories/Economy/EconomyRepository.php b/app/Repositories/Economy/EconomyRepository.php index 982bd22..65c1a1a 100644 --- a/app/Repositories/Economy/EconomyRepository.php +++ b/app/Repositories/Economy/EconomyRepository.php @@ -123,9 +123,9 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt "CAST(TO_CHAR(TO_DATE(economia.mes, 'YYMM'), 'YYYY') AS INTEGER) <= COALESCE((" . $lastConsolidatedYearQuery->toSql() . "), CAST(TO_CHAR(CURRENT_DATE - INTERVAL '1 year', 'YYYY') AS INTEGER)) + 6", $lastConsolidatedYearQuery->getBindings() ) - ->groupBy(['mes', 'ano', 'dad_estimado']) + ->groupBy(['mes', 'ano', DB::raw("CASE WHEN extract(month from TO_DATE(economia.mes, 'YYMM')) = 12 THEN economia.dad_estimado ELSE true END")]) ->havingRaw("sum(custo_livre) > 0") - ->orderBy(DB::raw("mes, ano, dad_estimado")) + ->orderBy(DB::raw("ano, dad_estimado")) ->get(); }