Handling of next subscription type for trial periods

src/api/VerifyPurchaseApiHandler.php

@@ -269,7 +269,7 @@ private function createPayment(
         ?string $articleID
     ): JsonResponse {
         $subscriptionType = $this->appleAppstoreSubscriptionTypesRepository
-            ->findSubscriptionTypeByAppleAppstoreProductId($latestReceipt->getProductId());
+            ->findSubscriptionTypeByAppleAppstoreProductId($latestReceipt->getProductId(), !$latestReceipt->isTrialPeriod());
         if (!$subscriptionType) {
             Debugger::log(
                 "Unable to find SubscriptionType by product ID [{$latestReceipt->getProductId()}] from transaction [{$latestReceipt->getOriginalTransactionId()}].",

src/models/LatestReceiptInfo.php

@@ -55,4 +55,12 @@ public function getTransactionId(): string
     {
         return $this->latestReceiptInfo->transaction_id;
     }
+
+    public function isTrialPeriod(): bool
+    {
+        if (!isset($this->latestReceiptInfo->is_trial_period)) {
+            return false;
+        }
+        return filter_var($this->latestReceiptInfo->is_trial_period, FILTER_VALIDATE_BOOLEAN);
+    }
 }

src/models/Repository/AppleAppstoreSubscriptionTypesRepository.php

@@ -30,8 +30,15 @@ final public function update(IRow &$row, $data)
     /**
      * @param string $appleAppstoreProductId Identification of product in Apple App Store
      */
-    final public function findSubscriptionTypeByAppleAppstoreProductId(string $appleAppstoreProductId): ?ActiveRow
+    final public function findSubscriptionTypeByAppleAppstoreProductId(string $appleAppstoreProductId, bool $followNextSubscriptionType = true): ?ActiveRow
     {
-        return ($this->findBy('product_id', $appleAppstoreProductId))->subscription_type ?? null;
+        $appStoreSubscriptionType = $this->findBy('product_id', $appleAppstoreProductId);
+        if (!$appStoreSubscriptionType) {
+            return null;
+        }
+        if ($followNextSubscriptionType && $appStoreSubscriptionType->subscription_type->next_subscription_type_id !== null) {
+            return $appStoreSubscriptionType->subscription_type->next_subscription_type;
+        }
+        return $appStoreSubscriptionType->subscription_type;
     }
 }

src/models/ServerToServerNotificationProcessor/ServerToServerNotificationProcessor.php

@@ -42,7 +42,7 @@ public function __construct(
     public function getSubscriptionType(LatestReceiptInfo $latestReceiptInfo): ActiveRow
     {
         $appleAppstoreProductId = $latestReceiptInfo->getProductId();
-        $subscriptionType = $this->appleAppstoreSubscriptionTypesRepository->findSubscriptionTypeByAppleAppstoreProductId($appleAppstoreProductId);
+        $subscriptionType = $this->appleAppstoreSubscriptionTypesRepository->findSubscriptionTypeByAppleAppstoreProductId($appleAppstoreProductId, !$latestReceiptInfo->isTrialPeriod());
         if (!$subscriptionType) {
             throw new \Exception("Unable to find SubscriptionType by product ID [{$appleAppstoreProductId}] provided by ServerToServerNotification.");
         }