purge unneeded fields from ItemDetails return and fix an issue with d…

…iscussion_id only allowing numbers in PostList and hence not filtering reddit posts correctly
j0Shi82 · Oct 14, 2022 · a82bef5 · a82bef5
1 parent 242dbf1
commit a82bef5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/src/Controller/V1/Auctions/ItemDetails.php b/src/Controller/V1/Auctions/ItemDetails.php
@@ -1,8 +1,10 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace App\Controller\V1\Auctions;
 
-use \App\Controller\BaseController;
+use App\Controller\BaseController;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -41,12 +43,25 @@ public function get(Request $request, Response $response)
             ->withColumn("DATE_FORMAT(inserted, '%Y-%m-%d')", 'InsertedDate')
             ->withColumn('UNIX_TIMESTAMP(inserted)', 'InsertedTimestamp')
             ->withColumn("ROUND(AVG(Low))", 'AvgLow')
+            ->withColumn("ROUND(AVG(Mean))", 'AvgMean')
+            ->withColumn("ROUND(AVG(Median))", 'AvgMedian')
             ->withColumn("ROUND(AVG(Count))", 'AvgCount')
             ->orderBy('InsertedDate', 'asc')
             ->groupBy('InsertedDate')
-            ->find();
+            ->select('InsertedDate', 'InsertedTimestamp', 'AvgLow', 'AvgMean', 'AvgMedian', 'AvgCount')
+            ->find()
+            ->getData();
+
+        $result = array_map(function ($row) {
+            return array_merge($row, [
+                'AvgLow' => intval($row['AvgLow']),
+                'AvgMean' => intval($row['AvgMean']),
+                'AvgMedian' => intval($row['AvgMedian']),
+                'AvgCount' => intval($row['AvgCount']),
+            ]);
+        }, $result);
 
-        $response->getBody()->write(json_encode($result->toArray()));
+        $response->getBody()->write(json_encode($result));
         return $response
             ->withHeader('Content-Type', 'application/json')
             ->withHeader('charset', 'utf-8');

diff --git a/src/Controller/V1/Devtracker/Postlist.php b/src/Controller/V1/Devtracker/Postlist.php
@@ -1,8 +1,10 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace App\Controller\V1\Devtracker;
 
-use \App\Controller\BaseController;
+use App\Controller\BaseController;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -15,7 +17,7 @@ class Postlist extends BaseController
      * @var \JBBCode\Parser
      */
     private $jbb_parser;
-    
+
     /**
      * @param \App\Helpers\RequestHelper $requestHelper
      * @param \JBBCode\Parser $jbb_parser
@@ -28,7 +30,7 @@ public function __construct(\App\Helpers\RequestHelper $requestHelper, \JBBCode\
         $this->jbb_parser = $jbb_parser;
         $this->jbb_parser->addCodeDefinitionSet(new DefaultCodeDefinitionSet());
     }
-    
+
     /**
      * @param Request $request
      * @param Response $response
@@ -42,7 +44,7 @@ public function get(Request $request, Response $response)
         // define all possible GET data
         $data_ary = array(
             'dev' => $this->requestHelper->variable('dev', ''),
-            'discussion_id' => $this->requestHelper->variable('discussion_id', 0),
+            'discussion_id' => $this->requestHelper->variable('discussion_id', '0'),
             'search_term' => $this->requestHelper->variable('search_term', ''),
             'count' => $this->requestHelper->variable('count', 20),
             'page' => $this->requestHelper->variable('page', 1)