Merge pull request #157 from RockefellerArchiveCenter/development

Add changes from development

Includes fixes to #153 and #149

requirements.in

@@ -2,12 +2,11 @@ ArchivesSnake==0.9.1
 asterism==0.7.2
 Django==3.2.5
 djangorestframework==3.12.4
-ElectronBonder==0.7.2
+ElectronBonder==0.8
 health-check==3.4.1
 iso-639==0.4.5
 iso8601==0.1.14
 odin==1.7.0
 psycopg2-binary==2.9.1
 PyYAML==5.4.1
 uritemplate==3.0.1
-vcrpy==4.1.1

requirements.txt

@@ -18,7 +18,7 @@ boltons==21.0.0
     # via archivessnake
 certifi==2021.5.30
     # via requests
-charset-normalizer==2.0.1
+charset-normalizer==2.0.4
     # via requests
 clinner==1.12.3
     # via health-check
@@ -33,7 +33,7 @@ djangorestframework==3.12.4
     # via
     #   -r requirements.in
     #   asterism
-electronbonder==0.7.2
+electronbonder==0.8
     # via -r requirements.in
 gitdb==4.0.7
     # via gitpython
@@ -42,17 +42,13 @@ gitpython==3.1.18
 health-check==3.4.1
     # via -r requirements.in
 idna==3.2
-    # via
-    #   requests
-    #   yarl
+    # via requests
 iso-639==0.4.5
     # via -r requirements.in
 iso8601==0.1.14
     # via -r requirements.in
 more-itertools==8.8.0
     # via archivessnake
-multidict==5.1.0
-    # via yarl
 odin==1.7.0
     # via
     #   -r requirements.in
@@ -68,7 +64,6 @@ pyyaml==5.4.1
     #   -r requirements.in
     #   archivessnake
     #   health-check
-    #   vcrpy
 rapidfuzz==1.4.1
     # via archivessnake
 requests==2.26.0
@@ -79,7 +74,6 @@ six==1.16.0
     # via
     #   electronbonder
     #   odin
-    #   vcrpy
 smmap==4.0.0
     # via gitdb
 sqlparse==0.4.1
@@ -91,14 +85,7 @@ typing-extensions==3.10.0.0
     #   asgiref
     #   gitpython
     #   structlog
-    #   yarl
 uritemplate==3.0.1
     # via -r requirements.in
 urllib3==1.26.6
     # via requests
-vcrpy==4.1.1
-    # via -r requirements.in
-wrapt==1.12.1
-    # via vcrpy
-yarl==1.6.3
-    # via vcrpy

transformer/clients.py

@@ -135,7 +135,7 @@ def find_bag_by_id(self, identifier, **kwargs):
             if count != 1:
                 raise UrsaMajorClientError("Found {} bags matching id {}, expected 1".format(count, identifier))
             bag_url = bag_resp.get("results")[0]["url"]
-            return self.send_request("get", bag_url)
+            return self.retrieve(bag_url)
         except Exception as e:
             raise UrsaMajorClientError("Error finding bag by id: {}".format(e))
 
@@ -148,9 +148,16 @@ def __init__(self, baseurl, username, password):
         if not self.client.authorize():
             raise AuroraClientError("Could not authorize {} in Aurora".format(username))
 
-    def update(self, url, data, **kwargs):
-        resp = self.client.put(url, data=json.dumps(data), headers={"Content-Type": "application/json"}, **kwargs)
+    def update(self, raw_url, data, **kwargs):
+        """Sends a PATCH request.
+
+        URL parsing strips the hostname off the URL so that the hostname
+        configured for AuroraClient is always used."""
+        identifier = raw_url.rstrip("/").split("/")[-1]
+        prefix = raw_url.rstrip("/").split("/")[-2]
+        url = "/{}/{}/".format(prefix.lstrip("/"), identifier.lstrip("/"))
+        resp = self.client.patch(url, data=json.dumps(data), headers={"Content-Type": "application/json"}, **kwargs)
         if resp.status_code == 200:
             return resp.json()
         else:
