diff --git a/apps/core/models.py b/apps/core/models.py index 90a8712..5d4a1ff 100644 --- a/apps/core/models.py +++ b/apps/core/models.py @@ -16,6 +16,7 @@ from wagtail.fields import RichTextField, StreamField from wagtail.models import Orderable, Page from wagtail.snippets.models import register_snippet from wagtail_headless_preview.models import HeadlessPreviewMixin +from apps.core.serializers import SEOImageSerializer from apps.core.blocks import COMMON_BLOCKS @@ -53,6 +54,9 @@ class SEOablePage(HeadlessPreviewMixin, Page): api_fields = [ APIField("seo_title_override"), APIField("seo_description_override"), + APIField("og_image", serializer=SEOImageSerializer()), + APIField("canonical_url"), + APIField("schema_json"), ] class Meta: diff --git a/apps/core/serializers.py b/apps/core/serializers.py index 85453de..20cff9a 100644 --- a/apps/core/serializers.py +++ b/apps/core/serializers.py @@ -13,6 +13,15 @@ def serialize_image(image): return {"url": image.file.url, "title": image.title} +class SEOImageSerializer(serializers.Serializer): + def to_representation(self, image): + data = serialize_image(image) + request = self.context.get("request") + if data and request: + data["url"] = request.build_absolute_uri(data["url"]) + return data + + class TeamMemberSerializer(serializers.Serializer): id = serializers.IntegerField() name = serializers.CharField() diff --git a/apps/core/signals.py b/apps/core/signals.py index 4c1b315..32a9dbc 100644 --- a/apps/core/signals.py +++ b/apps/core/signals.py @@ -19,7 +19,7 @@ def notify_frontend_revalidate(sender, instance, **kwargs): try: requests.post( settings.FRONTEND_REVALIDATE_URL, - json={"tags": [f"page:{instance.id}", instance.url_path]}, + json={"tags": ["wagtail-pages", f"page:{instance.id}", instance.url_path]}, headers={"Authorization": f"Bearer {settings.REVALIDATE_SECRET}"}, timeout=3, ) diff --git a/apps/core/tests.py b/apps/core/tests.py index aed410c..c853d53 100644 --- a/apps/core/tests.py +++ b/apps/core/tests.py @@ -67,6 +67,48 @@ def test_form_block_api_representation_expands_fields(): assert result["form"]["fields"][1]["choices"] == ["产品咨询", "合作洽谈"] +def test_page_api_exposes_seo_fields(home_page): + from wagtail.models import Site + from wagtail.images import get_image_model + from wagtail.images.tests.utils import get_test_image_file + + site = Site.objects.get(is_default_site=True) + site.root_page = home_page + site.save() + image = get_image_model().objects.create(title="Share", file=get_test_image_file()) + page = SimpleContentPage( + title="SEO test", slug="seo-test", seo_title_override="SEO title", + seo_description_override="SEO description", canonical_url="https://example.com/seo-test", + schema_json={"@context": "https://schema.org", "@type": "WebPage"}, + og_image=image, seo_title="Standard title", search_description="Standard description", + ) + home_page.add_child(instance=page) + response = APIClient().get( + f"/api/v2/pages/{page.pk}/?fields=seo_title,search_description,seo_title_override,seo_description_override,og_image,canonical_url,schema_json" + ) + assert response.status_code == 200 + assert response.data["seo_title_override"] == "SEO title" + assert response.data["seo_description_override"] == "SEO description" + assert response.data["canonical_url"] == "https://example.com/seo-test" + assert response.data["schema_json"]["@type"] == "WebPage" + assert response.data["og_image"]["title"] == "Share" + assert response.data["og_image"]["url"].startswith("http://testserver/media/") + assert response.data["meta"]["seo_title"] == "Standard title" + assert response.data["meta"]["search_description"] == "Standard description" + + +def test_seo_image_serializer_returns_absolute_url(): + from types import SimpleNamespace + from rest_framework.test import APIRequestFactory + from apps.core.serializers import SEOImageSerializer + + image = SimpleNamespace(file=SimpleNamespace(url="/media/share.png"), title="Share") + request = APIRequestFactory().get("/api/v2/pages/") + assert SEOImageSerializer(image, context={"request": request}).data == { + "url": "http://testserver/media/share.png", "title": "Share", + } + + def test_form_block_api_representation_handles_empty_form(): block = FormBlock() result = block.get_api_representation({"form": None}) @@ -358,6 +400,7 @@ def test_notify_frontend_revalidate_posts_webhook_when_configured( assert calls[0]["url"] == "https://frontend.example.com/api/revalidate" assert calls[0]["headers"] == {"Authorization": "Bearer test-secret"} assert f"page:{home_page.id}" in calls[0]["json"]["tags"] + assert "wagtail-pages" in calls[0]["json"]["tags"] def test_notify_frontend_revalidate_swallows_request_exception(