Skip to content

568 backend throw exceptions when data sources are not available#22059

Merged
leonidasmi merged 6 commits intotrunkfrom
568-backend-throw-exceptions-when-data-sources-are-not-available
Feb 26, 2025
Merged

568 backend throw exceptions when data sources are not available#22059
leonidasmi merged 6 commits intotrunkfrom
568-backend-throw-exceptions-when-data-sources-are-not-available

Conversation

@thijsoo
Copy link
Copy Markdown
Contributor

@thijsoo thijsoo commented Feb 19, 2025

Context

  • We want to make sure API calls are not done without proper configuration.

Summary

This PR can be summarized in the following changelog entry:

  • Adds protection that ensures api calls are only fired from the repositories in the data sources are configured.

Relevant technical choices:

Test instructions

Test instructions for the acceptance test before the PR gets merged

This PR can be acceptance tested by following these steps:

  • Make sure the following requests work:
    • wp-json/yoast/v1/time_based_seo_metrics?options[widget]=query
    • wp-json/yoast/v1/time_based_seo_metrics?options[widget]=page
    • wp-json/yoast/v1/time_based_seo_metrics?options[widget]=οrganicSessionsDaily
    • wp-json/yoast/v1/time_based_seo_metrics?options[widget]=οrganicSessionsCompare
  • Deactivate Site Kit and repeat the requests
    • Confirm that you get a 400 reponse with the "error": "<repository name> is not available yet. Not all prerequisites have been met." message where <repository name> points to the relevant repository depending on the request
    • Reactivate Site Kit and your requests will be successful again
  • Reset your options to disable the consent and repeat the requests
    • Confirm that you get a 400 reponse with the "error": "<repository name> is not available yet. Not all prerequisites have been met." message where <repository name> points to the relevant repository depending on the request
    • Give consent again and your requests will be successful again
  • Now disconnect GA4 in your sitekit installation and repeat the wp-json/yoast/v1/time_based_seo_metrics?options[widget]=οrganicSessionsDaily request and the wp-json/yoast/v1/time_based_seo_metrics?options[widget]=οrganicSessionsCompare request
    • Confirm that you get a 400 reponse with the "error": "Organic Sessions Repository is not available yet. Not all prerequisites have been met." message
    • Also go to the dashboard page and enter wpseoScriptData.dashboard.siteKitConfiguration.isGAConnected in the console and confirm you get false.
    • Confirm you get proper response for the wp-json/yoast/v1/time_based_seo_metrics?options[widget]=query and wp-json/yoast/v1/time_based_seo_metrics?options[widget]=page requests.
  • Now configure and enable GA4 in your sitekit installation and repeat the wp-json/yoast/v1/time_based_seo_metrics?options[widget]=οrganicSessionsDaily request and the wp-json/yoast/v1/time_based_seo_metrics?options[widget]=οrganicSessionsCompare request
    • Confirm that it works again
    • Also go to the dashboard page and enter wpseoScriptData.dashboard.siteKitConfiguration.isGAConnected in the console and confirm you now get true.
  • Now reset your Site Kit by disconnecting your google account (top right in the Site Kit dashboard) and repeat the requests
    • Confirm that you get a 400 reponse with the "error": "<repository name> is not available yet. Not all prerequisites have been met." message where <repository name> points to the relevant repository depending on the request

Relevant test scenarios

  • Changes should be tested with the browser console open
  • Changes should be tested on different posts/pages/taxonomies/custom post types/custom taxonomies
  • Changes should be tested on different editors (Default Block/Gutenberg/Classic/Elementor/other)
  • Changes should be tested on different browsers
  • Changes should be tested on multisite

Test instructions for QA when the code is in the RC

  • QA should use the same steps as above.

QA can test this PR by following these steps:

Impact check

This PR affects the following parts of the plugin, which may require extra testing:

  • Go to the dashboard page and enter the following in the console. They need to have the same values with this PR and without:
    • wpseoScriptData.dashboard.siteKitConfiguration.isActive
    • wpseoScriptData.dashboard.siteKitConfiguration.isSetupCompleted
    • wpseoScriptData.dashboard.siteKitConfiguration.isConnected

UI changes

  • This PR changes the UI in the plugin. I have added the 'UI change' label to this PR.

Other environments

  • This PR also affects Shopify. I have added a changelog entry starting with [shopify-seo], added test instructions for Shopify and attached the Shopify label to this PR.

