Listing status migration

includes/classes/class-add-listing.php

@@ -958,8 +958,10 @@ private function renew_listing( $listing_id ) {
 
 			$directory_type = get_post_meta( $listing_id, '_directory_type', true );
 			// Update the post_meta into the database
-			$old_status = get_post_meta( $listing_id, '_listing_status', true );
-			if ( 'expired' == $old_status ) {
+			// TODO: Status has been migrated, remove related code.
+			// $old_status = get_post_meta( $listing_id, '_listing_status', true );
+			$old_status = get_post_status( $listing_id );
+			if ( 'expired' === $old_status ) {
 				$expiry_date = calc_listing_expiry_date();
 			} else {
 				$old_expiry_date = get_post_meta( $listing_id, '_expiry_date', true );
@@ -968,7 +970,8 @@ private function renew_listing( $listing_id ) {
 
 			// update related post meta_data
 			update_post_meta( $listing_id, '_expiry_date', $expiry_date );
-			update_post_meta( $listing_id, '_listing_status', 'post_status' );
+			// TODO: Status has been migrated, remove related code.
+			// update_post_meta( $listing_id, '_listing_status', 'post_status' );
 
 			$exp_days       = get_term_meta( $directory_type, 'default_expiration', true );
 			if ( $exp_days <= 0 ) {

includes/classes/class-cron.php

@@ -100,13 +100,10 @@ private function featured_listing_followup() {
 				$args = array(
 					'post_type'      => ATBDP_POST_TYPE,
 					'posts_per_page' => -1,
-					'post_status'    => 'public',
+					'post_status'    => 'publish',
+					'cache_results'  => false,
+					'nopaging'       => true,
 					'meta_query'     => array(
-						'relation' => 'AND',
-						array(
-							'key'   => '_listing_status',
-							'value' => 'post_status',
-						),
 						array(
 							'key'   => '_featured',
 							'value' => 1,
@@ -136,7 +133,7 @@ private function get_order_by_listing( $listing_id ) {
 			$args = array(
 				'post_type'      => ATBDP_ORDER_POST_TYPE,
 				'posts_per_page' => 1,
-				'post_status'    => 'public',
+				'post_status'    => 'publish',
 				'meta_query'     => array(
 					'relation' => 'AND',
 					array(
@@ -176,12 +173,10 @@ private function update_renewal_status() {
 					'post_type'      => ATBDP_POST_TYPE,
 					'posts_per_page' => -1,
 					'post_status'    => 'publish',
+					'cache_results'  => false,
+					'nopaging'       => true,
 					'meta_query'     => array(
 						'relation'   => 'AND',
-						array(
-							'key'   => '_listing_status',
-							'value' => 'post_status',
-						),
 						array(
 							'key'     => '_expiry_date',
 							'value'   => $renew_email_threshold_date,
@@ -207,9 +202,19 @@ private function update_renewal_status() {
 				$listings = new WP_Query( $args ); // get all the post that has post_status only and update their status and fire an email
 				if ( $listings->found_posts ) {
 					foreach ( $listings->posts as $listing ) {
-						update_post_meta( $listing->ID, '_listing_status', 'renewal' );
+						// TODO: Status has been migrated, remove related code.
+						// update_post_meta( $listing->ID, '_listing_status', 'renewal' );
+						$renewal_listing_id = wp_update_post( array(
+							'ID'          => $listing->ID,
+							'post_status' => 'renewal',
+						) );
+
+						if ( is_wp_error( $renewal_listing_id ) ) {
+							continue;
+						}
+
 						// hook for dev.
-						do_action( 'atbdp_status_updated_to_renewal', $listing->ID );
+						do_action( 'atbdp_status_updated_to_renewal', $renewal_listing_id );
 					}
 				}
 			}
@@ -234,6 +239,8 @@ private function update_expired_status() {
 			$args = array(
 				'post_type'      => ATBDP_POST_TYPE,
 				'posts_per_page' => -1,
+				'cache_results'  => false,
+				'nopaging'       => true,
 				'post_status'    => 'publish', // get expired post with published status
 				'meta_query'     => array(
 					'relation'   => 'AND',
@@ -262,29 +269,34 @@ private function update_expired_status() {
 			if ( $listings->found_posts ) {
 				foreach ( $listings->posts as $listing ) {
 					// prepare the post meta data
-					$metas = array(
-						'_listing_status'        => 'expired',
+					$meta_input = array(
+						// TODO: Status has been migrated, remove related code.
+						// '_listing_status'        => 'expired',
 						'_featured'              => 0,
 						'_renewal_reminder_sent' => 0,
 					);
+
 					// delete expired listings?
 					if ( $del_exp_l ) {
 						// if deletion threshold is set then add deletion date
 						if ( $delete_threshold > 0 ) {
-							$metas['_deletion_date'] = date( 'Y-m-d H:i:s', strtotime( '+' . $delete_threshold . ' days' ) );
+							$meta_input['_deletion_date'] = date( 'Y-m-d H:i:s', strtotime( '+' . $delete_threshold . ' days' ) );
 						} else {
-							$metas['_deletion_date'] = date( 'Y-m-d H:i:s', current_time( 'timestamp' ) );
+							$meta_input['_deletion_date'] = date( 'Y-m-d H:i:s', current_time( 'timestamp' ) );
 						}
 					}
-					wp_update_post(
-						array(
-							'ID'          => $listing->ID,
-							'post_status' => 'private',      // update the status to private so that we do not run this func a second time
-							'meta_input'  => $metas,         // insert all meta data once to reduce update meta query
-						)
-					);
-					// Hook for developers
-					do_action( 'atbdp_listing_expired', $listing->ID );
+
+					$expired_listing_id = wp_update_post( array(
+						'ID'          => $listing->ID,
+						'post_status' => 'expired',
+						'meta_input'  => $meta_input,
+					) );
+
+					if ( is_wp_error( $expired_listing_id ) ) {
+						continue;
+					}
+
+					do_action( 'atbdp_listing_expired', $expired_listing_id );
 				}
 			}
 		}
@@ -296,50 +308,89 @@ private function update_expired_status() {
 		 * @access   private
 		 */
 		private function update_expired_listing_status() {
-			// Define the query
-			$args                         = array(
+			// TODO: Status has been migrated, remove related code.
+			// // Define the query
+			// $args                         = array(
+			// 	'post_type'      => ATBDP_POST_TYPE,
+			// 	'posts_per_page' => -1,
+			// 	'post_status'    => 'publish', // get expired post with published status
+			// );
+			// 	$meta                     = array();
+			// 	$meta['renewed_by_admin'] = array(
+			// 		'relation' => 'OR',
+			// 		array(
+			// 			'key'     => '_expiry_date',
+			// 			'value'   => current_time( 'mysql' ),
+			// 			'compare' => '>',                     // eg. expire date 6 <= current date 7 will return the post
+			// 			'type'    => 'DATETIME',
+			// 		),
+			// 		array(
+			// 			'key'   => '_never_expire',
+			// 			'value' => 1,
+			// 		),
+			// 	);
+			// 		$meta['get_expired']  = array(
+			// 			'key'     => '_listing_status',
+			// 			'value'   => 'expired',
+			// 			'compare' => '=',
+			// 		);
+
+			// 		$args['meta_query'] = array_merge( array( 'relation' => 'AND' ), $meta );
+			// 		$listings           = new WP_Query( $args );
+			// 		if ( $listings->found_posts ) {
+			// 			foreach ( $listings->posts as $listing ) {
+			// 				// prepare the post meta data
+			// 				$metas = array(
+			// 					'_listing_status'        => 'post_status',
+			// 					'_renewal_reminder_sent' => 0,
+			// 				);
+			// 				wp_update_post(
+			// 					array(
+			// 						'ID'          => $listing->ID,
+			// 						'post_status' => 'publish',      // update the status to private so that we do not run this func a second time
+			// 						'meta_input'  => $metas,         // insert all meta data once to reduce update meta query
+			// 					)
+			// 				);
+			// 			}
+			// 		}
+
+			$args = array(
 				'post_type'      => ATBDP_POST_TYPE,
 				'posts_per_page' => -1,
-				'post_status'    => 'publish', // get expired post with published status
+				'post_status'    => 'expired',
+				'cache_results'  => false,
+				'nopaging'       => true,
+				'meta_query' => array(
+					'relation' => 'AND',
+					'renewed_by_admin' => array(
+						'relation' => 'OR',
+						array(
+							'key'     => '_expiry_date',
+							'value'   => current_time( 'mysql' ),
+							'compare' => '>',                     // eg. expire date 6 <= current date 7 will return the post
+							'type'    => 'DATETIME',
+						),
+						array(
+							'key'   => '_never_expire',
+							'value' => 1,
+						),
+					)
+				)
 			);
-				$meta                     = array();
-				$meta['renewed_by_admin'] = array(
-					'relation' => 'OR',
-					array(
-						'key'     => '_expiry_date',
-						'value'   => current_time( 'mysql' ),
-						'compare' => '>',                     // eg. expire date 6 <= current date 7 will return the post
-						'type'    => 'DATETIME',
-					),
-					array(
-						'key'   => '_never_expire',
-						'value' => 1,
-					),
-				);
-					$meta['get_expired']  = array(
-						'key'     => '_listing_status',
-						'value'   => 'expired',
-						'compare' => '=',
-					);
 
-					$args['meta_query'] = array_merge( array( 'relation' => 'AND' ), $meta );
-					$listings           = new WP_Query( $args );
-					if ( $listings->found_posts ) {
-						foreach ( $listings->posts as $listing ) {
-							// prepare the post meta data
-							$metas = array(
-								'_listing_status'        => 'post_status',
-								'_renewal_reminder_sent' => 0,
-							);
-							wp_update_post(
-								array(
-									'ID'          => $listing->ID,
-									'post_status' => 'publish',      // update the status to private so that we do not run this func a second time
-									'meta_input'  => $metas,         // insert all meta data once to reduce update meta query
-								)
-							);
-						}
-					}
+			$listings = new WP_Query( $args );
+
+			if ( $listings->found_posts ) {
+				foreach ( $listings->posts as $listing ) {
+					wp_update_post( array(
+						'ID'          => $listing->ID,
+						'post_status' => 'publish',
+						'meta_input'  => array(
+							'_renewal_reminder_sent' => 0,
+						),
+					) );
+				}
+			}
 		}
 
 		/**
@@ -357,13 +408,16 @@ private function send_renewal_reminders() {
 				$args = array(
 					'post_type'      => ATBDP_POST_TYPE,
 					'posts_per_page' => -1,
-					'post_status'    => 'private',
+					'cache_results'  => false,
+					'nopaging'       => true,
+					'post_status'    => 'expired',
 					'meta_query'     => array(
 						'relation'   => 'AND',
-						array(
-							'key'   => '_listing_status',
-							'value' => 'expired',
-						),
+						// TODO: Status has been migrated, remove related code.
+						// array(
+						// 	'key'   => '_listing_status',
+						// 	'value' => 'expired',
+						// ),
 						array(
 							'key'   => '_renewal_reminder_sent',
 							'value' => 0,
@@ -421,13 +475,16 @@ private function delete_expired_listings() {
 			$args = array(
 				'post_type'      => ATBDP_POST_TYPE,
 				'posts_per_page' => -1,
-				'post_status'    => 'private',
+				'cache_results'  => false,
+				'nopaging'       => true,
+				'post_status'    => 'expired',
 				'meta_query'     => array(
 					'relation'   => 'AND',
-					array(
-						'key'   => '_listing_status',
-						'value' => 'expired',
-					),
+					// TODO: Status has been migrated, remove related code.
+					// array(
+					// 	'key'   => '_listing_status',
+					// 	'value' => 'expired',
+					// ),
 					array(
 						'key'     => '_deletion_date',
 						'value'   => current_time( 'mysql' ),

includes/classes/class-custom-post.php

@@ -35,6 +35,38 @@ public function __construct() {
 			}
 
 			add_action( 'admin_footer', array( $this, 'quick_edit_scripts' ) );
+
+			add_action( 'init', array( $this, 'register_post_status' ) );
+		}
+
+		public function register_post_status() {
+			register_post_status(
+				'expired',
+				array(
+					'label'       => _x( 'Expired', 'post status', 'directorist' ),
+					'protected'   => true,
+					/* translators: %s: Number of expired listings. */
+					'label_count' => _n_noop(
+						'Expired <span class="count">(%s)</span>',
+						'Expired <span class="count">(%s)</span>',
+						'directorist'
+					),
+				)
+			);
+
+			register_post_status(
+				'renewal',
+				array(
+					'label'       => _x( 'Renewal', 'post status', 'directorist' ),
+					'protected'   => true,
+					/* translators: %s: Number of renewal listings. */
+					'label_count' => _n_noop(
+						'Renewal <span class="count">(%s)</span>',
+						'Renewal <span class="count">(%s)</span>',
+						'directorist'
+					),
+				)
+			);
 		}
 
 		public function quick_edit_scripts() {
@@ -377,8 +409,10 @@ public function manage_listing_columns( $column_name, $post_id ) {
 					break;
 
 				case 'atbdp_status':
-					$status = get_post_meta( $post_id, '_listing_status', true );
-					$status = ( $status !== 'post_status' ? $status : get_post_status( $post_id ) );
+					// TODO: Status has been migrated, remove related code.
+					// $status = get_post_meta( $post_id, '_listing_status', true );
+					// $status = ( $status !== 'post_status' ? $status : get_post_status( $post_id ) );
+					$status = get_post_status( $post_id );
 					echo esc_html( ucfirst( $status ) );
 					break;
 

includes/classes/class-installation.php

@@ -25,6 +25,13 @@ class ATBDP_Installation {
 	 * @var array
 	 */
 	private static $db_updates = array(
+		'7.10.0' => [
+			'directorist_7100_migrate_expired_meta_to_expired_status',
+			'directorist_7100_migrate_renewal_meta_to_renewal_status',
+			// 'directorist_7100_clean_listing_status_expired_meta',
+			// 'directorist_7100_clean_listing_status_renewal_meta',
+			'directorist_7100_update_db_version',
+		],
 		'7.1.0' => [
 			'directorist_710_migrate_reviews_table_to_comments_table',
 			'directorist_710_migrate_posts_table_to_comments_table',