-            raise AuroraClientError("Error sending request {} to Aurora: {}".format(url, resp.json()))
+            raise AuroraClientError("Error sending request {} to Aurora: {}".format(url, resp.text))

transformer/fixtures/archivesspace_archival_object.json

@@ -0,0 +1,106 @@
+{
+    "lock_version": 19,
+    "position": 14,
+    "publish": true,
+    "ref_id": "f87164e3d5c24a0b86f823528c0a42b5",
+    "title": "American Foundation for the Blind - Drama",
+    "display_string": "American Foundation for the Blind - Drama",
+    "restrictions_apply": false,
+    "created_by": "admin",
+    "last_modified_by": "admin",
+    "create_time": "2014-12-06T03:44:11Z",
+    "system_mtime": "2021-08-18T15:59:07Z",
+    "user_mtime": "2021-08-18T15:59:07Z",
+    "suppressed": false,
+    "is_slug_auto": false,
+    "level": "file",
+    "jsonmodel_type": "archival_object",
+    "external_ids": [
+        {
+            "external_id": "728884",
+            "source": "Archivists Toolkit Database::RESOURCE_COMPONENT",
+            "created_by": "admin",
+            "last_modified_by": "admin",
+            "create_time": "2021-08-18T15:59:27Z",
+            "system_mtime": "2021-08-18T15:59:27Z",
+            "user_mtime": "2021-08-18T15:59:27Z",
+            "jsonmodel_type": "external_id"
+        }
+    ],
+    "subjects": [],
+    "linked_events": [],
+    "extents": [],
+    "lang_materials": [],
+    "dates": [],
+    "external_documents": [],
+    "rights_statements": [],
+    "linked_agents": [],
+    "ancestors": [
+        {
+            "ref": "/repositories/2/archival_objects/12330",
+            "level": "subseries"
+        },
+        {
+            "ref": "/repositories/2/archival_objects/12062",
+            "level": "series"
+        },
+        {
+            "ref": "/repositories/2/resources/93",
+            "level": "collection"
+        }
+    ],
+    "instances": [
+        {
+            "lock_version": 0,
+            "created_by": "admin",
+            "last_modified_by": "admin",
+            "create_time": "2021-08-18T15:59:27Z",
+            "system_mtime": "2021-08-18T15:59:27Z",
+            "user_mtime": "2021-08-18T15:59:27Z",
+            "instance_type": "mixed materials",
+            "jsonmodel_type": "instance",
+            "is_representative": false,
+            "sub_container": {
+                "lock_version": 0,
+                "indicator_2": "876",
+                "created_by": "admin",
+                "last_modified_by": "admin",
+                "create_time": "2021-08-18T15:59:27Z",
+                "system_mtime": "2021-08-18T15:59:27Z",
+                "user_mtime": "2021-08-18T15:59:27Z",
+                "type_2": "folder",
+                "jsonmodel_type": "sub_container",
+                "top_container": {
+                    "ref": "/repositories/2/top_containers/11192"
+                }
+            }
+        }
+    ],
+    "notes": [
+        {
+            "jsonmodel_type": "note_multipart",
+            "persistent_id": "c0225216f8cc5a0773e2cb3b7b98da1f",
+            "label": "Scope and Contents note",
+            "type": "scopecontent",
+            "subnotes": [
+                {
+                    "jsonmodel_type": "note_text",
+                    "content": "Theater, performing arts, Children, disabilities.\n\n",
+                    "publish": true
+                }
+            ],
+            "publish": true
+        }
+    ],
+    "uri": "/repositories/2/archival_objects/12345",
+    "repository": {
+        "ref": "/repositories/2"
+    },
+    "resource": {
+        "ref": "/repositories/2/resources/93"
+    },
+    "parent": {
+        "ref": "/repositories/2/archival_objects/12330"
+    },
+    "has_unpublished_ancestor": false
+}

