Uniform review model naming (#1098)

Author: royduin

config/rapidez/models.php

@@ -30,26 +30,25 @@
     'product_option_type_title' => Rapidez\Core\Models\ProductOptionTypeTitle::class,
     'product_option_type_value' => Rapidez\Core\Models\ProductOptionTypeValue::class,
     'product_price'             => Rapidez\Core\Models\ProductPrice::class,
-    // TODO: the naming is mixed..
-    'product_review'         => Rapidez\Core\Models\Review::class,
-    'product_review_summary' => Rapidez\Core\Models\ProductReviewSummary::class,
-    'product_stock'          => Rapidez\Core\Models\ProductStock::class,
-    'product_super_link'     => Rapidez\Core\Models\ProductSuperLink::class,
-    'product_tier_price'     => Rapidez\Core\Models\ProductTierPrice::class,
-    'product_view'           => Rapidez\Core\Models\ProductView::class,
-    'quote'                  => Rapidez\Core\Models\Quote::class,
-    'quote_id_mask'          => Rapidez\Core\Models\QuoteIdMask::class,
-    'quote_item'             => Rapidez\Core\Models\QuoteItem::class,
-    'quote_item_option'      => Rapidez\Core\Models\QuoteItemOption::class,
-    'report_event'           => Rapidez\Core\Models\ReportEvent::class,
-    'rewrite'                => Rapidez\Core\Models\Rewrite::class,
-    'sales_order'            => Rapidez\Core\Models\SalesOrder::class,
-    'sales_order_address'    => Rapidez\Core\Models\SalesOrderAddress::class,
-    'sales_order_item'       => Rapidez\Core\Models\SalesOrderItem::class,
-    'sales_order_payment'    => Rapidez\Core\Models\SalesOrderPayment::class,
-    'search_query'           => Rapidez\Core\Models\SearchQuery::class,
-    'search_synonym'         => Rapidez\Core\Models\SearchSynonym::class,
-    'store'                  => Rapidez\Core\Models\Store::class,
-    'super_attribute'        => Rapidez\Core\Models\SuperAttribute::class,
-    'widget'                 => Rapidez\Core\Models\Widget::class,
+    'product_stock'             => Rapidez\Core\Models\ProductStock::class,
+    'product_super_link'        => Rapidez\Core\Models\ProductSuperLink::class,
+    'product_tier_price'        => Rapidez\Core\Models\ProductTierPrice::class,
+    'product_view'              => Rapidez\Core\Models\ProductView::class,
+    'quote'                     => Rapidez\Core\Models\Quote::class,
+    'quote_id_mask'             => Rapidez\Core\Models\QuoteIdMask::class,
+    'quote_item'                => Rapidez\Core\Models\QuoteItem::class,
+    'quote_item_option'         => Rapidez\Core\Models\QuoteItemOption::class,
+    'report_event'              => Rapidez\Core\Models\ReportEvent::class,
+    'review'                    => Rapidez\Core\Models\Review::class,
+    'review_summary'            => Rapidez\Core\Models\ReviewSummary::class,
+    'rewrite'                   => Rapidez\Core\Models\Rewrite::class,
+    'sales_order'               => Rapidez\Core\Models\SalesOrder::class,
+    'sales_order_address'       => Rapidez\Core\Models\SalesOrderAddress::class,
+    'sales_order_item'          => Rapidez\Core\Models\SalesOrderItem::class,
+    'sales_order_payment'       => Rapidez\Core\Models\SalesOrderPayment::class,
+    'search_query'              => Rapidez\Core\Models\SearchQuery::class,
+    'search_synonym'            => Rapidez\Core\Models\SearchSynonym::class,
+    'store'                     => Rapidez\Core\Models\Store::class,
+    'super_attribute'           => Rapidez\Core\Models\SuperAttribute::class,
+    'widget'                    => Rapidez\Core\Models\Widget::class,
 ];

src/Models/Product.php

@@ -193,15 +193,15 @@ public function options(): HasMany
     public function reviewSummary(): HasOne
     {
         return $this->hasOne(
-            config('rapidez.models.product_review_summary'),
+            config('rapidez.models.review_summary', ReviewSummary::class),
             'entity_pk_value'
         );
     }
 
     public function reviews(): BelongsToMany
     {
         return $this->belongsToMany(
-            config('rapidez.models.product_review', Review::class), 'review',
+            config('rapidez.models.review', Review::class), 'review',
             'entity_pk_value', 'review_id',
             'entity_id', 'review_id',
         )->where('review.entity_id', Review::REVIEW_ENTITY_PRODUCT);

src/Models/ProductReviewSummary.php src/Models/ReviewSummary.phpsrc/Models/ProductReviewSummary.php renamed to src/Models/ReviewSummary.php

@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-class ProductReviewSummary extends Model
+class ReviewSummary extends Model
 {
     protected $table = 'review_entity_summary';