removing dirs and POST callback, fixes #119 and fixes #120

docker-compose.yml

@@ -10,7 +10,6 @@ services:
  entrypoint: /code/entrypoint.sh
  volumes:
  - .:/code
- - ~/.am/ss-location-data:/code/archivematica_transfer_source/
  ports:
  - "8003:8003"
  depends_on:

entrypoint.sh

@@ -14,8 +14,5 @@ fi
 echo "Apply database migrations"
 python manage.py migrate
 
-echo "Create dirs"
-python manage.py shell < make_dirs.py
-
 echo "Starting server"
 python manage.py runserver 0.0.0.0:8003

fornax/config.py.example

@@ -15,11 +15,8 @@ ALLOWED_HOSTS = ['fornax-web', 'localhost']
 BASE_DIR = ''
 
 SRC_DIR = '{}/src'.format(BASE_DIR)
-TEST_SRC_DIR = '{}/src_test'.format(BASE_DIR)
 TMP_DIR = '{}/tmp'.format(BASE_DIR)
-TEST_TMP_DIR = '{}/tmp_test'.format(BASE_DIR)
 DEST_DIR = '{}/dest'.format(BASE_DIR)
-TEST_DEST_DIR = '{}/dest_test'.format(BASE_DIR)
 
 PROCESSING_CONFIG_DIR = 'processing_configs'
 PROCESSING_CONFIG = 'processingMCP.xml'
@@ -51,4 +48,6 @@ ARCHIVEMATICA = {
  }
 }
 
-STATIC_ROOT = '/static'
+STATIC_ROOT = "/static"
+
+CLEANUP_URL = "http://ursa-major-web:8005/cleanup/"

fornax/settings.py

@@ -116,14 +116,12 @@
 STATIC_ROOT = CF.STATIC_ROOT
 
 SRC_DIR = CF.SRC_DIR
-TEST_SRC_DIR = CF.TEST_SRC_DIR
 TMP_DIR = CF.TMP_DIR
-TEST_TMP_DIR = CF.TEST_TMP_DIR
 DEST_DIR = CF.DEST_DIR
-TEST_DEST_DIR = CF.TEST_DEST_DIR
 PROCESSING_CONFIG_DIR = CF.PROCESSING_CONFIG_DIR
 PROCESSING_CONFIG = CF.PROCESSING_CONFIG
 ARCHIVEMATICA = CF.ARCHIVEMATICA