transformer/fixtures/package_data/aurora-aip.json

@@ -0,0 +1,6 @@
+{
+    "uri": "http://fedora.dev.rockarch.org:8080/fedora/rest/30576005-bd3a-41eb-bb60-feac49804814",
+    "identifier": "69ef97fe-c837-418a-9c3c-7246a4a36e5b",
+    "package_type": "aip",
+    "origin": "aurora"
+}

fixtures/data/c33ff643-0f1b-4fa8-9105-08d2e6a9e0d5.json → transformer/fixtures/package_data/aurora-dip.json

@@ -1,6 +1,6 @@
 {
-    "uri": "http://fedora.dev.rockarch.org:8080/fedora/rest/fdec6c9b-f1c7-4d04-a5a3-68e018e4d66a",
+    "uri": "http://fedora.dev.rockarch.org:8080/fedora/rest/0b626fe8-52c0-4b73-b243-b33f2c552f35",
     "identifier": "69ef97fe-c837-418a-9c3c-7246a4a36e5b",
     "package_type": "dip",
     "origin": "aurora"
-}
+}

transformer/fixtures/package_data/digitization-aip.json

@@ -0,0 +1,7 @@
+{
+    "uri": "http://fedora.dev.rockarch.org:8080/fedora/rest/e6421665-e5ec-498a-9505-0e51c6a9e4a3",
+    "identifier": "69ef97fe-c837-418a-9c3c-7246a4a36e5b",
+    "archivesspace_uri": "/repositories/2/archival_objects/1234",
+    "package_type": "aip",
+    "origin": "digitization"
+}

transformer/fixtures/package_data/digitization-dip.json

@@ -0,0 +1,7 @@
+{
+    "uri": "http://fedora.dev.rockarch.org:8080/fedora/rest/801d883c-f1b3-4e3f-a280-92feff0666ad",
+    "identifier": "69ef97fe-c837-418a-9c3c-7246a4a36e5b",
+    "archivesspace_uri": "/repositories/2/archival_objects/1234",
+    "package_type": "dip",
+    "origin": "digitization"
+}

transformer/fixtures/package_data/legacy-digital-aip.json

@@ -0,0 +1,7 @@
+{
+    "uri": "http://fedora.dev.rockarch.org:8080/fedora/rest/237c875d-9072-4495-9875-9e1837dab2a8",
+    "identifier": "69ef97fe-c837-418a-9c3c-7246a4a36e5b",
+    "archivesspace_uri": "/repositories/2/archival_objects/1234",
+    "package_type": "aip",
+    "origin": "legacy_digital"
+}

transformer/fixtures/package_data/legacy-digital-dip.json

@@ -0,0 +1,7 @@
+{
+    "uri": "http://fedora.dev.rockarch.org:8080/fedora/rest/ac15614d-3a59-4281-9d41-51e38fcc84c3",
+    "identifier": "69ef97fe-c837-418a-9c3c-7246a4a36e5b",
+    "archivesspace_uri": "/repositories/2/archival_objects/1234",
+    "package_type": "dip",
+    "origin": "legacy_digital"
+}

transformer/fixtures/package_data/no-origin-aip.json

@@ -0,0 +1,5 @@
+{
+    "uri": "http://fedora.dev.rockarch.org:8080/fedora/rest/8a57b436-a6b1-4d49-9119-2a88b1c41a2b",
+    "identifier": "69ef97fe-c837-418a-9c3c-7246a4a36e5b",
+    "package_type": "aip"
+}

transformer/fixtures/package_data/no-origin-dip.json

@@ -0,0 +1,5 @@
+{
+    "uri": "http://fedora.dev.rockarch.org:8080/fedora/rest/d990131c-2bca-45f2-99fc-02f1a0134eab",
+    "identifier": "69ef97fe-c837-418a-9c3c-7246a4a36e5b",
+    "package_type": "dip"
+}