feat(ras): sync class

includes/class-newspack.php

@@ -81,8 +81,11 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-reader-activation-emails.php';
 		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-reader-activation.php';
 		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-reader-data.php';
-		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-esp-sync.php';
-		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-esp-sync-admin.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/sync/class-sync.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/sync/class-metadata.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/sync/class-woocommerce.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/sync/class-esp-sync.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/sync/class-esp-sync-admin.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-utils.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-data-events.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-webhooks.php';
@@ -152,7 +155,6 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-jetpack.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-gravityforms.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/google-site-kit/class-googlesitekit.php';
-		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-newspack-newsletters.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-mailchimp-for-woocommerce.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-onesignal.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-organic-profile-block.php';

includes/data-events/class-memberships.php

@@ -235,7 +235,7 @@ private static function get_order_data( $order_id, $order ) {
 	 */
 	public static function woocommerce_checkout_order_processed( $order_id ) {
 		$order = \wc_get_order( $order_id );
-		if ( ! \Newspack\WooCommerce_Connection::should_sync_order( $order ) ) {
+		if ( ! Reader_Activation\Sync\WooCommerce::should_sync_order( $order ) ) {
 			return;
 		}
 		$data = self::get_order_data( $order_id, $order );

includes/data-events/class-utils.php

@@ -24,7 +24,7 @@ public static function get_order_data( $order_id, $process_donations_only = fals
 		if ( ! $order ) {
 			return;
 		}
-		if ( ! \Newspack\WooCommerce_Connection::should_sync_order( $order ) ) {
+		if ( ! \Newspack\Reader_Activation\Sync\WooCommerce::should_sync_order( $order ) ) {
 			return;
 		}
 

includes/data-events/connectors/class-esp-connector.php

@@ -8,9 +8,8 @@
 namespace Newspack\Data_Events\Connectors;
 
 use Newspack\Data_Events;
-use Newspack\WooCommerce_Connection;
-use Newspack\Newspack_Newsletters;
 use Newspack\Reader_Activation;
+use Newspack\Reader_Activation\Sync;
 use Newspack_Newsletters_Contacts;
 
 defined( 'ABSPATH' ) || exit;
@@ -53,17 +52,15 @@ public static function register_handlers() {
 	 * @param int   $client_id ID of the client that triggered the event.
 	 */
 	public static function reader_registered( $timestamp, $data, $client_id ) {
-		$account_key           = Newspack_Newsletters::get_metadata_key( 'account' );
-		$registration_date_key = Newspack_Newsletters::get_metadata_key( 'registration_date' );
-		$metadata              = [
-			$account_key           => $data['user_id'],
-			$registration_date_key => gmdate( Newspack_Newsletters::METADATA_DATE_FORMAT, $timestamp ),
+		$metadata = [
+			'account'           => $data['user_id'],
+			'registration_date' => gmdate( Sync\Metadata::DATE_FORMAT, $timestamp ),
 		];
 		if ( isset( $data['metadata']['current_page_url'] ) ) {
-			$metadata[ Newspack_Newsletters::get_metadata_key( 'registration_page' ) ] = $data['metadata']['current_page_url'];
+			$metadata['registration_page'] = $data['metadata']['current_page_url'];
 		}
 		if ( isset( $data['metadata']['registration_method'] ) ) {
-			$metadata[ Newspack_Newsletters::get_metadata_key( 'registration_method' ) ] = $data['metadata']['registration_method'];
+			$metadata['registration_method'] = $data['metadata']['registration_method'];
 		}
 
 		$contact = [
@@ -93,7 +90,7 @@ public static function reader_logged_in( $timestamp, $data, $client_id ) {
 			return;
 		}
 
-		$contact = WooCommerce_Connection::get_contact_from_customer( $customer );
+		$contact = Sync\WooCommerce::get_contact_from_customer( $customer );
 
 		self::sync( $contact, 'RAS Reader login' );
 	}
@@ -117,7 +114,7 @@ public static function order_completed( $timestamp, $data, $client_id ) {
 		}
 
 		$order_id = $data['platform_data']['order_id'];
-		$contact = WooCommerce_Connection::get_contact_from_order( $order_id, $data['referer'] );
+		$contact  = Sync\WooCommerce::get_contact_from_order( $order_id, $data['referer'] );
 
 		if ( ! $contact ) {
 			return;
@@ -148,7 +145,7 @@ public static function membership_saved( $timestamp, $data, $client_id ) {
 		$contact = [ 'email' => $data['email'] ];
 		foreach ( $filtered_enabled_fields as $key => $value ) {
 			if ( isset( $data[ $key ] ) ) {
-				$contact['metadata'][ Newspack_Newsletters::get_metadata_key( $key ) ] = $data[ $key ];
+				$contact['metadata'][ $key ] = $data[ $key ];
 			}
 		}
 
@@ -167,7 +164,7 @@ public static function subscription_updated( $timestamp, $data, $client_id ) {
 			return;
 		}
 
-		$contact = WooCommerce_Connection::get_contact_from_order( $data['subscription_id'] );
+		$contact = Sync\WooCommerce::get_contact_from_order( $data['subscription_id'] );
 
 		if ( ! $contact ) {
 			return;
@@ -216,12 +213,9 @@ public static function newsletter_updated( $timestamp, $data ) {
 			}
 		}
 
-		$account_key              = Newspack_Newsletters::get_metadata_key( 'account' );
-		$newsletter_selection_key = Newspack_Newsletters::get_metadata_key( 'newsletter_selection' );
-
 		$metadata = [
-			$account_key              => $data['user_id'],
-			$newsletter_selection_key => implode( ', ', $lists_names ),
+			'account'              => $data['user_id'],
+			'newsletter_selection' => implode( ', ', $lists_names ),
 		];
 		$contact  = [
 			'email'    => $data['email'],
@@ -241,7 +235,7 @@ public static function network_new_reader( $timestamp, $data, $client_id ) {
 		$user_id = $data['user_id'];
 		$registration_site = $data['registration_site'];
 
-		$contact = WooCommerce_Connection::get_contact_from_customer( new \WC_Customer( $user_id ) );
+		$contact = Sync\WooCommerce::get_contact_from_customer( new \WC_Customer( $user_id ) );
 
 		if ( ! $contact ) {
 			return;