Merge pull request #19 from RockefellerArchiveCenter/fornax_post

Fornax post
RockefellerArchiveCenter · Oct 30, 2018 · 2732ff4 · 2732ff4
2 parents e54bdbf + b5d28b4
commit 2732ff4
Show file tree

Hide file tree

Showing 4 changed files with 1,464 additions and 11 deletions.
diff --git a/bagdiscovery/library.py b/bagdiscovery/library.py
@@ -5,6 +5,10 @@
 from structlog import wrap_logger
 from uuid import uuid4
 import tarfile
+
+import requests
+from django.core.serializers.json import DjangoJSONEncoder
+
 from .models import Bag
 from ursa_major import settings
 
@@ -55,6 +59,12 @@ def run(self):
                 except Exception as e:
                     self.log.error("Error moving bag: {}".format(e))
                     raise BagDiscoveryException("Error moving bag: {}".format(e))
+
+                try:
+                    self.post_to_fornax(bag)
+                except Exception as e:
+                    raise BagDiscoveryException("Error sending POST of metadata to Fornax: {}".format(e))
+
             else:
                 continue
         return True
@@ -79,6 +89,13 @@ def move_bag(self, bag):
         bag.bag_path = new_path
         bag.save()
 
+    def post_to_fornax(self, bag):
+        # Have to change this from a hardcoded endpoint. Will update as the Gateway is developed
+        r = requests.post("http://fornax-web:8003/sips/", data=json.dumps(bag.data), headers={"Content-Type": "application/json"})
+        if r.status_code != 200:
+            raise BagDiscoveryException(r.status_code, r.reason)
+        return True
+
 
 def isdatavalid(data):
     requiredKeys = ("extent_files", "url", "acquisition_type", "use_restrictions",

diff --git a/bagdiscovery/tests.py b/bagdiscovery/tests.py
@@ -2,6 +2,7 @@
 from os.path import isdir, join
 from os import makedirs, listdir, remove
 import shutil
+import vcr
 
 from django.test import TestCase
 from django.urls import reverse
@@ -16,6 +17,15 @@
 data_fixture_dir = join(settings.BASE_DIR, 'fixtures', 'json')
 bag_fixture_dir = join(settings.BASE_DIR, 'fixtures', 'bags')
 
+process_vcr = vcr.VCR(
+    serializer='json',
+    cassette_library_dir='fixtures/cassettes',
+    record_mode='once',
+    match_on=['path', 'method', 'query'],
+    filter_query_parameters=['username', 'password'],
+    filter_headers=['Authorization'],
+)
+
 
 class BagTestCase(TestCase):
 
@@ -41,18 +51,19 @@ def createobjects(self):
         self.assertEqual(len(Bag.objects.all()), transfer_count, "Wrong number of transfers created")
 
     def processbags(self):
-        print('*** Test BagDiscovery routine ***')
-        shutil.copytree(bag_fixture_dir, settings.TEST_LANDING_DIR)
-        processor = BagDiscovery(dirs={"landing": settings.TEST_LANDING_DIR, "storage": settings.TEST_STORAGE_DIR}).run()
-        self.assertTrue(processor)
-        for bag in Bag.objects.all():
-            self.assertTrue(bag.data)
+        with process_vcr.use_cassette('process_bags.json'):
+            shutil.copytree(bag_fixture_dir, settings.TEST_LANDING_DIR)
+            processor = BagDiscovery(dirs={"landing": settings.TEST_LANDING_DIR, "storage": settings.TEST_STORAGE_DIR}).run()
+            self.assertTrue(processor)
+            for bag in Bag.objects.all():
+                self.assertTrue(bag.data)
 
     def run_view(self):
-        print('*** Test run view ***')
-        request = self.factory.post(reverse('bagdiscovery'), {"test": True})
-        response = BagDiscoveryView.as_view()(request)
-        self.assertEqual(response.status_code, 200, "Wrong HTTP code")
+        with process_vcr.use_cassette('process_bags.json'):
+            print('*** Test run view ***')
+            request = self.factory.post(reverse('bagdiscovery'), {"test": True})
+            response = BagDiscoveryView.as_view()(request)
+            self.assertEqual(response.status_code, 200, "Wrong HTTP code")
 
     def schema(self):
         print('*** Getting schema view ***')