(PXP-6604) DRS endpoint to resolve regardless of prefix

indexd/drs/blueprint.py

@@ -17,7 +17,7 @@ def get_drs_object(object_id):
     """
     expand = True if flask.request.args.get("expand") == "true" else False
 
-    ret = blueprint.index_driver.get(object_id)
+    ret = blueprint.index_driver.get_with_nonstrict_prefix(object_id)
 
     data = indexd_to_drs(ret, expand=expand, list_drs=False)
 

indexd/index/blueprint.py

@@ -248,7 +248,7 @@ def get_index_record(record):
     Returns a record.
     """
 
-    ret = blueprint.index_driver.get(record)
+    ret = blueprint.index_driver.get_with_nonstrict_prefix(record)
 
     return flask.jsonify(ret), 200
 

indexd/index/drivers/alchemy.py

@@ -1,6 +1,7 @@
 import datetime
 import uuid
 import json
+import re
 from contextlib import contextmanager
 from cdislogging import get_logger
 from sqlalchemy import (
@@ -1096,6 +1097,28 @@ def get(self, did, expand=True):
 
             return record.to_document_dict()
 
+    def get_with_nonstrict_prefix(self, did, expand=True):
+        """
+        Attempt to retrieve a record both with and without a prefix.
+        Proxies 'get' with provided id.
+        If not found but prefix matches default, attempt with prefix stripped.
+        If not found and id has no prefix, attempt with default prefix prepended.
+        """
+        try:
+            # Try to resolve id as provided
+            record = self.get(did, expand=expand)
+        except NoRecordFound as e:
+            DEFAULT_PREFIX = self.config.get("DEFAULT_PREFIX")
+            match = re.match(r"(dg\.[0-9a-f]{4}\/)(.+)", did)
+            if match and match.group(1) == DEFAULT_PREFIX:
+                record = self.get(match.group(2), expand=expand)
+            elif match is None:
+                record = self.get(DEFAULT_PREFIX + did, expand=expand)
+            else:
+                raise e
+
+        return record
+
     def update(self, did, rev, changing_fields):
         """
         Updates an existing record with new values.