+CLEANUP_URL = CF.CLEANUP_URL
 
 REST_FRAMEWORK = {
  'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',

sip_assembly/routines.py

@@ -45,11 +45,11 @@ def get_processing_config(self, client):
 class SIPAssembler(ArchivematicaRoutine):
  """Creates an Archivematica-compliant SIP."""
 
- def __init__(self, dirs=None):
+ def __init__(self):
  super(SIPAssembler, self).__init__()
- self.src_dir = dirs['src'] if dirs else settings.SRC_DIR
- self.tmp_dir = dirs['tmp'] if dirs else settings.TMP_DIR
- self.dest_dir = dirs['dest'] if dirs else settings.DEST_DIR
+ self.src_dir = settings.SRC_DIR
+ self.tmp_dir = settings.TMP_DIR
+ self.dest_dir = settings.DEST_DIR
  for dir in [self.src_dir, self.tmp_dir, self.dest_dir]:
  if not isdir(dir):
  raise SIPAssemblyError("Directory does not exist", dir)
@@ -168,14 +168,11 @@ class CleanupRequester:
  another service.
  """
 
- def __init__(self, url):
- self.url = url
-
  def run(self):
  sip_ids = []
  for sip in SIP.objects.filter(process_status=SIP.APPROVED):
  r = requests.post(
- self.url,
+ settings.CLEANUP_URL,
  data=json.dumps({"identifier": sip.bag_identifier}),
  headers={"Content-Type": "application/json"},
  )
@@ -191,9 +188,9 @@ def run(self):
 class CleanupRoutine:
  """Removes files in destination directory."""
 
- def __init__(self, identifier, dirs):
+ def __init__(self, identifier):
  self.identifier = identifier
- self.dest_dir = dirs['dest'] if dirs else settings.DEST_DIR
+ self.dest_dir = settings.DEST_DIR
  if not self.identifier:
  raise CleanupError(
  "No identifier submitted, unable to perform CleanupRoutine.",)

sip_assembly/tests.py

@@ -32,9 +32,9 @@
 class SIPAssemblyTest(TestCase):
  def setUp(self):
  self.factory = APIRequestFactory()
- self.src_dir = settings.TEST_SRC_DIR
- self.tmp_dir = settings.TEST_TMP_DIR
- self.dest_dir = settings.TEST_DEST_DIR
+ self.src_dir = settings.SRC_DIR
+ self.tmp_dir = settings.TMP_DIR
+ self.dest_dir = settings.DEST_DIR
  if isdir(self.src_dir):
  shutil.rmtree(self.src_dir)
  shutil.copytree(bag_fixture_dir, self.src_dir)
@@ -61,17 +61,14 @@ def create_sip(self):
  def process_sip(self):
  with assembly_vcr.use_cassette('process_sip.json'):
  print('*** Processing SIPs ***')
- assembly = SIPAssembler(dirs={'src': self.src_dir,
- 'tmp': self.tmp_dir,
- 'dest': self.dest_dir}).run()
+ assembly = SIPAssembler().run()
  self.assertNotEqual(False, assembly)
 
  def cleanup_sip(self):
  print('*** Cleaning up ***')
  for sip in SIP.objects.all():
  CleanupRoutine(
- sip.bag_identifier, dirs={
- "dest": self.dest_dir}).run()
+ sip.bag_identifier).run()
  self.assertEqual(0, len(listdir(self.dest_dir)))
 
  def archivematica_views(self):
@@ -117,15 +114,13 @@ def archivematica_views(self):
  def request_cleanup(self):
  print('*** Requesting cleanup ***')
  with assembly_vcr.use_cassette('request_cleanup.json'):
- cleanup = CleanupRequester(
- 'http://ursa-major-web:8005/cleanup/').run()
+ cleanup = CleanupRequester().run()
  self.assertNotEqual(False, cleanup)
 
  def run_view(self):
  with assembly_vcr.use_cassette('process_sip.json'):
  print('*** Test run view ***')
- request = self.factory.post(
- reverse('assemble-sip'), {"test": True})
+ request = self.factory.post(reverse('assemble-sip'))
  response = SIPAssemblyView.as_view()(request)
  self.assertEqual(
  response.status_code,
@@ -141,8 +136,7 @@ def cleanup_view(self):
  print('*** Test cleanup view ***')
  for sip in SIP.objects.all():
  request = self.factory.post(
- reverse('cleanup'), data={
- "test": True, "identifier": sip.bag_identifier})
+ reverse('cleanup'), data={"identifier": sip.bag_identifier})
  response = CleanupRoutineView.as_view()(request)
  self.assertEqual(
  response.status_code,

sip_assembly/views.py

@@ -1,4 +1,3 @@
-import urllib
 from os.path import join
 
 from asterism.views import prepare_response
@@ -107,9 +106,8 @@ class BaseRoutineView(APIView):
  """Base view for routines. Provides a `get_args()` method which is overriden by child routines."""
 
  def post(self, request, format=None):
- args = self.get_args(request)
  try:
- response = self.routine(*args).run()
+ response = self.routine().run()
  return Response(prepare_response(response), status=200)
  except Exception as e:
  return Response(prepare_response(e), status=500)
@@ -119,29 +117,19 @@ class SIPAssemblyView(BaseRoutineView):
  """Runs the AssembleSIPs cron job. Accepts POST requests only."""
  routine = SIPAssembler
 
- def get_args(self, request):
- dirs = ({'src': settings.TEST_SRC_DIR, 'tmp': settings.TEST_TMP_DIR, 'dest': settings.TEST_DEST_DIR}
- if request.POST.get('test') else None)
- return (dirs,)
-
 
 class CleanupRequestView(BaseRoutineView):
  """Sends request to previous microservice to clean up source directory."""
  routine = CleanupRequester
 
- def get_args(self, request):
- url = request.GET.get('post_service_url')
- data = (urllib.parse.unquote(url) if url else '')
- return (data,)
-
 
-class CleanupRoutineView(BaseRoutineView):
+class CleanupRoutineView(APIView):
  """Removes a transfer from the destination directory. Accepts POST requests only."""
- routine = CleanupRoutine
-
- def get_args(self, request):
- dirs = {
- "src": settings.TEST_SRC_DIR,
- "dest": settings.TEST_DEST_DIR} if request.POST.get('test') else None
- identifier = request.data.get('identifier')
- return (identifier, dirs)
+
+ def post(self, request, format=None):
+  try:
+  identifier = request.data.get('identifier')
+ response = CleanupRoutine(identifier).run()
+ return Response(prepare_response(response), status=200)
+ except Exception as e:
+  return Response(prepare_response(e), status=500)