简化API请求参数和响应结果的字段名称

SparkLee · Mar 1, 2023 · a7d7cdf · a7d7cdf
1 parent cb90b83
commit a7d7cdf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/app/Application/OrgMng/OrgService/CreateOrgRequest.php b/app/Application/OrgMng/OrgService/CreateOrgRequest.php
@@ -26,9 +26,9 @@ private function __construct()
     public static function fromRequest(Request $request): static
     {
         $dto = new static;
-        $dto->tenantId = $request->integer('tenantId');
-        $dto->superiorId = $request->integer('superiorId');
-        $dto->orgTypeCode = $request->str('orgTypeCode');
+        $dto->tenantId = $request->integer('tenant');
+        $dto->superiorId = $request->integer('superior');
+        $dto->orgTypeCode = $request->str('orgType');
         $dto->name = $request->str('name');
         return $dto;
     }

diff --git a/app/Application/OrgMng/OrgService/OrgResponse.php b/app/Application/OrgMng/OrgService/OrgResponse.php
@@ -25,9 +25,9 @@ public function toArray(): array
     {
         return [
             'id' => $this->id,
-            'tenantId' => $this->tenantId,
+            'tenant' => $this->tenantId,
             'name' => $this->name,
-            'orgTypeCode' => $this->orgTypeCode,
+            'orgType' => $this->orgTypeCode,
         ];
     }
 }
diff --git a/tests/Feature/Http/Controllers/Restful/OrgMng/OrgControllerTest.php b/tests/Feature/Http/Controllers/Restful/OrgMng/OrgControllerTest.php
@@ -22,18 +22,18 @@ public function test_should_add_org()
 
         // When
         $response = $this->post('/api/organizations', [
-            'tenantId' => $tenant->getId(),
+            'tenant' => $tenant->getId(),
             'name' => '上海金融开发中心',
-            'orgTypeCode' => 'DEVCENT',
+            'orgType' => 'DEVCENT',
         ]);
 
         // Then
         $response->assertStatus(200);
-        $response->assertJsonStructure(['id', 'tenantId']);
+        $response->assertJsonStructure(['id']);
         $response->assertJson([
-            'tenantId' => $tenant->getId(),
+            'tenant' => $tenant->getId(),
             'name' => '上海金融开发中心',
-            'orgTypeCode' => 'DEVCENT',
+            'orgType' => 'DEVCENT',
         ]);
     }