feat(es): add is_data_embargoed to RunDoc

betagouv · Jul 16, 2024 · 36e7cf6 · 36e7cf6
1 parent adc0d91
commit 36e7cf6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/lab/elasticsearch/catalog.py b/lab/elasticsearch/catalog.py
@@ -63,6 +63,7 @@ def _create_project_page_data(
                 energy_in_kev=run.energy_in_keV,
                 beamline=run.beamline,
                 project_slug=run.project.slug,
+                is_data_embargoed=run.is_data_embargoed,
             ),
             methods=method_model_to_dto(run),
         )
@@ -111,6 +112,7 @@ def _create_object_group_page_data(projects: list[Project], runs: list[Run]):
                 energy_in_kev=run.energy_in_keV,
                 beamline=run.beamline,
                 project_slug=run.project.slug,
+                is_data_embargoed=run.is_data_embargoed,
             ),
             methods=method_model_to_dto(run),
         )

diff --git a/lab/elasticsearch/documents.py b/lab/elasticsearch/documents.py
@@ -64,6 +64,7 @@ class RunDoc(os.InnerDoc):
     beamline = os.Keyword()
     methods = os.Object(MethodDoc, multi=True)
     project_slug = os.Keyword()
+    is_data_embargoed = os.Boolean()
 
     def add_method(
         self,

diff --git a/lab/elasticsearch/tests/test_catalog.py b/lab/elasticsearch/tests/test_catalog.py
@@ -49,6 +49,7 @@ def test_build_project_catalog_document():
             "energy_in_kev": run.energy_in_keV,
             "particle_type": run.particle_type,
             "project_slug": run.project.slug,
+            "is_data_embargoed": run.is_data_embargoed,
         }
     ]
     assert document.project_page_data.object_groups == [
@@ -125,6 +126,7 @@ def test_build_object_group_catalog_document():
             "energy_in_kev": run.energy_in_keV,
             "particle_type": run.particle_type,
             "project_slug": run.project.slug,
+            "is_data_embargoed": run.is_data_embargoed,
         }
     ]
     assert document.object_page_data.projects == [

diff --git a/lab/runs/models.py b/lab/runs/models.py
@@ -87,3 +87,7 @@ def next_status(self) -> Status:
         except IndexError as exception:
             raise AttributeError("Run has no next status") from exception
         return next_status
+
+    @property
+    def is_data_embargoed(self):
+        return self.embargo_date is None or self.embargo_date > timezone.now().date()