Documentation

  • I have written documentation for this change. For example, comments in the Relevant technical choices, comments in the code, documentation on Confluence / shared Google Drive / Yoast developer portal, or other.

Quality assurance

  • I have tested this code to the best of my abilities.
  • During testing, I had activated all plugins that Yoast SEO provides integrations for.
  • I have added unit tests to verify the code works as intended.
  • If any part of the code is behind a feature flag, my test instructions also cover cases where the feature flag is switched off.
  • I have written this PR in accordance with my team's definition of done.
  • I have checked that the base branch is correctly set.

Innovation

  • No innovation project is applicable for this PR.
  • This PR falls under an innovation project. I have attached the innovation label.
  • I have added my hours to the WBSO document.

Fixes #

@thijsoo thijsoo added the changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog label Feb 19, 2025
@thijsoo thijsoo marked this pull request as ready for review February 20, 2025 11:32
@coveralls
Copy link
Copy Markdown

coveralls commented Feb 20, 2025

Pull Request Test Coverage Report for Build 3f76ee4d8a19f7f37ddaf64cb1cb3825804427b0

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 0 of 32 (0.0%) changed or added relevant lines in 6 files are covered.
  • 1053 unchanged lines in 5 files lost coverage.
  • Overall coverage decreased (-0.02%) to 54.456%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/dashboard/domain/time-based-seo-metrics/data-source-not-available-exception.php 0 2 0.0%
src/dashboard/application/search-rankings/top-page-repository.php 0 3 0.0%
src/dashboard/application/traffic/organic-sessions-repository.php 0 3 0.0%
src/dashboard/application/search-rankings/top-query-repository.php 0 4 0.0%
src/dashboard/infrastructure/analytics-4/site-kit-analytics-4-adapter.php 0 4 0.0%
src/dashboard/infrastructure/integrations/site-kit.php 0 16 0.0%
Files with Coverage Reduction New Missed Lines %
src/dashboard/application/search-rankings/top-page-repository.php 1 0.0%
src/dashboard/application/search-rankings/top-query-repository.php 1 0.0%
src/dashboard/application/traffic/organic-sessions-repository.php 1 0.0%
admin/tracking/class-tracking-settings-data.php 7 0.0%
src/generated/container.php 1043 0.38%
Totals Coverage Status
Change from base Build 93db04941ac90d35196a36cc9a46ae7f9c32e957: -0.02%
Covered Lines: 30392
Relevant Lines: 56267

💛 - Coveralls

Copy link
Copy Markdown
Contributor

@leonidasmi leonidasmi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CR: 🚧

Comment thread src/dashboard/application/search-rankings/top-page-repository.php
Comment thread src/dashboard/domain/time-based-seo-metrics/not-onboarded-exception.php Outdated
* @return bool If the entire onboarding has been completed.
*/
public function is_onboarded() {
return ( $this->is_connected() && $this->is_setup_completed() && $this->is_connected() );
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double $this->is_connected()?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops the first one should have been is_enabled to prevent those fatals you mentioned.

Comment thread src/dashboard/domain/time-based-seo-metrics/not-onboarded-exception.php Outdated
Comment thread src/dashboard/application/traffic/organic-sessions-repository.php Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would really like us to extend the Dashboard_Repository_Interface to have a has_available_data_sources() (name TBD) function and then move the checks there for every repository.

In this case, it would be

	public function get_data( Parameters $parameters ): Data_Container {
		if ( ! $this->has_available_data_sources() ) {
			throw new Not_Available_Data_Source_Exception();
		}

		return $this->site_kit_search_console_adapter->get_data( $parameters );
	}

	public function has_available_data_sources() {
		return ( $this->site_kit_configuration->is_onboarded() );
	 }

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We decided that this should be a part of the adapter interface instead. Will implement it outside this PR, to avoid conflicts with #22067

Comment thread src/dashboard/infrastructure/integrations/site-kit.php
Comment thread src/dashboard/infrastructure/integrations/site-kit.php
Copy link
Copy Markdown
Contributor

@leonidasmi leonidasmi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CR + Acceptance is ✅

@leonidasmi leonidasmi added this to the 24.7 milestone Feb 26, 2025
@leonidasmi leonidasmi merged commit ec51cc4 into trunk Feb 26, 2025
@leonidasmi leonidasmi deleted the 568-backend-throw-exceptions-when-data-sources-are-not-available branch February 26, 2025 13:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants