refactor: move notification wp helpers to notification db service class

BracketSpace · May 28, 2024 · f470f46 · f470f46
1 parent 6b4d949
commit f470f46
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 77 deletions.
diff --git a/src/Admin/ImportExport.php b/src/Admin/ImportExport.php
@@ -11,8 +11,7 @@
 namespace BracketSpace\Notification\Admin;
 
 use BracketSpace\Notification\Core\Notification;
-use BracketSpace\Notification\Database\NotificationDatabaseService;
-use BracketSpace\Notification\Integration\WordPressIntegration;
+use BracketSpace\Notification\Database\NotificationDatabaseService as Db;
 use BracketSpace\Notification\Utils\Settings\Fields as SettingFields;
 use BracketSpace\Notification\Database\Queries\NotificationQueries;
 
@@ -125,7 +124,7 @@ public function prepareNotificationsExportData(array $items = [])
 		);
 
 		foreach ($posts as $post) {
-			$notification = WordPressIntegration::postToNotification($post);
+			$notification = Db::postToNotification($post);
 
 			if (!($notification instanceof Notification)) {
 				continue;
@@ -223,7 +222,7 @@ public function processNotificationsImportRequest($data)
 			$existingNotification = NotificationQueries::withHash($notification->getHash());
 
 			if ($existingNotification === null) {
-				NotificationDatabaseService::upsert($notification);
+				Db::upsert($notification);
 				$added++;
 			} else {
 				if ($existingNotification->getVersion() >= $notification->getVersion()) {
@@ -235,7 +234,7 @@ public function processNotificationsImportRequest($data)
 						continue;
 					}
 
-					NotificationDatabaseService::upsert($notification);
+					Db::upsert($notification);
 					$updated++;
 				}
 			}

diff --git a/src/Admin/NotificationDuplicator.php b/src/Admin/NotificationDuplicator.php
@@ -10,8 +10,7 @@
 
 namespace BracketSpace\Notification\Admin;
 
-use BracketSpace\Notification\Database\NotificationDatabaseService;
-use BracketSpace\Notification\Integration\WordPressIntegration;
+use BracketSpace\Notification\Database\NotificationDatabaseService as Db;
 
 /**
  * Notification duplicator class
@@ -72,7 +71,7 @@ public function notificationDuplicate()
 			wp_die("You cannot duplicate post that's not a Notification post");
 		}
 
-		$notification = WordPressIntegration::postToNotification($source);
+		$notification = Db::postToNotification($source);
 
 		if ($notification === null) {
 			wp_die("It doesn't seem that Notification exist anymore");
@@ -84,7 +83,7 @@ public function notificationDuplicate()
 
 		// Create duplicated Notification.
 		do_action('notification/data/save', $newNotification);
-		NotificationDatabaseService::upsert($newNotification);
+		Db::upsert($newNotification);
 		do_action('notification/data/saved', $newNotification);
 
 		// Create duplicated WP_Post.

diff --git a/src/Admin/PostTable.php b/src/Admin/PostTable.php
@@ -10,8 +10,7 @@
 
 namespace BracketSpace\Notification\Admin;
 
-use BracketSpace\Notification\Database\NotificationDatabaseService;
-use BracketSpace\Notification\Integration\WordPressIntegration;
+use BracketSpace\Notification\Database\NotificationDatabaseService as Db;
 
 /**
  * PostTable class
@@ -89,7 +88,7 @@ static function ($label, $slug) {
 	 */
 	public function tableColumnContent($column, $postId)
 	{
-		$notification = WordPressIntegration::postToNotification($postId);
+		$notification = Db::postToNotification($postId);
 
 		if ($notification === null) {
 			return;
@@ -258,7 +257,7 @@ public function handleStatusBulkActions($redirectTo, $doaction, $postIds)
 		);
 
 		foreach ($postIds as $postId) {
-			$notification = WordPressIntegration::postToNotification($postId);
+			$notification = Db::postToNotification($postId);
 
 			if ($notification === null) {
 				continue;
@@ -267,7 +266,7 @@ public function handleStatusBulkActions($redirectTo, $doaction, $postIds)
 			$notification->setEnabled($doaction === 'enable');
 
 			do_action('notification/data/save', $notification);
-			NotificationDatabaseService::upsert($notification);
+			Db::upsert($notification);
 			do_action('notification/data/saved', $notification);
 		}
 

diff --git a/src/Admin/PostType.php b/src/Admin/PostType.php
@@ -11,8 +11,7 @@
 namespace BracketSpace\Notification\Admin;
 
 use BracketSpace\Notification\Core\Notification;
-use BracketSpace\Notification\Database\NotificationDatabaseService;
-use BracketSpace\Notification\Integration\WordPressIntegration;
+use BracketSpace\Notification\Database\NotificationDatabaseService as Db;
 use BracketSpace\Notification\Store;
 use BracketSpace\Notification\Dependencies\Micropackage\Ajax\Response;
 
@@ -219,13 +218,13 @@ public function bypassTrash($postId)
 	 */
 	public function deleteNotification($postId)
 	{
-		$notification = WordPressIntegration::postToNotification($postId);
+		$notification = Db::postToNotification($postId);
 
 		if ($notification === null) {
 			return;
 		}
 
-		NotificationDatabaseService::delete($notification->getHash());
+		Db::delete($notification->getHash());
 	}
 
 	/**
@@ -267,7 +266,7 @@ public function save($postId, $post, $update)
 
 		$data = $_POST;
 
-		$notification = WordPressIntegration::postToNotification($post) ?? new Notification();
+		$notification = Db::postToNotification($post) ?? new Notification();
 
 		// Hash.
 		if (isset($data['post_name'])) {
@@ -327,7 +326,7 @@ public function save($postId, $post, $update)
 		// Hook into this action if you want to save any Notification Post data.
 		do_action('notification/data/save', $notification);
 
-		NotificationDatabaseService::upsert($notification);
+		Db::upsert($notification);
 
 		do_action_deprecated('notification/data/save/after', [$notification], '[Next]', 'notification/data/saved');
 		do_action('notification/data/saved', $notification);
@@ -356,27 +355,21 @@ public function ajaxChangeNotificationStatus()
 
 		$ajax->verify_nonce('change_notification_status_' . $data['post_id']);
 
-		$notification = WordPressIntegration::postToNotification($data['post_id']);
+		$notification = Db::postToNotification($data['post_id']);
 
 		if ($notification === null) {
 			$ajax->error($errorMessage);
 		} else {
 			$notification->setEnabled($data['status'] === 'true');
 
 			do_action('notification/data/save', $notification);
-			NotificationDatabaseService::upsert($notification);
+			Db::upsert($notification);
 			do_action('notification/data/saved', $notification);
 		}
 
 		$ajax->send(true);
 	}
 
-	/**
-	 * --------------------------------------------------
-	 * Notifications.
-	 * --------------------------------------------------
-	 */
-
 	/**
 	 * Gets all Notifications from database.
 	 *
@@ -392,6 +385,6 @@ public static function getAllNotifications()
 			'BracketSpace\Notification\Database\NotificationDatabaseService::getAll'
 		);
 
-		return NotificationDatabaseService::getAll();
+		return Db::getAll();
 	}
 }
diff --git a/src/Admin/Screen.php b/src/Admin/Screen.php
@@ -13,8 +13,8 @@
 
 use BracketSpace\Notification\Core\Notification;
 use BracketSpace\Notification\Core\Templates;
+use BracketSpace\Notification\Database\NotificationDatabaseService as Db;
 use BracketSpace\Notification\Dependencies\Micropackage\Casegnostic\Casegnostic;
-use BracketSpace\Notification\Integration\WordPressIntegration;
 use BracketSpace\Notification\Interfaces;
 use BracketSpace\Notification\Store;
 use BracketSpace\Notification\Dependencies\Micropackage\Ajax\Response;
@@ -78,7 +78,7 @@ public function setupNotification()
 			return;
 		}
 
-		self::$currentNotification = WordPressIntegration::postToNotification($_GET['post']);
+		self::$currentNotification = Db::postToNotification($_GET['post']);
 	}
 
 	/**
@@ -276,7 +276,7 @@ public function renderSaveMetabox($post)
 			[
 				'post_id' => $post->ID,
 				'delete_link_label' => $deleteText,
-				'notification' => WordPressIntegration::postToNotification($post) ?? new Notification(),
+				'notification' => Db::postToNotification($post) ?? new Notification(),
 			]
 		);
 	}
@@ -311,7 +311,7 @@ public function addMergeTagsMetaBox()
 	 */
 	public function renderMergeTagsMetabox($post)
 	{
-		$notification = WordPressIntegration::postToNotification($post) ?? new Notification();
+		$notification = Db::postToNotification($post) ?? new Notification();
 		$trigger = $notification->getTrigger();
 		$triggerSlug = $trigger ? $trigger->getSlug() : false;
 

diff --git a/src/Api/Controller/RepeaterController.php b/src/Api/Controller/RepeaterController.php
@@ -11,7 +11,7 @@
 namespace BracketSpace\Notification\Api\Controller;
 
 use BracketSpace\Notification\Core\Notification;
-use BracketSpace\Notification\Integration\WordPressIntegration;
+use BracketSpace\Notification\Database\NotificationDatabaseService as Db;
 use BracketSpace\Notification\Store;
 
 /**
@@ -102,7 +102,7 @@ public function formFieldData($data = null)
 	 */
 	public function getValues($postId, $carrier, $field)
 	{
-		$notification = WordPressIntegration::postToNotification($postId);
+		$notification = Db::postToNotification($postId);
 
 		if (! $notification instanceof Notification) {
 			return [];

diff --git a/src/Core/Sync.php b/src/Core/Sync.php
@@ -12,7 +12,7 @@
 
 use BracketSpace\Notification\Dependencies\Micropackage\Casegnostic\Casegnostic;
 use BracketSpace\Notification\Dependencies\Micropackage\Filesystem\Filesystem;
-use BracketSpace\Notification\Integration\WordPressIntegration;
+use BracketSpace\Notification\Database\NotificationDatabaseService as Db;
 use function BracketSpace\Notification\addNotification;
 
 /**
@@ -143,7 +143,7 @@ public function deleteLocalJson($postId)
 			return;
 		}
 
-		$notification = WordPressIntegration::postToNotification($postId);
+		$notification = Db::postToNotification($postId);
 
 		if (! $notification instanceof Notification) {
 			return;

diff --git a/src/Database/NotificationDatabaseService.php b/src/Database/NotificationDatabaseService.php
@@ -3,6 +3,8 @@
 /**
  * Notification Database Service.
  *
+ * This class handles both wp_notification* tables and wp_posts table in sync.
+ *
  * @package notification
  */
 
@@ -11,10 +13,13 @@
 namespace BracketSpace\Notification\Database;
 
 use BracketSpace\Notification\Core\Notification;
+use BracketSpace\Notification\Store\Notification as NotificationStore;
 use function BracketSpace\Notification\convertNotificationData;
 
 /**
  * This class describes a notification database service.
+ *
+ * @since [Next]
  */
 class NotificationDatabaseService
 {
@@ -60,6 +65,32 @@ public static function count(): int
 		);
 	}
 
+	/**
+	 * Translates post ID to Notification object
+	 *
+	 * @param int|\WP_Post $post Notification post object or post ID
+	 * @return ?Notification
+	 */
+	public static function postToNotification($post): ?Notification
+	{
+		$hash = get_post_field('post_name', $post, 'raw');
+
+		return NotificationStore::has($hash) ? NotificationStore::get($hash) : null;
+	}
+
+	/**
+	 * Translates Notification to WP_Post
+	 *
+	 * @param string|Notification $notification Notification object or hash.
+	 * @return ?\WP_Post
+	 */
+	public static function notificationToPost($notification): ?\WP_Post
+	{
+		$hash = $notification instanceof Notification ? $notification->getHash() : $notification;
+
+		return get_page_by_path($hash, OBJECT, 'post');
+	}
+
 	/**
 	 * Upserts the Notification database entry.
 	 *

diff --git a/src/Database/Queries/NotificationQueries.php b/src/Database/Queries/NotificationQueries.php
@@ -11,7 +11,7 @@
 namespace BracketSpace\Notification\Database\Queries;
 
 use BracketSpace\Notification\Core\Notification;
-use BracketSpace\Notification\Integration\WordPressIntegration;
+use BracketSpace\Notification\Database\NotificationDatabaseService as Db;
 
 /**
  * Notification Queries class
@@ -49,7 +49,7 @@ public static function all(bool $includingDisabled = false): array
 		}
 
 		foreach ($wpposts as $wppost) {
-			$notification = WordPressIntegration::postToNotification($wppost);
+			$notification = Db::postToNotification($wppost);
 
 			if (!($notification instanceof Notification)) {
 				continue;
@@ -72,6 +72,6 @@ public static function withHash(string $hash)
 	{
 		$post = get_page_by_path($hash, OBJECT, 'notification');
 
-		return empty($post) ? null : WordPressIntegration::postToNotification($post);
+		return empty($post) ? null : Db::postToNotification($post);
 	}
 }