fix: ensure migrated Stripe subs have next_payment scheduled

Author: dkoo

includes/reader-revenue/class-woocommerce-connection.php

@@ -701,6 +701,14 @@ public static function create_transaction( $order_data ) {
 						update_post_meta( $subscription_id, self::SUBSCRIPTION_STRIPE_ID_META_KEY, $stripe_subscription_id );
 					}
 
+					// Ensure the next payment is scheduled.
+					$next_payment_date = $subscription->calculate_date( 'next_payment' );
+					$subscription->update_dates(
+						[
+							'next_payment' => $next_payment_date,
+						]
+					);
+
 					$subscription->save();
 
 					Logger::log( 'Created WC subscription with id: ' . $subscription_id );

includes/reader-revenue/stripe/class-stripe-sync.php

@@ -456,6 +456,75 @@ public static function sync_stripe_subscriptions_to_wc( $args, $assoc_args ) {
 		\WP_CLI::success( 'Finished processing.' );
 	}
 
+	/**
+	 * CLI command for finding previously migrated Stripe Subscriptions in Woo and ensuring they have a next payment date set.
+	 *
+	 * @param array $args Positional args.
+	 * @param array $assoc_args Associative args.
+	 */
+	public static function set_next_payment_dates_for_migrated_subscriptions( $args, $assoc_args ) {
+		$is_dry_run = ! empty( $assoc_args['dry-run'] );
+		$batch_size = ! empty( $assoc_args['batch-size'] ) ? intval( $assoc_args['batch-size'] ) : 10;
+
+		\WP_CLI::log(
+			'
+
+Running script to set next payment dates on migrated subscriptions...
+
+		'
+		);
+
+
+		$migrated_subscriptions = self::get_migrated_subscriptions( $batch_size );
+		$offset                 = 0;
+		$processed              = 0;
+		while ( $migrated_subscriptions ) {
+			$subscription_id = array_shift( $migrated_subscriptions );
+
+			// Set next payment date.
+			$subscription = \wcs_get_subscription( $subscription_id );
+			if ( $subscription ) {
+				\WP_CLI::log(
+					sprintf(
+						'Found subscription with ID %d and start date %s.',
+						$subscription_id,
+						$subscription->get_date( 'start' )
+					)
+				);
+
+				// Get the next payment date.
+				$next_payment_date = $subscription->get_date( 'next_payment' );
+
+				// If there's no next payment, set it.
+				if ( ! $next_payment_date ) {
+					$next_payment_date = $subscription->calculate_date( 'next_payment' );
+					\WP_CLI::log( sprintf( 'No next payment date set. Setting to %s.', $next_payment_date ) );
+
+					if ( ! $is_dry_run ) {
+						$subscription->update_dates(
+							[
+								'next_payment' => $next_payment_date,
+							]
+						);
+
+						$subscription->save();
+					}
+					$processed ++;
+				} else {
+					\WP_CLI::log( sprintf( 'Next payment date already set to %s. Skipping.', $next_payment_date ) );
+				}
+			}
+
+			// Get the next batch.
+			if ( empty( $migrated_subscriptions ) ) {
+				$offset                += $batch_size;
+				$migrated_subscriptions = self::get_migrated_subscriptions( $batch_size, $offset );
+			}
+		}
+
+		\WP_CLI::success( sprintf( 'Finished processing %d subscriptions.', $processed ) );
+	}
+
 	/**
 	 * Get a batch of customers for the Stripe-Connect-to-Stripe CLI tool.
 	 *
@@ -484,6 +553,29 @@ protected static function get_batch_of_customers_with_subscriptions( $limit, $la
 		}
 	}
 
+	/**
+	 * Get a batch of migrated subscriptions.
+	 *
+	 * @param int $batch_size Number of subscriptions to fetch.
+	 * @param int $offset Offset to start at.
+	 * @return array Array of WC Subscriptions.
+	 */
+	protected static function get_migrated_subscriptions( $batch_size = 0, $offset = 0 ) {
+		$args = [
+			'fields'         => 'ids',
+			'offset'         => $offset,
+			'post_status'    => 'wc-active',
+			'post_type'      => 'shop_subscription',
+			'posts_per_page' => $batch_size,
+			'meta_query'     => [ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+				'key'     => 'cancelled-newspack-stripe-subscription-id',
+				'compare' => 'EXISTS',
+			],
+		];
+
+		return \get_posts( $args );
+	}
+
 	/**
 	 * Process one customer's Stripe subscriptions and migrate them.
 	 *
@@ -691,7 +783,28 @@ public static function wp_cli() {
 			'newspack stripe sync-stripe-subscriptions-to-wc',
 			[ __CLASS__, 'sync_stripe_subscriptions_to_wc' ],
 			[
-				'shortdesc' => __( 'Migrate subscribtions from Stripe to WC', 'newspack' ),
+				'shortdesc' => __( 'Migrate subscriptions from Stripe to WC', 'newspack' ),
+				'synopsis'  => [
+					[
+						'type'     => 'flag',
+						'name'     => 'dry-run',
+						'optional' => true,
+					],
+					[
+						'type'     => 'flag',
+						'name'     => 'batch-size',
+						'default'  => 10,
+						'optional' => true,
+					],
+				],
+			]
+		);
+
+		\WP_CLI::add_command(
+			'newspack stripe set-next-payment-dates-for-migrated-subscriptions',
+			[ __CLASS__, 'set_next_payment_dates_for_migrated_subscriptions' ],
+			[
+				'shortdesc' => __( 'Ensure that all migrated subscriptions have a next payment date.', 'newspack' ),
 				'synopsis'  => [
 					[
 						'type'     => 'flag',