From 64d633c64e46a4ec864119aed8a51bfc49aba66e Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Tue, 23 Apr 2024 13:50:46 +1000 Subject: [PATCH] Publish enterprise website with https:// --- engines/dfc_provider/app/services/enterprise_builder.rb | 3 +++ engines/dfc_provider/spec/requests/enterprises_spec.rb | 1 + swagger/dfc.yaml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/engines/dfc_provider/app/services/enterprise_builder.rb b/engines/dfc_provider/app/services/enterprise_builder.rb index b2087c2601..b03d27737d 100644 --- a/engines/dfc_provider/app/services/enterprise_builder.rb +++ b/engines/dfc_provider/app/services/enterprise_builder.rb @@ -23,6 +23,9 @@ class EnterpriseBuilder < DfcBuilder socialMedias: SocialMediaBuilder.social_medias(enterprise), websites: [enterprise.website].compact, ).tap do |e| + # The model strips the protocol and we need to add it: + e.websites = e.websites.map { |url| "https://#{url}" } + add_ofn_property(e, "ofn:long_description", enterprise.long_description) # This could be expressed as dfc-b:hasMainContact Person with name. diff --git a/engines/dfc_provider/spec/requests/enterprises_spec.rb b/engines/dfc_provider/spec/requests/enterprises_spec.rb index 587971a2ec..c205bc62a9 100644 --- a/engines/dfc_provider/spec/requests/enterprises_spec.rb +++ b/engines/dfc_provider/spec/requests/enterprises_spec.rb @@ -71,6 +71,7 @@ describe "Enterprises", type: :request, swagger_doc: "dfc.yaml", rswag_autodoc: expect(json_response["@graph"][0]).to include( "dfc-b:affiliates" => "http://test.host/api/dfc/enterprise_groups/60000", + "dfc-b:websitePage" => "https://openfoodnetwork.org", ) # Insert static value to keep documentation deterministic: diff --git a/swagger/dfc.yaml b/swagger/dfc.yaml index a96c33c2e7..f75cd154dc 100644 --- a/swagger/dfc.yaml +++ b/swagger/dfc.yaml @@ -376,7 +376,7 @@ paths: dfc-b:hasAddress: http://test.host/api/dfc/addresses/40000 dfc-b:hasPhoneNumber: 0404 444 000 200 dfc-b:email: hello@example.org - dfc-b:websitePage: openfoodnetwork.org + dfc-b:websitePage: https://openfoodnetwork.org dfc-b:hasSocialMedia: http://test.host/api/dfc/enterprises/10000/social_medias/facebook dfc-b:logo: '' dfc-b:name: Fred's Farm