From 15727b976901596d9d4513172c6e50d9049b6d0e Mon Sep 17 00:00:00 2001
From: Djonathan <djonathanassis@gmail.com>
Date: Tue, 21 Jun 2022 17:23:05 -0300
Subject: [PATCH] Consumption table api feedback fix.

---
 .../Economy/EconomyRepository.php             | 11 ++++++--
 app/Repositories/Pld/PldRepository.php        | 27 ++++++++++---------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/Repositories/Economy/EconomyRepository.php b/app/Repositories/Economy/EconomyRepository.php
index 7bc73c3..54fb433 100644
--- a/app/Repositories/Economy/EconomyRepository.php
+++ b/app/Repositories/Economy/EconomyRepository.php
@@ -117,8 +117,9 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
 
         $date_stat = current($val);
         $date_end = end($val);
+
         $start_date = date_create("{$date_stat[0]}-01-01");
-        $end_date = date_create("{$date_end[0]}-03-30"); // If you want to include this date, add 1 day
+        $end_date = date_create("{$date_end[0]}-03-30");// If you want to include this date, add 1 day
 
         $interval = DateInterval::createFromDateString('1 months');
         $daterange = new DatePeriod($start_date, $interval, $end_date);
@@ -133,11 +134,17 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
         $i = 0;
         foreach ($date as $dt) {
             if (empty($arr[$i])) {
+                $arr[] = [];
+            }
+
+            if (in_array($dt, $arr[$i])){
                 $arr[] = ['mes' => $dt];
             }
+
             $i++;
         }
-        sort($arr);
+
+        dd($arr);
 
         return $arr;
 
diff --git a/app/Repositories/Pld/PldRepository.php b/app/Repositories/Pld/PldRepository.php
index 9de10b7..ecfe6c0 100644
--- a/app/Repositories/Pld/PldRepository.php
+++ b/app/Repositories/Pld/PldRepository.php
@@ -61,7 +61,7 @@ class PldRepository extends AbstractRepository implements PldContractInterface
             DB::raw('pld_sudeste.value as sudeste'),
         ];
 
-        $data = [];
+        $result = [];
         $sql = DB::table('pld')
             ->select([
                 'submercado as submarket',
@@ -72,7 +72,7 @@ class PldRepository extends AbstractRepository implements PldContractInterface
             ->groupBy('submarket', 'year_month');
 
         $query = DB::table('pld')->fromSub($sql, 'norte');
-        $data[] = static::responsePld($query, $sql, 'norte');
+        $result[] = static::responsePld($query, $sql, 'norte');
 
         $sql2 = DB::table('pld')
             ->select([
@@ -84,7 +84,7 @@ class PldRepository extends AbstractRepository implements PldContractInterface
             ->groupBy('submarket', 'year_month');
 
         $query = DB::table('pld')->fromSub($sql2, 'sul');
-        $data[] = static::responsePld($query, $sql2, 'sul');
+        $result[] = static::responsePld($query, $sql2, 'sul');
 
 
         $sql3 = DB::table('pld')
@@ -97,7 +97,7 @@ class PldRepository extends AbstractRepository implements PldContractInterface
             ->groupBy('submarket', 'year_month');
 
         $query = DB::table('pld')->fromSub($sql3, 'nordeste');
-        $data[] = static::responsePld($query, $sql3, 'nordeste');
+        $result[] = static::responsePld($query, $sql3, 'nordeste');
 
         $sql4 = DB::table('pld')
             ->select([
@@ -109,10 +109,10 @@ class PldRepository extends AbstractRepository implements PldContractInterface
             ->groupBy('submarket', 'year_month');
 
         $query = DB::table('pld')->fromSub($sql4, 'sudeste');
-        $data[] = static::responsePld($query, $sql4, 'sudeste');
+        $result[] = static::responsePld($query, $sql4, 'sudeste');
 
 
-        $result = $this->model->select($fields)->joinSub($sql, 'pld_norte', function ($join) {
+        $data = $this->model->select($fields)->joinSub($sql, 'pld_norte', function ($join) {
             $join->on('pld.mes_ref', '=', 'pld_norte.year_month');
         })->joinSub($sql2, 'pld_sul', function ($join) {
             $join->on('pld.mes_ref', '=', 'pld_sul.year_month');
@@ -122,7 +122,10 @@ class PldRepository extends AbstractRepository implements PldContractInterface
             $join->on('pld.mes_ref', '=', 'pld_sudeste.year_month');
         })->distinct()->get();
 
-        return collect($result)->push(['result' => $data])->all();
+        return [
+            'data' => $data,
+            'result' => $result
+        ];
     }
 
     /**
@@ -185,12 +188,10 @@ class PldRepository extends AbstractRepository implements PldContractInterface
 
     protected static function responsePld($query, $sql, $name)
     {
-        return [$name =>
-            [
-                'max' => $query->max('value'),
-                'min' => $query->min('value'),
-                'desv_pad' => static::standardDeviation($sql->get()->toArray()),
-            ]
+        return [
+            "{$name}_max" => $query->max('value'),
+            "{$name}_min" => $query->min('value'),
+            "{$name}desv_pad" => static::standardDeviation($sql->get()->toArray()),
         ];
 
     }