Eagerly load plans and discounts from subscription

zf-fr · Feb 24, 2015 · f57e9ad · f57e9ad
1 parent 3cfc9ec
commit f57e9ad
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.0
+
+* Update mapping so that when fetching a subscription, plan and (eventual) discount are loaded eagerly instead of
+being lazy-loaded. The reason is that most of the time, the subscription is fetched in order to be shown with all
+the information linked to it.
+
 ## 1.1.1
 
 * Revert uppercase for country code

diff --git a/config/doctrine/ZfrCash.Entity.Subscription.dcm.xml b/config/doctrine/ZfrCash.Entity.Subscription.dcm.xml
@@ -16,13 +16,13 @@
             </options>
         </field>
 
-        <many-to-one field="plan" target-entity="ZfrCash\Entity\Plan" />
+        <many-to-one field="plan" target-entity="ZfrCash\Entity\Plan" fetch="EAGER" />
 
         <many-to-one field="payer" target-entity="ZfrCash\Entity\CustomerInterface">
             <join-column on-delete="CASCADE" />
         </many-to-one>
 
-        <one-to-one field="discount" target-entity="ZfrCash\Entity\SubscriptionDiscount" inversed-by="subscription">
+        <one-to-one field="discount" target-entity="ZfrCash\Entity\SubscriptionDiscount" inversed-by="subscription" fetch="EAGER">
             <cascade>
                 <cascade-persist />
             </cascade>

diff --git a/src/Entity/AbstractDiscount.php b/src/Entity/AbstractDiscount.php
@@ -71,6 +71,22 @@ public function getId()
         return $this->id;
     }
 
+    /**
+     * @param CustomerInterface $customer
+     */
+    public function setCustomer($customer)
+    {
+        $this->customer = $customer;
+    }
+
+    /**
+     * @return CustomerInterface
+     */
+    public function getCustomer()
+    {
+        return $this->customer;
+    }
+
     /**
      * @param Coupon $coupon
      */

diff --git a/src/Entity/CustomerDiscount.php b/src/Entity/CustomerDiscount.php
@@ -30,14 +30,6 @@ class CustomerDiscount extends AbstractDiscount
     public function setCustomer($customer)
     {
         $customer->setDiscount($this);
-        $this->customer = $customer;
-    }
-
-    /**
-     * @return CustomerInterface
-     */
-    public function getCustomer()
-    {
-        return $this->customer;
+        parent::setCustomer($customer);
     }
 }
diff --git a/src/Entity/SubscriptionDiscount.php b/src/Entity/SubscriptionDiscount.php
@@ -29,22 +29,6 @@ class SubscriptionDiscount extends AbstractDiscount
      */
     protected $subscription;
 
-    /**
-     * @param CustomerInterface $customer
-     */
-    public function setCustomer($customer)
-    {
-        $this->customer = $customer;
-    }
-
-    /**
-     * @return CustomerInterface
-     */
-    public function getCustomer()
-    {
-        return $this->customer;
-    }
-
     /**
      * @param Subscription $subscription
      */