add User数组查询引用子查询测试 && update 引用值替换 & 判断条件为null的判断过滤

kvnZero · kvnZero · commit c9370fd5f122 · 2021-11-16T15:50:53.000+08:00
diff --git a/app/ApiJson/Parse/Parse.php b/app/ApiJson/Parse/Parse.php
@@ -39,8 +39,12 @@ public function __construct(protected array $json, protected string $method = 'G
 
     public function handle(bool $isQueryMany = false, array $extendData = []): array
     {
+        if (empty($extendData)) {
+            $extendData = $this->json; //引入原json
+        }
         $result = [];
         foreach ($this->json as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）
+            if (is_null($condition)) continue;
             if (in_array($tableName, $this->filterKey())) {
                 $this->tagColumn[$tableName] = $condition;
                 continue;
@@ -93,6 +97,7 @@ protected function handleArray(array $jsonData, array $extendData = []): array
     {
         $result = [[]];
         foreach ($jsonData as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）
+            if (is_null($condition)) continue;
             if (!preg_match("/^[A-Z].+/", $tableName) || !is_array($condition)) {
                 continue; //不满足表名规范 跳出不往下执行
             }
diff --git a/app/ApiJson/Replace/QuoteReplace.php b/app/ApiJson/Replace/QuoteReplace.php
@@ -9,17 +9,24 @@ protected function process()
         $condition = $this->condition->getCondition();
 
         foreach (array_filter($condition, function($key){
-            return str_ends_with($key, '@') && !str_ends_with($key, '}{@') && !str_ends_with($key, '{}@');
+            return str_ends_with($key, '@');
         }, ARRAY_FILTER_USE_KEY) as $key => $value)
         {
             if (!is_string($value)) continue;
             $path = str_replace(['/', '[]'], ['.', 'currentItem'], $value);
             if (str_starts_with($path, '.')) {
                 $path = 'currentItem' . $path;
             }
-            $newKey = substr($key, 0, strlen($key) - 1);
-            $condition[$newKey] = data_get($this->condition->getExtendData(), $path);
-            unset($condition[$key]);
+            $value = data_get($this->condition->getExtendData(), $path);
+            if (!is_null($value)) { //常规情况下的引用
+                $newKey = substr($key, 0, strlen($key) - 1);
+                $condition[$newKey] = $value;
+                unset($condition[$key]);
+            } else { //非常规情况下引入 比如引入子查询等
+                $path .= '@';
+                $value = data_get($this->condition->getExtendData(), $path);
+                $condition[$key] = $value;
+            }
             $this->condition->setCondition($condition);
         }
     }
diff --git a/test/Cases/GetTest.php b/test/Cases/GetTest.php
@@ -178,4 +178,55 @@ public function testWhereIn()
         ], $result);
     }
 
+    public function testWhereInUseSubQuery()
+    {
+        $json = [
+            "subquery@" => [
+                "from" =>"Comment",
+                "Comment" => [
+                    "momentId" =>15,
+                    "@column" =>"userId"
+                ]
+            ],
+            "User[]" => [
+                "User" => [
+                    "id{}@" =>"subquery",
+                    "@column" =>"id,sex,name"
+                ]
+            ],
+            "[]" =>null
+        ];
+        $parse = new Parse($json, $this->method, '');
+        $result = $parse->handle();
+
+        $this->assertSame([
+            "User[]" =>[
+                [
+                    "id" =>38710,
+                    "sex" =>0,
+                    "name" =>"TommyLemon"
+                ],
+                [
+                    "id" =>82001,
+                    "sex" =>0,
+                    "name" =>"测试账号"
+                ],
+                [
+                    "id" =>82002,
+                    "sex" =>1,
+                    "name" =>"Happy~"
+                ],
+                [
+                    "id" =>82003,
+                    "sex" =>0,
+                    "name" =>"Wechat"
+                ],
+                [
+                    "id" =>82055,
+                    "sex" =>1,
+                    "name" =>"Solid"
+                ]
+            ]
+        ], $result);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,12 @@ public function __construct(protected array $json, protected string $method = 'G`
`39`	`39`
`40`	`40`	`public function handle(bool $isQueryMany = false, array $extendData = []): array`
`41`	`41`	`{`
	`42`	`+ if (empty($extendData)) {`
	`43`	`+ $extendData = $this->json; //引入原json`
	`44`	`+ }`
`42`	`45`	`$result = [];`
`43`	`46`	`foreach ($this->json as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）`
	`47`	`+ if (is_null($condition)) continue;`
`44`	`48`	`if (in_array($tableName, $this->filterKey())) {`
`45`	`49`	`$this->tagColumn[$tableName] = $condition;`
`46`	`50`	`continue;`
`@@ -93,6 +97,7 @@ protected function handleArray(array $jsonData, array $extendData = []): array`
`93`	`97`	`{`
`94`	`98`	`$result = [[]];`
`95`	`99`	`foreach ($jsonData as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）`
	`100`	`+ if (is_null($condition)) continue;`
`96`	`101`	`if (!preg_match("/^[A-Z].+/", $tableName) \|\| !is_array($condition)) {`
`97`	`102`	`continue; //不满足表名规范跳出不往下执行`
`98`	`103`	`}`