oai-pmh follows the switch

share/oaipmh/views.py

@@ -4,6 +4,7 @@
 
 from share.oaipmh.legacy.repository import OAIRepository as LegacyRepository
 from share.oaipmh.fmr_repository import OaiPmhRepository
+from share.search.elastic_manager import ElasticManager
 
 
 class OAIPMHView(View):
@@ -16,14 +17,23 @@ def post(self, request):
         return self.oai_response(**request.POST)
 
     def oai_response(self, **kwargs):
-        use_legacy_pipeline = (
-            settings.SHARE_LEGACY_PIPELINE
-            and not kwargs.pop('pls_trove', False)
-        )
-        if use_legacy_pipeline:
+        use_legacy_repository = self._should_use_legacy_repository(kwargs.pop('pls_trove', False))
+
+        if use_legacy_repository:
             repository = LegacyRepository()
         else:
             repository = OaiPmhRepository()
 
         xml = repository.handle_request(self.request, kwargs)
         return HttpResponse(xml, content_type=self.CONTENT_TYPE)
+
+    def _should_use_legacy_repository(self, pls_trove):
+        if pls_trove or not settings.SHARE_LEGACY_PIPELINE:
+            return False
+
+        # TEMPORARY HACK -- i mean it this time -- very specific to May 2021
+        # check whether the primary elasticsearch alias points at the "old" or "new" index
+        primary_indexes = ElasticManager().get_primary_indexes()
+
+        # old index name from settings.ELASTICSEARCH['INDEXES']
+        return (primary_indexes == ['share_customtax_1'])

share/search/elastic_manager.py

@@ -82,16 +82,19 @@ def send_actions_sync(self, actions):
     def refresh_indexes(self, index_names):
         self.es_client.indices.refresh(index=','.join(index_names))
 
-    def update_primary_alias(self, primary_index_name):
+    def get_primary_indexes(self):
         alias = settings.ELASTICSEARCH['PRIMARY_INDEX']
 
-        previous_indexes = []
-
         try:
-            existing_aliases = self.es_client.indices.get_alias(name=alias)
-            previous_indexes = list(existing_aliases.keys())
+            aliases = self.es_client.indices.get_alias(name=alias)
+            return list(aliases.keys())
         except NotFoundError:
-            pass
+            return []
+
+    def update_primary_alias(self, primary_index_name):
+        alias = settings.ELASTICSEARCH['PRIMARY_INDEX']
+
+        previous_indexes = self.get_primary_indexes()
 
         if previous_indexes == [primary_index_name]:
             logger.warn(f'index {primary_index_name} is already the primary')

tests/share/test_oaipmh.py

@@ -3,11 +3,13 @@
 import pytest
 import random
 from lxml import etree
+from unittest.mock import patch
 
 from django.test.client import Client
 
 from share import models
 from share.oaipmh.util import format_datetime
+from share.oaipmh.views import OAIPMHView
 from share.util import IDObfuscator
 
 from tests.share.models import factories
@@ -20,6 +22,12 @@
 }
 
 
+@pytest.fixture(autouse=True)
+def ensure_legacy_oaipmh():
+    with patch.object(OAIPMHView, '_should_use_legacy_repository', return_value=True):
+        yield
+
+
 @pytest.fixture
 def oai_works():
     return [factories.PreprintFactory() for i in range(17)]

tests/share/test_oaipmh_trove.py

@@ -3,11 +3,13 @@
 import pytest
 import random
 from lxml import etree
+from unittest.mock import patch
 
 from django.test.client import Client
 
 from share.models import SourceUniqueIdentifier, FormattedMetadataRecord
 from share.oaipmh.util import format_datetime
+from share.oaipmh.views import OAIPMHView
 from share.util import IDObfuscator
 
 from tests.factories import FormattedMetadataRecordFactory, SourceFactory
@@ -20,12 +22,14 @@
 }
 
 
+@pytest.fixture(autouse=True)
+def ensure_non_legacy_oaipmh():
+    with patch.object(OAIPMHView, '_should_use_legacy_repository', return_value=False):
+        yield
+
+
 def oai_request(data, pls_post, expect_errors=False):
     client = Client()
-    data = {
-        **data,
-        'pls_trove': True,
-    }
     if pls_post:
         response = client.post('/oai-pmh/', data)
     else: