almost passing tests

rowers/views/statements.py

@@ -271,7 +271,6 @@ from rq import Queue,cancel_job
 from django.utils.crypto import get_random_string
 
 from django.core.cache import cache
-#from django_mailbox.models import Message,Mailbox,MessageAttachment
 
 from rules.contrib.views import permission_required, objectgetter
 

rowers/views/workoutviews.py

@@ -5435,26 +5435,15 @@ def workout_upload_view(request,
                     title = t,
                     notes=notes,
                 )
-            else: # pragma: no cover
-                workoutsbox = Mailbox.objects.filter(name='workouts')[0]
-                uploadoptions['fromuploadform'] = True
-                bodyyaml = yaml.safe_dump(
-                    uploadoptions,
-                    default_flow_style=False
-                )
-                msg = Message(mailbox=workoutsbox,
-                              from_header=r.user.email,
-                              subject = t,body=bodyyaml)
-                msg.save()
-                f3 = 'media/mailbox_attachments/'+f2[6:]
-                copyfile(f2,f3)
-                f3 = f3[6:]
-                a = MessageAttachment(message=msg,document=f3)
-                try:
-                    a.save()
-                except DataError:
-                    pass
-                os.remove(f2)
+            else: 
+                uploadoptions['secret'] = settings.UPLOAD_SERVICE_SECRET
+                uploadoptions['user'] = r.user.id
+                uploadoptions['title'] = t
+                uploadoptions['file'] = f2
+
+                url = settings.UPLOAD_SERVICE_URL
+
+                response = requests.post(url,uploadoptions)
 
                 messages.info(
                     request,