Merge pull request kvnZero#15 from kvnZero/feat/测试中修改

kvnZero · web-flow · commit 8bffc24bc509 · 2021-11-16T17:55:37.000+08:00
fix 事件修改返回值没有替换原返回值 &amp;&amp; update 对查询后的数据手动递归json格式化(该方案不一定合理) &amp;&amp; 增加ID子查询测试用例
diff --git a/app/ApiJson/Method/GetMethod.php b/app/ApiJson/Method/GetMethod.php
@@ -46,6 +46,6 @@ protected function process()
         $event = new QueryExecuteAfter($this->query->toSql(), $this->method, $result);
         ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($event);
 
-        return $result ?: [];
+        return $event->result ?: [];
     }
 }
diff --git a/app/ApiJson/Method/HeadMethod.php b/app/ApiJson/Method/HeadMethod.php
@@ -33,7 +33,7 @@ protected function process()
         ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($event);
 
         return [
-            'count' => $count
+            'count' => $event->result
         ];
     }
 }
diff --git a/app/ApiJson/Method/PostMethod.php b/app/ApiJson/Method/PostMethod.php
@@ -33,6 +33,6 @@ protected function process()
         $event = new QueryExecuteAfter($this->query->toSql(), $this->method, $result);
         ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($event);
 
-        return $result;
+        return $event->result;
     }
 }
diff --git a/app/ApiJson/Method/PutMethod.php b/app/ApiJson/Method/PutMethod.php
@@ -49,6 +49,6 @@ protected function process()
         $event = new QueryExecuteAfter($this->query->toSql(), $this->method, $result);
         ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($event);
 
-        return $result;
+        return $event->result;
     }
 }
diff --git a/app/Listener/QueryResultTryToJsonListener.php b/app/Listener/QueryResultTryToJsonListener.php
@@ -0,0 +1,43 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Listener;
+
+use App\Event\ApiJson\QueryExecuteAfter;
+use Hyperf\Event\Annotation\Listener;
+use Hyperf\Event\Contract\ListenerInterface;
+
+/**
+ * @Listener
+ */
+class QueryResultTryToJsonListener implements ListenerInterface
+{
+    public function listen(): array
+    {
+        return [
+            QueryExecuteAfter::class,
+        ];
+    }
+
+    public function process(object $event)
+    {
+        if (!$event instanceof QueryExecuteAfter) return;
+        if ($event->method != 'GET') return;
+        $event->result = $this->toJson($event->result);
+    }
+
+    private function toJson(array $result): array
+    {
+        foreach ($result as $key => $value) {
+            if (is_array($value)) {
+                $result[$key] = $this->toJson($value);
+            }
+            if (!is_string($value)) continue;
+            $jsonData = json_decode($value, true);
+            if (is_array($jsonData)) {
+                $result[$key] = $jsonData;
+            }
+        }
+        return $result;
+    }
+}
diff --git a/test/Cases/GetTest.php b/test/Cases/GetTest.php
@@ -325,4 +325,46 @@ public function testWhereExistsUseSubQuery()
             ],
         ], $result);
     }
+
+    public function testWhereIdSubQuery()
+    {
+        $json = [
+            "User" => [
+                "id@" => [
+                    "from" =>"Comment",
+                    "Comment" => [
+                        "@column" =>"min(userId)"
+                    ]
+                ]
+            ]
+        ];
+        $parse = new Parse($json, $this->method, '');
+        $result = $parse->handle();
+
+        $this->assertSame([
+            "User" => [
+                "id" =>38710,
+                "sex" =>0,
+                "name" =>"TommyLemon",
+                "tag" =>"Android&Java",
+                "head" =>"http://static.oschina.net/uploads/user/1218/2437072_100.jpg?t=1461076033000",
+                "contactIdList" =>[
+                    82003,
+                    82005,
+                    90814,
+                    82004,
+                    82009,
+                    82002,
+                    82044,
+                    93793,
+                    70793
+                ],
+                "pictureList" =>[
+                    "http://static.oschina.net/uploads/user/1218/2437072_100.jpg?t=1461076033000",
+                    "http://common.cnblogs.com/images/icon_weibo_24.png"
+                ],
+                "date" =>"2017-02-01 11:21:50"
+            ]
+        ], $result);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ protected function process()`
`46`	`46`	`$event = new QueryExecuteAfter($this->query->toSql(), $this->method, $result);`
`47`	`47`	`ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($event);`
`48`	`48`
`49`		`- return $result ?: [];`
	`49`	`+ return $event->result ?: [];`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function process()`
`33`	`33`	`ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($event);`
`34`	`34`
`35`	`35`	`return [`
`36`		`- 'count' => $count`
	`36`	`+ 'count' => $event->result`
`37`	`37`	`];`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ protected function process()`
`33`	`33`	`$event = new QueryExecuteAfter($this->query->toSql(), $this->method, $result);`
`34`	`34`	`ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($event);`
`35`	`35`
`36`		`- return $result;`
	`36`	`+ return $event->result;`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@ protected function process()`
`49`	`49`	`$event = new QueryExecuteAfter($this->query->toSql(), $this->method, $result);`
`50`	`50`	`ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($event);`
`51`	`51`
`52`		`- return $result;`
	`52`	`+ return $event->result;`
`53`	`53`	`}`
`54`	`54`	`}`