search: updates facets/aggregation

Signed-off-by: Pamfilos Fokianos <[email protected]>

Author: pamfilos

cap/config.py

@@ -374,6 +374,24 @@ def _(x):
             },
             'meta': {'title': 'SM Analysis Characteristics'},
         },
+        'facet_measurement_type': {
+            'terms': {
+                'field': 'general.measurement_type'  # noqa
+            },
+            'meta': {'title': 'Measurement type'},
+        },
+        'facet_power_mW': {
+            'terms': {
+                'field': 'beamline_parameters.laser_parameters.power_mW'  # noqa
+            },
+            'meta': {'title': 'Power (in mw)'},
+        },
+        'facet_isotope': {
+            'terms': {
+                'field': 'general.isotope'  # noqa
+            },
+            'meta': {'title': 'Isotope'},
+        },
         'facet_interpretation': {
             'terms': {
                 'size': 30,
@@ -402,6 +420,18 @@ def _(x):
             },
             'meta': {'title': 'Next Deadline Date', 'type': 'range'},
         },
+        "facet_year": {
+            "terms": {
+                "field": "general.year"
+            },
+            'meta': {'title': 'Data Taking Year'},
+        },
+        "facet_wavelength_nm": {
+            "terms": {
+                "field": "beamline_parameters.laser_parameters.wavelength_nm"
+            },
+            'meta': {'title': 'wavelength_nm'},
+        },
         "facet_target_date": {
             "date_histogram": {
                 "field": "initial.target_date",
@@ -457,6 +487,7 @@ def _(x):
             format='yyyy',
             end_date_math='/y',
         ),
+        'year': terms_filter('general.year'),
         "target_date": range_filter(
             'initial.target_date',
             format='yyyy-MM-dd',
@@ -480,6 +511,16 @@ def _(x):
         'interpretation': terms_filter(
             'basic_info.analysis_keywords.interpretation.keyword'
         ),
+        'measurement_type': terms_filter(
+            'general.measurement_type'
+        ),
+        'power_mW': terms_filter(
+            'beamline_parameters.laser_parameters.power_mW'
+        ),
+        'isotope': terms_filter(
+            'general.isotope'
+        ),
+        'wavelength': terms_filter("beamline_parameters.laser_parameters.wavelength_nm"),
         'further_search_categorisation': terms_filter(
             'basic_info.analysis_keywords.further_search_categorisation.keyword'
         ),  # noqa

tests/integration/deposits/test_get_deposits.py

@@ -416,12 +416,17 @@ def test_get_deposits_with_facets(env_config, client, users, auth_headers_for_us
             'facet_further_search_categorisation',
             'facet_further_search_categorisation_heavy_ion',
             'facet_interpretation',
+            'facet_isotope',
+            'facet_measurement_type',
             'facet_next_deadline_date',
             'facet_physics_theme',
+            'facet_power_mW',
             'facet_sm_analysis_characteristics',
             'facet_stage',
             'facet_target_date',
+            'facet_wavelength_nm',
             'facet_collection',
+            'facet_year',
             'particles',
         ]
     )