Fix for organization and foundational filtering in 2.1.1

Author: bo-lu

deployment/lambda-search/app.py

@@ -404,6 +404,7 @@ def lambda_handler(event, context):
     type_filter = event.get('type', None)
     protocol_filter = event.get('protocol', None)
     mappable_filter = event.get('mappable', None)
+    foundational_filter = event.get('foundational', None)
     eoCollection_filter = event.get('eo_collection', None)
     polarization_filter = event.get('polarization', None)
     orbit_direction_filter = event.get('orbit_direction', None)
@@ -443,6 +444,9 @@ def lambda_handler(event, context):
     if mappable_filter:
         mappable_field = filter_config["mappable"]  # Get field paths from config
         filters.append(build_wildcard_filter(mappable_field, mappable_filter))
+    if foundational_filter:
+        foundational_field = filter_config["foundational"]  # Get field paths from config
+        filters.append(build_wildcard_filter(foundational_field, foundational_filter))
     if eoCollection_filter:
         eo_collection_field = filter_config["eo_collection"]  # Get field paths from config
         filters.append(build_wildcard_filter(eo_collection_field, eoCollection_filter))
@@ -476,20 +480,18 @@ def lambda_handler(event, context):
     # If no filters are specified, set filters to None
     filters = filters if filters else None
 
-    print("filters : ", filters)
+    #print("filters : ", filters)
 
     ####
     #OpenSearch DashBoard code
     ####
     ip_address = event.get('ip_address', '') or ''
+    #print("ip_address", ip_address)
     ip_address_forward = event.get('ip_address_forward', '') or ''
-    print("ip_address_forward", ip_address_forward)
-
+    #print("ip_address_forward", ip_address_forward)
     if ip_address_forward:
-        ip_address = ip_address_forward.split(',')[0].strip() #Use first forwarded IP address if it exists
-    
-    print("ip_address", ip_address)
-
+        ip_address = ip_address_forward.split(',')[0].strip() #Use first forwarded IP address if it exists   
+    #print("final ip", ip_address)
     timestamp = event.get('timestamp', '') or ''
     user_agent = event.get('user_agent', '') or ''
     http_method = event.get('http_method', '') or ''

deployment/lambda-search/dashboard.py

@@ -52,7 +52,6 @@ def create_opensearch_index(os_client, index_name):
                     "lang": {"type": "keyword"},
                     "id": {"type": "keyword"},
                     "q": {"type": "keyword"},
-                    "ip_address": {"type": "ip"},
                     "user_agent": {"type": "keyword"},
                     "http_method": {"type": "keyword"},
                     "sort_param": {"type": "keyword"},

deployment/lambda-search/filter_builder.py

@@ -26,8 +26,6 @@ def build_wildcard_filter(field_paths, values):
         for field_path in field_paths
     ]
 
-    print(should_clauses)
-
     return {
         "bool": {
             "should": should_clauses,

deployment/lambda-search/filter_config.json

@@ -12,12 +12,11 @@
         "topicCategory.keyword"
     ],
     "org": [
-        "contact.organisation.en.keyword",
-        "contact.organisation.fr.keyword"
+        "organisation.en.keyword",
+        "organisation.fr.keyword"
     ],
     "foundational": [
-        "contact.keywords.en.keyword",
-        "contact.keywords.fr.keyword"
+        "foundational.keyword"
     ],
     "source_system": [
         "systemName.keyword"