Refactored DownloadLogService to inject service.

Author: colinmurphy

plugins/wpgraphql-logging/src/Admin/View/Download/DownloadLogService.php

@@ -6,7 +6,7 @@
 
 use League\Csv\Writer;
 use WPGraphQL\Logging\Logger\Api\LogEntityInterface;
-use WPGraphQL\Logging\Logger\Store\LogStoreService;
+use WPGraphQL\Logging\Logger\Api\LogServiceInterface;
 
 /**
  * Service for handling log downloads.
@@ -16,6 +16,14 @@
  * @since 0.0.1
  */
 class DownloadLogService {
+	/**
+	 * Constructor.
+	 *
+	 * @param \WPGraphQL\Logging\Logger\Api\LogServiceInterface $log_service The log service.
+	 */
+	public function __construct(protected readonly LogServiceInterface $log_service) {
+	}
+
 	/**
 	 * Generates and serves a CSV file for a single log entry.
 	 *
@@ -30,9 +38,7 @@ public function generate_csv( int $log_id ): void {
 			wp_die( esc_html__( 'Invalid log ID.', 'wpgraphql-logging' ) );
 		}
 
-
-		$log_service = LogStoreService::get_log_service();
-		$log         = $log_service->find_entity_by_id( $log_id );
+		$log = $this->log_service->find_entity_by_id( $log_id );
 
 		if ( is_null( $log ) ) {
 			wp_die( esc_html__( 'Log not found.', 'wpgraphql-logging' ) );

plugins/wpgraphql-logging/src/Admin/ViewLogsPage.php

@@ -245,7 +245,6 @@ protected function get_post_value(string $key): ?string {
 	 * Renders the list page for log entries.
 	 */
 	protected function render_list_page(): void {
-		// Variable required for list template.
 		$list_table    = new ListTable( new LogsRepository() ); // @phpcs:ignore SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable
 		$list_template = apply_filters(
 			'wpgraphql_logging_list_template',
@@ -263,7 +262,7 @@ protected function process_log_download(): void {
 		}
 
 		$log_id     = isset( $_GET['log'] ) ? absint( $_GET['log'] ) : 0; // @phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$downloader = new DownloadLogService();
+		$downloader = new DownloadLogService( $this->get_log_service() );
 		$downloader->generate_csv( $log_id );
 	}
 

plugins/wpgraphql-logging/tests/wpunit/Admin/View/Download/DownloadLogServiceTest.php

@@ -21,7 +21,7 @@
 class DownloadLogServiceTest extends WPTestCase {
 
 	private DownloadLogService $service;
-	private WordPressDatabaseLogService $repository;
+	private WordPressDatabaseLogService $log_service;
 
 	protected array $fixture =  [
 		'channel'    => 'wpgraphql_logging',
@@ -54,8 +54,8 @@ class DownloadLogServiceTest extends WPTestCase {
 
 	public function setUp(): void {
 		parent::setUp();
-		$this->service = new DownloadLogService();
-		$this->repository = new WordPressDatabaseLogService();
+		$this->log_service = new WordPressDatabaseLogService();
+		$this->service = new DownloadLogService($this->log_service);
 	}
 
 	public function set_as_admin(): void {
@@ -107,11 +107,11 @@ public function test_generate_csv_returns_valid_csv(): void {
 		$entity->shouldReceive('get_extra')->andReturn($this->fixture['extra']);
 
 		// Mock the repository to return our mocked entity
-		$this->repository = \Mockery::mock(WordPressDatabaseLogService::class);
-		$this->repository->shouldReceive('find_entity_by_id')->with(123)->andReturn($entity);
+		$this->log_service = \Mockery::mock(WordPressDatabaseLogService::class);
+		$this->log_service->shouldReceive('find_entity_by_id')->with(123)->andReturn($entity);
 
 		// Inject the mocked repository into the service
-		$this->service = new DownloadLogService($this->repository);
+		$this->service = new DownloadLogService($this->log_service);
 
 		$log_id = 123;