fix: revert idea to unify feature types

Unleash · Jul 26, 2023 · e0f8cb7 · e0f8cb7
1 parent 401d1f6
commit e0f8cb7
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 30 deletions.
diff --git a/src/DTO/DefaultFeature.php b/src/DTO/DefaultFeature.php
@@ -5,8 +5,8 @@
 final class DefaultFeature implements Feature
 {
     /**
-     * @param iterable<Strategy>     $strategies
-     * @param array<InternalVariant> $variants
+     * @param iterable<Strategy> $strategies
+     * @param array<Variant>     $variants
      */
     public function __construct(
         private readonly string $name,
@@ -36,7 +36,7 @@ public function getStrategies(): iterable
     }
 
     /**
-     * @return array<InternalVariant>
+     * @return array<Variant>
      */
     public function getVariants(): array
     {

diff --git a/src/DTO/DefaultProxyFeature.php b/src/DTO/DefaultProxyFeature.php
@@ -2,15 +2,15 @@
 
 namespace Unleash\Client\DTO;
 
-final class DefaultProxyFeature implements Feature
+final class DefaultProxyFeature implements ProxyFeature
 {
     public string $name;
 
     public bool $enabled;
 
     public ResolvedVariant $variant;
 
-    public bool $impressionData;
+    public bool $impression_data;
 
     /**
      * @param array{
@@ -24,7 +24,7 @@ final class DefaultProxyFeature implements Feature
      *             value: string
      *         }
      *     },
-     *     impressionData: bool
+     *     impression_data: bool
      * } $response
      */
     public function __construct(array $response)
@@ -40,7 +40,7 @@ public function __construct(array $response)
 
         $this->name = $response['name'];
         $this->enabled = $response['enabled'];
-        $this->impressionData = $response['impression_data'];
+        $this->impression_data = $response['impression_data'];
 
         $payload = null;
 
@@ -61,24 +61,13 @@ public function isEnabled(): bool
         return $this->enabled;
     }
 
-    /**
-     * @return array<Variant>
-     */
-    public function getVariants(): array
+    public function getVariant(): ResolvedVariant
     {
-        return [$this->variant];
+        return $this->variant;
     }
 
     public function hasImpressionData(): bool
     {
-        return $this->impressionData;
-    }
-
-    /**
-     * @return iterable<Strategy>
-     */
-    public function getStrategies(): iterable
-    {
-        return [];
+        return $this->impression_data;
     }
 }
diff --git a/src/DTO/ProxyFeature.php b/src/DTO/ProxyFeature.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Unleash\Client\DTO;
+
+interface ProxyFeature
+{
+    public function getName(): string;
+
+    public function isEnabled(): bool;
+
+    public function getVariant(): ResolvedVariant;
+
+    public function hasImpressionData(): bool;
+}
diff --git a/src/DefaultProxyUnleash.php b/src/DefaultProxyUnleash.php
@@ -7,6 +7,7 @@
 use Unleash\Client\DTO\DefaultResolvedVariant;
 use Unleash\Client\DTO\DefaultVariant;
 use Unleash\Client\DTO\ResolvedVariant;
+use Unleash\Client\Enum\Stickiness;
 use Unleash\Client\Metrics\MetricsHandler;
 use Unleash\Client\Repository\ProxyRepository;
 
@@ -39,9 +40,9 @@ public function getVariant(string $featureName, ?Context $context = null, ?Resol
         $response = $this->repository->findFeatureByContext($featureName, $context);
 
         if ($response !== null) {
-            $variant = $response->getVariants()[0];
+            $variant = $response->getVariant();
         }
-        $metricVariant = new DefaultVariant($variant->getName(), $variant->isEnabled(), 0, null, $variant->getPayload());
+        $metricVariant = new DefaultVariant($variant->getName(), $variant->isEnabled(), 0, Stickiness::DEFAULT, $variant->getPayload());
         $this->metricsHandler->handleMetrics(new DefaultFeature($featureName, $variant->isEnabled(), []), $variant->isEnabled(), $metricVariant);
 
         return $variant;

diff --git a/src/Repository/DefaultUnleashProxyRepository.php b/src/Repository/DefaultUnleashProxyRepository.php
@@ -7,11 +7,13 @@
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\SimpleCache\InvalidArgumentException;
+use Symfony\Component\VarExporter\Exception\LogicException;
 use Unleash\Client\Configuration\Context;
 use Unleash\Client\Configuration\UnleashConfiguration;
 use Unleash\Client\Configuration\UnleashContext;
 use Unleash\Client\DTO\DefaultProxyFeature;
 use Unleash\Client\DTO\Feature;
+use Unleash\Client\DTO\ProxyFeature;
 
 final class DefaultUnleashProxyRepository implements UnleashRepository, ProxyRepository
 {
@@ -40,7 +42,7 @@ public function getFeatures(): iterable
         return $this->baseRepo->getFeatures();
     }
 
-    public function findFeatureByContext(string $featureName, ?Context $context = null): ?Feature
+    public function findFeatureByContext(string $featureName, ?Context $context = null): ?ProxyFeature
     {
         $cacheKey = $this->getCacheKey($featureName, $context);
 
@@ -66,7 +68,12 @@ public function findFeatureByContext(string $featureName, ?Context $context = nu
             $request = $request->withHeader($name, $value);
         }
 
-        $request = $request->withHeader('Authorization', $this->configuration->getProxyKey());
+        $apiKey = $this->configuration->getProxyKey();
+        if($apiKey === null) {
+            throw new LogicException('No api proxy key was specified');
+        }
+
+        $request = $request->withHeader('Authorization', $apiKey);
 
         $response = $this->httpClient->sendRequest($request);
         $body = json_decode($response->getBody(), true);

diff --git a/src/Repository/ProxyRepository.php b/src/Repository/ProxyRepository.php
@@ -3,9 +3,9 @@
 namespace Unleash\Client\Repository;
 
 use Unleash\Client\Configuration\Context;
-use Unleash\Client\DTO\Feature;
+use Unleash\Client\DTO\ProxyFeature;
 
 interface ProxyRepository
 {
-    public function findFeatureByContext(string $featureName, ?Context $context = null): ?Feature;
+    public function findFeatureByContext(string $featureName, ?Context $context = null): ?ProxyFeature;
 }
diff --git a/tests/DTO/DefaultProxyFeatureTest.php b/tests/DTO/DefaultProxyFeatureTest.php
@@ -14,18 +14,18 @@ public function testGetProperties()
         self::assertIsString($instance->getName());
         self::assertIsBool($instance->isEnabled());
         self::assertIsBool($instance->hasImpressionData());
-        self::assertInstanceOf(DefaultResolvedVariant::class, $instance->getVariants()[0]);
+        self::assertInstanceOf(DefaultResolvedVariant::class, $instance->getVariant());
 
         self::assertEquals('test', $instance->getName());
         self::assertTrue($instance->isEnabled());
         self::assertTrue($instance->hasImpressionData());
-        self::assertEquals('someVariant', $instance->getVariants()[0]->getName());
+        self::assertEquals('someVariant', $instance->getVariant()->getName());
     }
 
     public function testToJson()
     {
         $instance = new DefaultProxyFeature(['name' => 'test', 'enabled' => true, 'impression_data' => true, 'variant' => ['name' => 'someVariant', 'enabled' => true, 'payload' => ['type' => 'string', 'value' => 'test']]]);
         $json = json_encode($instance);
-        self::assertEquals('{"name":"test","enabled":true,"variant":{"name":"someVariant","enabled":true,"payload":{"type":"string","value":"test"}},"impressionData":true}', $json);
+        self::assertEquals('{"name":"test","enabled":true,"variant":{"name":"someVariant","enabled":true,"payload":{"type":"string","value":"test"}},"impression_data":true}', $json);
     }
 }