wip

thanhtran468 · Jun 29, 2024 · 4ea36d3 · 4ea36d3
1 parent 0ce0755
commit 4ea36d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/Api/AbstractApi.php b/src/Api/AbstractApi.php
@@ -34,17 +34,14 @@ protected function post(string $uri, array $data = []): array
             $uri,
             [],
             $this->configureFieldBuilder(
-                FieldBuilder::with($data)
+                FieldBuilder::from($data)
             )->encrypt()
         );
 
         return Json::decode((string) $response->getBody(), true);
     }
 
-    protected function configureFieldBuilder(FieldBuilder $builder): FieldBuilder
-    {
-        return $builder->withRequiredFields();
-    }
+    abstract protected function configureFieldBuilder(FieldBuilder $builder): FieldBuilder;
 
     public function getObjectMapper(): ObjectMapper
     {

diff --git a/src/Api/Auth.php b/src/Api/Auth.php
@@ -14,4 +14,9 @@ public function login(
 
         return new Session($result['sessionId'], $this->client);
     }
+
+    protected function configureFieldBuilder(FieldBuilder $builder): FieldBuilder
+    {
+        return $builder;
+    }
 }
diff --git a/src/Api/FieldBuilder.php b/src/Api/FieldBuilder.php
@@ -22,17 +22,12 @@ private function __construct(array $data)
     /**
      * @param string[] $data
      */
-    public static function with(array $data): static
+    public static function from(array $data): static
     {
-        return new static($data);
-    }
-
-    public function withRequiredFields(): self
-    {
-        $this['lang'] = 'en';
-        $this['requestId'] = Random::generate(12, '0-9A-Z').'|'.time();
+        $data['lang'] = 'en';
+        $data['requestId'] = Random::generate(12, '0-9A-Z').'|'.time();
 
-        return $this;
+        return new static($data);
     }
 
     public function build(): self