Merge pull request #88 from ecmwf-projects/cache-control

Cache control
ecmwf-projects · Oct 11, 2024 · 237e1ee · 237e1ee
2 parents 5a2e8e6 + 950c0bd
commit 237e1ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cads_catalogue_api_service/main.py b/cads_catalogue_api_service/main.py
@@ -71,7 +71,7 @@ async def lifespan(application: fastapi.FastAPI):
         BrotliMiddleware,
         PrometheusMiddleware,
         stac_fastapi.api.middleware.CORSMiddleware,
-        # middlewares.CacheControlMiddleware,
+        middlewares.CacheControlMiddleware,
         middlewares.LoggerInitializationMiddleware,
     ],
     # FIXME: this must be different from site to site

diff --git a/cads_catalogue_api_service/schema_org.py b/cads_catalogue_api_service/schema_org.py
@@ -113,7 +113,9 @@ def schema_org_json_ld(
         distribution=[
             (
                 models.schema_org.DataDownload(
-                    encodingFormat=collection.get("file_format"),
+                    encodingFormat=collection.get("file_format")
+                    # Sometimes the file_format is not defined on the input data
+                    or "application/octet-stream",
                     contentUrl=f"{url}?tab=download",
                 )
                 if distribution

diff --git a/tests/test_40_schema_org.py b/tests/test_40_schema_org.py
@@ -136,7 +136,7 @@ def test_schema_org_jsonId(monkeypatch) -> None:
         "distribution": [
             {
                 "@type": "DataDownload",
-                "encodingFormat": "",
+                "encodingFormat": "application/octet-stream",
                 "contentUrl": "http://localhost:8080/api/catalogue/v1/collections/era5-something?tab=download",
             }
         ],