Merge pull request #3500 from alphagov/update-graphql-queries

Update GraphQL query to use generic edition type
alphagov · Jan 10, 2025 · 745730a · 745730a
2 parents 449d130 + 96590a1
commit 745730a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/app/controllers/content_items_controller.rb b/app/controllers/content_items_controller.rb
@@ -139,7 +139,7 @@ def load_content_item
     @content_item = if use_graphql?
                       graphql_response = Services
                         .publishing_api
-                        .graphql_content_item(Graphql::NewsArticleQuery.new(content_item_path).query)
+                        .graphql_content_item(Graphql::EditionQuery.new(content_item_path).query)
 
                       if graphql_response["schema_name"] == "news_article"
                         PresenterBuilder.new(

diff --git a/app/queries/graphql/news_article_query.rb → app/queries/graphql/edition_query.rb b/app/queries/graphql/news_article_query.rb → app/queries/graphql/edition_query.rb
@@ -1,4 +1,4 @@
-class Graphql::NewsArticleQuery
+class Graphql::EditionQuery
   def initialize(base_path)
     @base_path = base_path
   end
@@ -10,10 +10,25 @@ def query
             base_path: "#{@base_path}",
             content_store: "live",
           ) {
-            ... on NewsArticle {
+            ... on Edition {
               base_path
               description
-              details
+              details {
+              body
+                change_history
+                default_news_image {
+                  alt_text
+                  url
+                }
+                display_date
+                emphasised_organisations
+                first_public_at
+                image {
+                  alt_text
+                  url
+                }
+                political
+              }
               document_type
               first_published_at
               links {

diff --git a/test/controllers/content_items_controller_test.rb b/test/controllers/content_items_controller_test.rb
@@ -110,15 +110,15 @@ class ContentItemsControllerTest < ActionController::TestCase
     base_path = "content-item"
 
     graphql_fixture = fetch_graphql_fixture("news_article")
-    stub_publishing_api_graphql_content_item(Graphql::NewsArticleQuery.new("/#{base_path}").query, graphql_fixture)
+    stub_publishing_api_graphql_content_item(Graphql::EditionQuery.new("/#{base_path}").query, graphql_fixture)
 
     get :show,
         params: {
           path: base_path,
         }
 
     assert_requested :post, "#{PUBLISHING_API_ENDPOINT}/graphql",
-                     body: { query: Graphql::NewsArticleQuery.new("/#{base_path}").query },
+                     body: { query: Graphql::EditionQuery.new("/#{base_path}").query },
                      times: 1
 
     assert_not_requested :get, "#{content_store_endpoint}/content/#{base_path}"
@@ -134,15 +134,15 @@ class ContentItemsControllerTest < ActionController::TestCase
 
     graphql_fixture = fetch_graphql_fixture("news_article")
     graphql_fixture["data"]["edition"]["schema_name"] = "case_study"
-    stub_publishing_api_graphql_content_item(Graphql::NewsArticleQuery.new("/#{base_path}").query, graphql_fixture)
+    stub_publishing_api_graphql_content_item(Graphql::EditionQuery.new("/#{base_path}").query, graphql_fixture)
 
     get :show,
         params: {
           path: path_for(content_item),
         }
 
     assert_requested :post, "#{PUBLISHING_API_ENDPOINT}/graphql",
-                     body: { query: Graphql::NewsArticleQuery.new("/#{base_path}").query }
+                     body: { query: Graphql::EditionQuery.new("/#{base_path}").query }
 
     assert_requested :get, "#{content_store_endpoint}/content/#{base_path}",
                      times: 1