Merge pull request #2716 from themeum/harun-v4

Fix duplicate query execution on cart and checkout page.

Author: shewa12

models/CartModel.php

@@ -10,6 +10,7 @@
 
 namespace Tutor\Models;
 
+use Tutor\Cache\TutorCache;
 use Tutor\Helpers\QueryHelper;
 
 /**
@@ -101,7 +102,12 @@ public function add_course_to_cart( $user_id, $course_id, $item_type = '', $item
 	 * @return array Array containing the cart items and their total count.
 	 */
 	public function get_cart_items( $user_id, $is_details = true ) {
-		global $wpdb;
+		$cache_key = "tutor_get_cart_items_{$user_id}_{$is_details}";
+		$cached    = TutorCache::get( $cache_key );
+
+		if ( $cached ) {
+			return $cached;
+		}
 
 		$cart_data = array(
 			'cart'    => null,
@@ -112,7 +118,7 @@ public function get_cart_items( $user_id, $is_details = true ) {
 		);
 
 		$user_cart = QueryHelper::get_row(
-			"{$wpdb->prefix}tutor_carts",
+			'tutor_carts',
 			array(
 				'user_id' => $user_id,
 			),
@@ -122,11 +128,11 @@ public function get_cart_items( $user_id, $is_details = true ) {
 		if ( $user_cart ) {
 			$cart_data['cart'] = $user_cart;
 
-			$primary_table        = "{$wpdb->prefix}tutor_cart_items AS item";
+			$primary_table        = 'tutor_cart_items AS item';
 			$joining_tables       = array(
 				array(
 					'type'  => 'LEFT',
-					'table' => "{$wpdb->prefix}posts AS post",
+					'table' => 'posts AS post',
 					'on'    => 'item.course_id = post.ID',
 				),
 			);
@@ -142,7 +148,10 @@ public function get_cart_items( $user_id, $is_details = true ) {
 			);
 		}
 
-		return $is_details ? $cart_data : $cart_data['courses']['results'];
+		$result = $is_details ? $cart_data : $cart_data['courses']['results'];
+		TutorCache::set( $cache_key, $result );
+
+		return $result;
 	}
 
 	/**

models/OrderModel.php

@@ -11,6 +11,7 @@
 namespace Tutor\Models;
 
 use Exception;
+use Tutor\Cache\TutorCache;
 use Tutor\Components\Badge;
 use Tutor\Components\Button;
 use Tutor\Components\Constants\Variant;
@@ -632,20 +633,23 @@ public function mark_as_paid( $order_id, $note = '', $trigger_hooks = true ) {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
 	 * @param int $order_id The ID of the order to retrieve items for.
 	 *
 	 * @return array The order items, each containing details and course titles, or an empty array if no items are found.
 	 */
 	public function get_order_items_by_id( $order_id ) {
-		global $wpdb;
+		$cache_key = 'tutor_get_order_items_by_id_' . $order_id;
+		$cached    = TutorCache::get( $cache_key );
 
-		$primary_table  = "{$wpdb->prefix}tutor_order_items AS oi";
+		if ( $cached ) {
+			return $cached;
+		}
+
+		$primary_table  = 'tutor_order_items AS oi';
 		$joining_tables = array(
 			array(
 				'type'  => 'LEFT',
-				'table' => "{$wpdb->prefix}posts AS p",
+				'table' => 'posts AS p',
 				'on'    => 'p.ID = oi.item_id',
 			),
 		);
@@ -657,13 +661,11 @@ public function get_order_items_by_id( $order_id ) {
 		$courses_data = QueryHelper::get_joined_data( $primary_table, $joining_tables, $select_columns, $where, array(), 'id', 0, 0 );
 		$courses      = $courses_data['results'];
 
-		if ( tutor()->has_pro ) {
-			$bundle_model = new \TutorPro\CourseBundle\Models\BundleModel();
-		}
+		$bundle_model = tutor()->has_pro ? new \TutorPro\CourseBundle\Models\BundleModel() : null;
 
 		if ( ! empty( $courses_data['total_count'] ) ) {
 			foreach ( $courses as &$course ) {
-				if ( tutor()->has_pro && 'course-bundle' === $course->type ) {
+				if ( is_object( $bundle_model ) && tutor()->bundle_post_type === $course->type ) {
 					$course->total_courses = count( $bundle_model->get_bundle_course_ids( $course->id ) );
 				}
 
@@ -679,7 +681,10 @@ public function get_order_items_by_id( $order_id ) {
 
 		unset( $course );
 
-		return ! empty( $courses ) ? $courses : array();
+		$result = ! empty( $courses ) ? $courses : array();
+		TutorCache::set( $cache_key, $result );
+
+		return $result;
 	}
 
 	/**