From 25e848f742b09d61d7b887cea1cc17d441131525 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Mon, 15 May 2023 19:17:06 -0700
Subject: [PATCH 01/37] refactor sharing view (broken)

---
 tom_dataproducts/sharing.py     |  98 +++++++++++++++++++++++++
 tom_dataproducts/tests/tests.py |  54 ++++++++++++++
 tom_dataproducts/views.py       | 123 ++++++++------------------------
 3 files changed, 183 insertions(+), 92 deletions(-)
 create mode 100644 tom_dataproducts/sharing.py

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
new file mode 100644
index 000000000..b1bd45483
--- /dev/null
+++ b/tom_dataproducts/sharing.py
@@ -0,0 +1,98 @@
+
+def share_data_with_hermes(share_destination, form_data, product_id=None, target_id=None, selected_data=None):
+    # Query relevant Reduced Datums Queryset
+    accepted_data_types = ['photometry']
+    if product_id:
+        product = DataProduct.objects.get(pk=product_id)
+        reduced_datums = ReducedDatum.objects.filter(data_product=product)
+    elif selected_data:
+        reduced_datums = ReducedDatum.objects.filter(pk__in=selected_data)
+    elif target_id:
+        target = Target.objects.get(pk=target_id)
+        data_type = form_data['data_type']
+        reduced_datums = ReducedDatum.objects.filter(target=target, data_type=data_type)
+    else:
+        reduced_datums = ReducedDatum.objects.none()
+
+    reduced_datums.filter(data_type__in=accepted_data_types)
+
+    # Build and submit hermes table from Reduced Datums
+    hermes_topic = share_destination.split(':')[1]
+    destination = share_destination.split(':')[0]
+    message_info = BuildHermesMessage(title=form_data['share_title'],
+                                      submitter=form_data['submitter'],
+                                      authors=form_data['share_authors'],
+                                      message=form_data['share_message'],
+                                      topic=hermes_topic
+                                      )
+    # Run ReducedDatums Queryset through sharing protocols to make sure they are safe to share.
+    filtered_reduced_datums = get_share_safe_datums(destination, reduced_datums, topic=hermes_topic)
+    if filtered_reduced_datums.count() > 0:
+        response = publish_photometry_to_hermes(message_info, filtered_reduced_datums)
+    else:
+        messages.error(self.request, f'No Data to share. (Check sharing Protocol, note that data types must be '
+                                     f'in {accepted_data_types})')
+
+
+def share_data_with_tom(destination, datums, product=None):
+    """
+    When sharing a DataProduct with another TOM we likely want to share the data product itself and let the other
+    TOM process it rather than share the Reduced Datums
+    :param destination: name of destination tom in settings.DATA_SHARING
+    :param datums: Queryset of ReducedDatum Instances
+    :param product: DataProduct model instance
+    :return:
+    """
+    try:
+        destination_tom_base_url = settings.DATA_SHARING[destination]['BASE_URL']
+        username = settings.DATA_SHARING[destination]['USERNAME']
+        password = settings.DATA_SHARING[destination]['PASSWORD']
+    except KeyError as err:
+        raise ImproperlyConfigured(f'Check DATA_SHARING configuration for {destination}: Key {err} not found.')
+    auth = (username, password)
+    headers = {'Media-Type': 'application/json'}
+    target = product.target
+    serialized_target_data = TargetSerializer(target).data
+    targets_url = destination_tom_base_url + 'api/targets/'
+    # TODO: Make sure aliases are checked before creating new target
+    # Attempt to create Target in Destination TOM
+    # response = requests.post(targets_url, headers=headers, auth=auth, data=serialized_target_data)
+    # try:
+    #     target_response = response.json()
+    #     destination_target_id = target_response['id']
+    # except KeyError:
+    #     # If Target already exists at destination, find ID
+    #     response = requests.get(targets_url, headers=headers, auth=auth, data=serialized_target_data)
+    #     target_response = response.json()
+    #     destination_target_id = target_response['results'][0]['id']
+
+    print(serialized_target_data)
+
+    response = requests.get(f'{targets_url}?name={target.name}', headers=headers, auth=auth)
+    target_response = response.json()
+    if target_response['results']:
+        destination_target_id = target_response['results'][0]['id']
+    else:
+        return response
+    print("------------------------")
+    print(target_response)
+    serialized_dataproduct_data = DataProductSerializer(product).data
+    serialized_dataproduct_data['target'] = destination_target_id
+    dataproducts_url = destination_tom_base_url + 'api/dataproducts/'
+    # TODO: this should be updated when tom_dataproducts is updated to use django.core.storage
+    dataproduct_filename = os.path.join(settings.MEDIA_ROOT, product.data.name)
+    # Save DataProduct in Destination TOM
+    # with open(dataproduct_filename, 'rb') as dataproduct_filep:
+    #     files = {'file': (product.data.name, dataproduct_filep, 'text/csv')}
+    #     headers = {'Media-Type': 'multipart/form-data'}
+    #     response = requests.post(dataproducts_url, data=serialized_dataproduct_data, files=files,
+    #                              headers=headers, auth=auth)
+    return response
+
+
+def check_for_share_safe_datums():
+    return
+
+
+def check_for_save_safe_datums():
+    return
diff --git a/tom_dataproducts/tests/tests.py b/tom_dataproducts/tests/tests.py
index bf671c3c8..9c6679f7b 100644
--- a/tom_dataproducts/tests/tests.py
+++ b/tom_dataproducts/tests/tests.py
@@ -489,3 +489,57 @@ def test_create_thumbnail(self, mock_is_fits_image_file):
                         'ignore_missing_simple=True')
 
             self.assertIn(expected, logs.output)
+
+
+@override_settings(TOM_FACILITY_CLASSES=['tom_observations.tests.utils.FakeRoboticFacility'],
+                   TARGET_PERMISSIONS_ONLY=True)
+@patch('tom_dataproducts.views.run_data_processor')
+class TestShareDataProducts(TestCase):
+    def setUp(self):
+        self.target = SiderealTargetFactory.create()
+        self.observation_record = ObservingRecordFactory.create(
+            target_id=self.target.id,
+            facility=FakeRoboticFacility.name,
+            parameters={}
+        )
+        self.data_product = DataProduct.objects.create(
+            product_id='testproductid',
+            target=self.target,
+            observation_record=self.observation_record,
+            data=SimpleUploadedFile('afile.fits', b'somedata')
+        )
+        self.user = User.objects.create_user(username='test', email='test@example.com')
+        assign_perm('tom_targets.view_target', self.user, self.target)
+        self.client.force_login(self.user)
+
+    def test_share_dataproduct(self, run_data_processor_mock):
+
+        response = self.client.post(
+            reverse('dataproducts:share', kwargs={'dp_pk': self.data_product.id}),
+            {
+                'share_authors': ['test_author'],
+                'target': self.target.id,
+                'submitter': ['test_submitter'],
+                'share_destination': ['local_host'],
+                'share_title': ['Updated data for thingy.'],
+                'share_message': ['test_message']
+            },
+            follow=True
+        )
+        self.assertContains(response, 'TOM-TOM sharing is not yet supported.')
+
+    def test_share_data_for_target(self, run_data_processor_mock):
+
+        response = self.client.post(
+            reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
+            {
+                'share_authors': ['test_author'],
+                'target': self.target.id,
+                'submitter': ['test_submitter'],
+                'share_destination': ['local_host'],
+                'share_title': ['Updated data for thingy.'],
+                'share_message': ['test_message']
+            },
+            follow=True
+        )
+        self.assertContains(response, 'TOM-TOM sharing is not yet supported.')
\ No newline at end of file
diff --git a/tom_dataproducts/views.py b/tom_dataproducts/views.py
index 73cb920a8..207b77c76 100644
--- a/tom_dataproducts/views.py
+++ b/tom_dataproducts/views.py
@@ -314,109 +314,48 @@ def post(self, request, *args, **kwargs):
         Handles Data Products and All the data of a type for a target as well as individual Reduced Datums.
         Submit to Hermes, or Share with TOM (soon).
         """
-
         data_share_form = DataShareForm(request.POST, request.FILES)
-        # Check if data points have been selected.
-        selected_data = request.POST.getlist("share-box")
+
         if data_share_form.is_valid():
             form_data = data_share_form.cleaned_data
-            # 1st determine if pk is data product, Reduced Datum, or Target.
-            # Then query relevant Reduced Datums Queryset
+            share_destination = form_data['share_destination']
             product_id = kwargs.get('dp_pk', None)
-            if product_id:
-                product = DataProduct.objects.get(pk=product_id)
-                data_type = product.data_product_type
-                reduced_datums = ReducedDatum.objects.filter(data_product=product)
+            target_id = kwargs.get('tg_pk', None)
+
+
+            # Check if data points have been selected.
+            selected_data = request.POST.getlist("share-box")
+
+            # Check Destination
+            if 'HERMES' in share_destination.upper():
+                response = share_data_with_hermes(share_destination, form_data, product_id, target_id, selected_data)
             else:
-                target_id = kwargs.get('tg_pk', None)
-                target = Target.objects.get(pk=target_id)
-                data_type = form_data['data_type']
-                if request.POST.get("share-box", None) is None:
-                    reduced_datums = ReducedDatum.objects.filter(target=target, data_type=data_type)
+                response = share_data_with_tom(share_destination, form_data, product_id, target_id, selected_data)
+            try:
+                if 'message' in response.json():
+                    publish_feedback = response.json()['message']
                 else:
-                    reduced_datums = ReducedDatum.objects.filter(pk__in=selected_data)
-            if data_type == 'photometry':
-                share_destination = form_data['share_destination']
-                if 'HERMES' in share_destination.upper():
-                    # Build and submit hermes table from Reduced Datums
-                    hermes_topic = share_destination.split(':')[1]
-                    destination = share_destination.split(':')[0]
-                    message_info = BuildHermesMessage(title=form_data['share_title'],
-                                                      submitter=form_data['submitter'],
-                                                      authors=form_data['share_authors'],
-                                                      message=form_data['share_message'],
-                                                      topic=hermes_topic
-                                                      )
-                    # Run ReducedDatums Queryset through sharing protocols to make sure they are safe to share.
-                    filtered_reduced_datums = self.get_share_safe_datums(destination, reduced_datums,
-                                                                         topic=hermes_topic)
-                    if filtered_reduced_datums.count() > 0:
-                        response = publish_photometry_to_hermes(message_info, filtered_reduced_datums)
-                    else:
-                        messages.error(self.request, 'No Data to share. (Check sharing Protocol.)')
+                    publish_feedback = f"ERROR: {response.text}"
+            except ValueError:
+                publish_feedback = f"ERROR: Returned Response code {response.status_code}"
+            if "ERROR" in publish_feedback.upper():
+                messages.error(self.request, publish_feedback)
+            else:
+                messages.success(self.request, publish_feedback)
+        return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
+
+
+        if data_share_form.is_valid():
+            form_data = data_share_form.cleaned_data
+
                         return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
                 else:
-                    messages.error(self.request, 'TOM-TOM sharing is not yet supported.')
+                    # messages.error(self.request, 'TOM-TOM sharing is not yet supported.')
+                    response = self.share_with_tom(share_destination, product)
                     return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
                     # response = self.share_with_tom(share_destination, product)
-                try:
-                    if 'message' in response.json():
-                        publish_feedback = response.json()['message']
-                    else:
-                        publish_feedback = f"ERROR: {response.text}"
-                except ValueError:
-                    publish_feedback = f"ERROR: Returned Response code {response.status_code}"
-                if "ERROR" in publish_feedback.upper():
-                    messages.error(self.request, publish_feedback)
-                else:
-                    messages.success(self.request, publish_feedback)
-            else:
-                messages.error(self.request, f'Publishing {data_type} data is not yet supported.')
-        return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
 
-    def share_with_tom(self, tom_name, product):
-        """
-        When sharing a DataProduct with another TOM we likely want to share the data product itself and let the other
-        TOM process it rather than share the Reduced Datums
-        :param tom_name: name of destination tom in settings.DATA_SHARING
-        :param product: DataProduct model instance
-        :return:
-        """
-        try:
-            destination_tom_base_url = settings.DATA_SHARING[tom_name]['BASE_URL']
-            username = settings.DATA_SHARING[tom_name]['USERNAME']
-            password = settings.DATA_SHARING[tom_name]['PASSWORD']
-        except KeyError as err:
-            raise ImproperlyConfigured(f'Check DATA_SHARING configuration for {tom_name}: Key {err} not found.')
-        auth = (username, password)
-        headers = {'Media-Type': 'application/json'}
-        target = product.target
-        serialized_target_data = TargetSerializer(target).data
-        targets_url = destination_tom_base_url + 'api/targets/'
-        # TODO: Make sure aliases are checked before creating new target
-        # Attempt to create Target in Destination TOM
-        response = requests.post(targets_url, headers=headers, auth=auth, data=serialized_target_data)
-        try:
-            target_response = response.json()
-            destination_target_id = target_response['id']
-        except KeyError:
-            # If Target already exists at destination, find ID
-            response = requests.get(targets_url, headers=headers, auth=auth, data=serialized_target_data)
-            target_response = response.json()
-            destination_target_id = target_response['results'][0]['id']
-
-        serialized_dataproduct_data = DataProductSerializer(product).data
-        serialized_dataproduct_data['target'] = destination_target_id
-        dataproducts_url = destination_tom_base_url + 'api/dataproducts/'
-        # TODO: this should be updated when tom_dataproducts is updated to use django.core.storage
-        dataproduct_filename = os.path.join(settings.MEDIA_ROOT, product.data.name)
-        # Save DataProduct in Destination TOM
-        with open(dataproduct_filename, 'rb') as dataproduct_filep:
-            files = {'file': (product.data.name, dataproduct_filep, 'text/csv')}
-            headers = {'Media-Type': 'multipart/form-data'}
-            response = requests.post(dataproducts_url, data=serialized_dataproduct_data, files=files,
-                                     headers=headers, auth=auth)
-        return response
+
 
     def get_share_safe_datums(self, destination, reduced_datums, **kwargs):
         """

From 035dea33018285def9ddafefc8910511d3c0ec18 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 16 May 2023 12:30:26 -0700
Subject: [PATCH 02/37] add hermes error message

---
 tom_dataproducts/sharing.py |  7 +++++--
 tom_dataproducts/views.py   | 22 +++++++++-------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index b1bd45483..a24adc80e 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -30,8 +30,11 @@ def share_data_with_hermes(share_destination, form_data, product_id=None, target
     if filtered_reduced_datums.count() > 0:
         response = publish_photometry_to_hermes(message_info, filtered_reduced_datums)
     else:
-        messages.error(self.request, f'No Data to share. (Check sharing Protocol, note that data types must be '
-                                     f'in {accepted_data_types})')
+        def response():
+            def json():
+                return {'message': f'No Data to share. (Check sharing Protocol, note that data types must be in '
+                                   f'{accepted_data_types})'}
+    return response
 
 
 def share_data_with_tom(destination, datums, product=None):
diff --git a/tom_dataproducts/views.py b/tom_dataproducts/views.py
index 207b77c76..62e2ee849 100644
--- a/tom_dataproducts/views.py
+++ b/tom_dataproducts/views.py
@@ -322,7 +322,6 @@ def post(self, request, *args, **kwargs):
             product_id = kwargs.get('dp_pk', None)
             target_id = kwargs.get('tg_pk', None)
 
-
             # Check if data points have been selected.
             selected_data = request.POST.getlist("share-box")
 
@@ -344,18 +343,15 @@ def post(self, request, *args, **kwargs):
                 messages.success(self.request, publish_feedback)
         return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
 
-
-        if data_share_form.is_valid():
-            form_data = data_share_form.cleaned_data
-
-                        return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
-                else:
-                    # messages.error(self.request, 'TOM-TOM sharing is not yet supported.')
-                    response = self.share_with_tom(share_destination, product)
-                    return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
-                    # response = self.share_with_tom(share_destination, product)
-
-
+        # if data_share_form.is_valid():
+        #     form_data = data_share_form.cleaned_data
+        #
+        #                 return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
+        #         else:
+        #             # messages.error(self.request, 'TOM-TOM sharing is not yet supported.')
+        #             response = self.share_with_tom(share_destination, product)
+        #             return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
+        #             # response = self.share_with_tom(share_destination, product)
 
     def get_share_safe_datums(self, destination, reduced_datums, **kwargs):
         """

From 4da20e85a3811d6492e7ed49507933dbed12df6b Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 16 May 2023 15:48:05 -0700
Subject: [PATCH 03/37] fix some imports

---
 tom_dataproducts/sharing.py | 35 ++++++++++++++++++++++++-----------
 tom_dataproducts/views.py   | 22 +++-------------------
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index a24adc80e..f1c7ad9ad 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -1,3 +1,7 @@
+from tom_targets.models import Target
+from tom_dataproducts.models import DataProduct, DataProductGroup, ReducedDatum
+from tom_dataproducts.alertstreams.hermes import publish_photometry_to_hermes, BuildHermesMessage
+
 
 def share_data_with_hermes(share_destination, form_data, product_id=None, target_id=None, selected_data=None):
     # Query relevant Reduced Datums Queryset
@@ -26,14 +30,12 @@ def share_data_with_hermes(share_destination, form_data, product_id=None, target
                                       topic=hermes_topic
                                       )
     # Run ReducedDatums Queryset through sharing protocols to make sure they are safe to share.
-    filtered_reduced_datums = get_share_safe_datums(destination, reduced_datums, topic=hermes_topic)
+    filtered_reduced_datums = check_for_share_safe_datums(destination, reduced_datums, topic=hermes_topic)
     if filtered_reduced_datums.count() > 0:
         response = publish_photometry_to_hermes(message_info, filtered_reduced_datums)
     else:
-        def response():
-            def json():
-                return {'message': f'No Data to share. (Check sharing Protocol, note that data types must be in '
-                                   f'{accepted_data_types})'}
+        return {'message': f'ERROR: No valid data to share. (Check Sharing Protocol. Note that data types must be in '
+                           f'{accepted_data_types})'}
     return response
 
 
@@ -69,16 +71,12 @@ def share_data_with_tom(destination, datums, product=None):
     #     target_response = response.json()
     #     destination_target_id = target_response['results'][0]['id']
 
-    print(serialized_target_data)
-
     response = requests.get(f'{targets_url}?name={target.name}', headers=headers, auth=auth)
     target_response = response.json()
     if target_response['results']:
         destination_target_id = target_response['results'][0]['id']
     else:
         return response
-    print("------------------------")
-    print(target_response)
     serialized_dataproduct_data = DataProductSerializer(product).data
     serialized_dataproduct_data['target'] = destination_target_id
     dataproducts_url = destination_tom_base_url + 'api/dataproducts/'
@@ -93,8 +91,23 @@ def share_data_with_tom(destination, datums, product=None):
     return response
 
 
-def check_for_share_safe_datums():
-    return
+def check_for_share_safe_datums(destination, reduced_datums, **kwargs):
+    """
+    Custom sharing protocols used to determine when data is shared with a destination.
+    This example prevents sharing if a datum has already been published to the given Hermes topic.
+    :param destination: sharing destination string
+    :param reduced_datums: selected input datums
+    :return: queryset of reduced datums to be shared
+    """
+    return reduced_datums
+    # if 'hermes' in destination:
+    #     message_topic = kwargs.get('topic', None)
+    #     # Remove data points previously shared to the given topic
+    #     filtered_datums = reduced_datums.exclude(Q(message__exchange_status='published')
+    #                                              & Q(message__topic=message_topic))
+    # else:
+    #     filtered_datums = reduced_datums
+    # return filtered_datums
 
 
 def check_for_save_safe_datums():
diff --git a/tom_dataproducts/views.py b/tom_dataproducts/views.py
index 62e2ee849..d6ac8dd80 100644
--- a/tom_dataproducts/views.py
+++ b/tom_dataproducts/views.py
@@ -32,10 +32,10 @@
 from tom_dataproducts.forms import AddProductToGroupForm, DataProductUploadForm, DataShareForm
 from tom_dataproducts.filters import DataProductFilter
 from tom_dataproducts.data_processor import run_data_processor
-from tom_dataproducts.alertstreams.hermes import publish_photometry_to_hermes, BuildHermesMessage
 from tom_observations.models import ObservationRecord
 from tom_observations.facility import get_service_class
 from tom_dataproducts.serializers import DataProductSerializer
+from tom_dataproducts.sharing import share_data_with_hermes
 
 import requests
 
@@ -335,6 +335,8 @@ def post(self, request, *args, **kwargs):
                     publish_feedback = response.json()['message']
                 else:
                     publish_feedback = f"ERROR: {response.text}"
+            except AttributeError:
+                publish_feedback = response['message']
             except ValueError:
                 publish_feedback = f"ERROR: Returned Response code {response.status_code}"
             if "ERROR" in publish_feedback.upper():
@@ -353,24 +355,6 @@ def post(self, request, *args, **kwargs):
         #             return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
         #             # response = self.share_with_tom(share_destination, product)
 
-    def get_share_safe_datums(self, destination, reduced_datums, **kwargs):
-        """
-        Custom sharing protocols used to determine when data is shared with a destination.
-        This example prevents sharing if a datum has already been published to the given Hermes topic.
-        :param destination: sharing destination string
-        :param reduced_datums: selected input datums
-        :return: queryset of reduced datums to be shared
-        """
-        return reduced_datums
-        # if 'hermes' in destination:
-        #     message_topic = kwargs.get('topic', None)
-        #     # Remove data points previously shared to the given topic
-        #     filtered_datums = reduced_datums.exclude(Q(message__exchange_status='published')
-        #                                              & Q(message__topic=message_topic))
-        # else:
-        #     filtered_datums = reduced_datums
-        # return filtered_datums
-
 
 class DataProductGroupDetailView(DetailView):
     """

From e801e815fbb39a0424ec1fe24c8e68cf861b2d11 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Wed, 17 May 2023 17:07:24 -0700
Subject: [PATCH 04/37] finish Dataproduct sharing

---
 tom_dataproducts/alertstreams/hermes.py |  2 +-
 tom_dataproducts/api_views.py           |  1 +
 tom_dataproducts/sharing.py             | 93 ++++++++++++++++---------
 tom_dataproducts/views.py               |  3 +-
 4 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/tom_dataproducts/alertstreams/hermes.py b/tom_dataproducts/alertstreams/hermes.py
index d2589af22..cd1c2742a 100644
--- a/tom_dataproducts/alertstreams/hermes.py
+++ b/tom_dataproducts/alertstreams/hermes.py
@@ -136,7 +136,7 @@ def get_hermes_topics(**kwargs):
         response = requests.get(url=submit_url, headers=headers)
 
         topics = response.json()['writable_topics']
-    except KeyError:
+    except (KeyError, requests.exceptions.JSONDecodeError):
         topics = settings.DATA_SHARING['hermes']['USER_TOPICS']
     return topics
 
diff --git a/tom_dataproducts/api_views.py b/tom_dataproducts/api_views.py
index 8f59138ae..964df7a82 100644
--- a/tom_dataproducts/api_views.py
+++ b/tom_dataproducts/api_views.py
@@ -38,6 +38,7 @@ def create(self, request, *args, **kwargs):
         response = super().create(request, *args, **kwargs)
 
         if response.status_code == status.HTTP_201_CREATED:
+            response.data['message'] = 'Data product successfully uploaded.'
             dp = DataProduct.objects.get(pk=response.data['id'])
             try:
                 run_hook('data_product_post_upload', dp)
diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index f1c7ad9ad..9bf67f4ec 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -1,9 +1,24 @@
+import requests
+import os
+
+from django.conf import settings
+
 from tom_targets.models import Target
 from tom_dataproducts.models import DataProduct, DataProductGroup, ReducedDatum
 from tom_dataproducts.alertstreams.hermes import publish_photometry_to_hermes, BuildHermesMessage
+from tom_dataproducts.serializers import DataProductSerializer
 
 
 def share_data_with_hermes(share_destination, form_data, product_id=None, target_id=None, selected_data=None):
+    """
+
+    :param share_destination:
+    :param form_data:
+    :param product_id:
+    :param target_id:
+    :param selected_data:
+    :return:
+    """
     # Query relevant Reduced Datums Queryset
     accepted_data_types = ['photometry']
     if product_id:
@@ -39,26 +54,61 @@ def share_data_with_hermes(share_destination, form_data, product_id=None, target
     return response
 
 
-def share_data_with_tom(destination, datums, product=None):
+def share_data_with_tom(share_destination, form_data, product_id=None, target_id=None, selected_data=None):
     """
-    When sharing a DataProduct with another TOM we likely want to share the data product itself and let the other
-    TOM process it rather than share the Reduced Datums
-    :param destination: name of destination tom in settings.DATA_SHARING
-    :param datums: Queryset of ReducedDatum Instances
-    :param product: DataProduct model instance
+
+    :param share_destination:
+    :param form_data:
+    :param product_id:
+    :param target_id:
+    :param selected_data:
     :return:
     """
     try:
-        destination_tom_base_url = settings.DATA_SHARING[destination]['BASE_URL']
-        username = settings.DATA_SHARING[destination]['USERNAME']
-        password = settings.DATA_SHARING[destination]['PASSWORD']
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+        username = settings.DATA_SHARING[share_destination]['USERNAME']
+        password = settings.DATA_SHARING[share_destination]['PASSWORD']
     except KeyError as err:
-        raise ImproperlyConfigured(f'Check DATA_SHARING configuration for {destination}: Key {err} not found.')
+        raise ImproperlyConfigured(f'Check DATA_SHARING configuration for {share_destination}: Key {err} not found.')
     auth = (username, password)
     headers = {'Media-Type': 'application/json'}
-    target = product.target
-    serialized_target_data = TargetSerializer(target).data
+
+    dataproducts_url = destination_tom_base_url + 'api/dataproducts/'
     targets_url = destination_tom_base_url + 'api/targets/'
+    reduced_datums = ReducedDatum.objects.none()
+    if product_id:
+        product = DataProduct.objects.get(pk=product_id)
+        target = product.target
+        serialized_data = DataProductSerializer(product).data
+    # elif selected_data:
+    #     reduced_datums = ReducedDatum.objects.filter(pk__in=selected_data)
+    # elif target_id:
+    #     target = Target.objects.get(pk=target_id)
+    #     data_type = form_data['data_type']
+    #     reduced_datums = ReducedDatum.objects.filter(target=target, data_type=data_type)
+    else:
+        return {'message': f'ERROR: No valid data to share.'}
+
+    # get destination Target
+    target_response = requests.get(f'{targets_url}?name={target.name}', headers=headers, auth=auth)
+    target_response_json = target_response.json()
+    if target_response_json['results']:
+        destination_target_id = target_response_json['results'][0]['id']
+    else:
+        return target_response
+
+    serialized_data['target'] = destination_target_id
+
+    # TODO: this should be updated when tom_dataproducts is updated to use django.core.storage
+    dataproduct_filename = os.path.join(settings.MEDIA_ROOT, product.data.name)
+    # Save DataProduct in Destination TOM
+    with open(dataproduct_filename, 'rb') as dataproduct_filep:
+        files = {'file': (product.data.name, dataproduct_filep, 'text/csv')}
+        headers = {'Media-Type': 'multipart/form-data'}
+        response = requests.post(dataproducts_url, data=serialized_data, files=files,
+                                 headers=headers, auth=auth)
+    return response
+    # serialized_target_data = TargetSerializer(target).data
     # TODO: Make sure aliases are checked before creating new target
     # Attempt to create Target in Destination TOM
     # response = requests.post(targets_url, headers=headers, auth=auth, data=serialized_target_data)
@@ -71,25 +121,6 @@ def share_data_with_tom(destination, datums, product=None):
     #     target_response = response.json()
     #     destination_target_id = target_response['results'][0]['id']
 
-    response = requests.get(f'{targets_url}?name={target.name}', headers=headers, auth=auth)
-    target_response = response.json()
-    if target_response['results']:
-        destination_target_id = target_response['results'][0]['id']
-    else:
-        return response
-    serialized_dataproduct_data = DataProductSerializer(product).data
-    serialized_dataproduct_data['target'] = destination_target_id
-    dataproducts_url = destination_tom_base_url + 'api/dataproducts/'
-    # TODO: this should be updated when tom_dataproducts is updated to use django.core.storage
-    dataproduct_filename = os.path.join(settings.MEDIA_ROOT, product.data.name)
-    # Save DataProduct in Destination TOM
-    # with open(dataproduct_filename, 'rb') as dataproduct_filep:
-    #     files = {'file': (product.data.name, dataproduct_filep, 'text/csv')}
-    #     headers = {'Media-Type': 'multipart/form-data'}
-    #     response = requests.post(dataproducts_url, data=serialized_dataproduct_data, files=files,
-    #                              headers=headers, auth=auth)
-    return response
-
 
 def check_for_share_safe_datums(destination, reduced_datums, **kwargs):
     """
diff --git a/tom_dataproducts/views.py b/tom_dataproducts/views.py
index d6ac8dd80..093ef8a6a 100644
--- a/tom_dataproducts/views.py
+++ b/tom_dataproducts/views.py
@@ -34,8 +34,7 @@
 from tom_dataproducts.data_processor import run_data_processor
 from tom_observations.models import ObservationRecord
 from tom_observations.facility import get_service_class
-from tom_dataproducts.serializers import DataProductSerializer
-from tom_dataproducts.sharing import share_data_with_hermes
+from tom_dataproducts.sharing import share_data_with_hermes, share_data_with_tom
 
 import requests
 

From 008ac5729bce52377186b055e404a442708db4d0 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Thu, 22 Jun 2023 14:27:24 -0700
Subject: [PATCH 05/37] add reduced datum sharing

---
 tom_dataproducts/api_views.py      | 30 ++++++++++-
 tom_dataproducts/forms.py          | 61 +++++++++++-----------
 tom_dataproducts/models.py         | 11 +++-
 tom_dataproducts/serializers.py    | 26 +++++++++-
 tom_dataproducts/sharing.py        | 83 ++++++++++++++++++------------
 tom_dataproducts/tests/test_api.py | 40 ++++++++++++++
 tom_dataproducts/urls.py           |  3 +-
 7 files changed, 183 insertions(+), 71 deletions(-)

diff --git a/tom_dataproducts/api_views.py b/tom_dataproducts/api_views.py
index 964df7a82..5661098b8 100644
--- a/tom_dataproducts/api_views.py
+++ b/tom_dataproducts/api_views.py
@@ -4,7 +4,7 @@
 from guardian.shortcuts import assign_perm, get_objects_for_user
 from rest_framework import status
 from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModelMixin
-from rest_framework.parsers import MultiPartParser
+from rest_framework.parsers import MultiPartParser, FormParser, JSONParser
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
@@ -12,7 +12,7 @@
 from tom_dataproducts.data_processor import run_data_processor
 from tom_dataproducts.filters import DataProductFilter
 from tom_dataproducts.models import DataProduct, ReducedDatum
-from tom_dataproducts.serializers import DataProductSerializer
+from tom_dataproducts.serializers import DataProductSerializer, ReducedDatumSerializer
 
 
 class DataProductViewSet(CreateModelMixin, DestroyModelMixin, ListModelMixin, GenericViewSet, PermissionListMixin):
@@ -69,3 +69,29 @@ def get_queryset(self):
             )
         else:
             return get_objects_for_user(self.request.user, 'tom_dataproducts.view_dataproduct')
+
+
+class ReducedDatumViewSet(CreateModelMixin, DestroyModelMixin, ListModelMixin, GenericViewSet, PermissionListMixin):
+    """
+    Viewset for ReducedDatum objects. Supports list, create, and delete.
+
+    To view supported query parameters, please use the OPTIONS endpoint, which can be accessed through the web UI.
+
+    **Please note that ``groups`` are an accepted query parameters for the ``CREATE`` endpoint. The groups parameter
+    will specify which ``groups`` can view the created ``DataProduct``. If no ``groups`` are specified, the
+    ``ReducedDatum`` will only be visible to the user that created the ``DataProduct``. Make sure to check your
+    ``groups``!!**
+    """
+    queryset = ReducedDatum.objects.all()
+    serializer_class = ReducedDatumSerializer
+    filter_backends = (drf_filters.DjangoFilterBackend,)
+    permission_required = 'tom_dataproducts.view_reduceddatum'
+    parser_classes = [FormParser, JSONParser]
+
+    def create(self, request, *args, **kwargs):
+        response = super().create(request, *args, **kwargs)
+
+        if response.status_code == status.HTTP_201_CREATED:
+            response.data['message'] = 'Data successfully uploaded.'
+
+        return response
diff --git a/tom_dataproducts/forms.py b/tom_dataproducts/forms.py
index db39c1e75..e0b615a96 100644
--- a/tom_dataproducts/forms.py
+++ b/tom_dataproducts/forms.py
@@ -8,36 +8,6 @@
 from tom_dataproducts.alertstreams.hermes import get_hermes_topics
 
 
-def get_sharing_destination_options():
-    """
-    Build the Display options and headers for the dropdown form for choosing sharing topics.
-    Customize for a different selection experience.
-    :return: Tuple: Possible Destinations and their Display Names
-    """
-    choices = []
-    try:
-        for destination, details in settings.DATA_SHARING.items():
-            new_destination = [details.get('DISPLAY_NAME', destination)]
-            if details.get('USER_TOPICS', None):
-                # If topics exist for a destination (Such as HERMES) give topics as sub-choices
-                #   for non-selectable Destination
-                if destination == "hermes":
-                    destination_topics = get_hermes_topics()
-                else:
-                    destination_topics = details['USER_TOPICS']
-                topic_list = [(f'{destination}:{topic}', topic) for topic in destination_topics]
-                new_destination.append(tuple(topic_list))
-            else:
-                # Otherwise just use destination as option
-                new_destination.insert(0, destination)
-            choices.append(tuple(new_destination))
-    except AttributeError:
-        pass
-    return tuple(choices)
-
-
-DESTINATION_OPTIONS = get_sharing_destination_options()
-
 DATA_TYPE_OPTIONS = (('photometry', 'Photometry'),
                      ('spectroscopy', 'Spectroscopy'))
 
@@ -82,7 +52,7 @@ def __init__(self, *args, **kwargs):
 
 
 class DataShareForm(forms.Form):
-    share_destination = forms.ChoiceField(required=True, choices=DESTINATION_OPTIONS, label="Destination")
+    share_destination = forms.ChoiceField(required=True, choices=[], label="Destination")
     share_title = forms.CharField(required=False, label="Title")
     share_message = forms.CharField(required=False, label="Message", widget=forms.Textarea())
     share_authors = forms.CharField(required=False, widget=forms.HiddenInput())
@@ -95,6 +65,33 @@ class DataShareForm(forms.Form):
         widget=forms.HiddenInput()
     )
 
+    def get_sharing_destination_options(self):
+        """
+        Build the Display options and headers for the dropdown form for choosing sharing topics.
+        Customize for a different selection experience.
+        :return: Tuple: Possible Destinations and their Display Names
+        """
+        choices = []
+        try:
+            for destination, details in settings.DATA_SHARING.items():
+                new_destination = [details.get('DISPLAY_NAME', destination)]
+                if details.get('USER_TOPICS', None):
+                    # If topics exist for a destination (Such as HERMES) give topics as sub-choices
+                    #   for non-selectable Destination
+                    if destination == "hermes":
+                        destination_topics = get_hermes_topics()
+                    else:
+                        destination_topics = details['USER_TOPICS']
+                    topic_list = [(f'{destination}:{topic}', topic) for topic in destination_topics]
+                    new_destination.append(tuple(topic_list))
+                else:
+                    # Otherwise just use destination as option
+                    new_destination.insert(0, destination)
+                choices.append(tuple(new_destination))
+        except AttributeError:
+            pass
+        return tuple(choices)
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['share_destination'].choices = DESTINATION_OPTIONS
+        self.fields['share_destination'].choices = self.get_sharing_destination_options()
diff --git a/tom_dataproducts/models.py b/tom_dataproducts/models.py
index d8fbef1ae..6e2664471 100644
--- a/tom_dataproducts/models.py
+++ b/tom_dataproducts/models.py
@@ -331,7 +331,7 @@ class ReducedDatum(models.Model):
     """
 
     target = models.ForeignKey(Target, null=False, on_delete=models.CASCADE)
-    data_product = models.ForeignKey(DataProduct, null=True, on_delete=models.CASCADE)
+    data_product = models.ForeignKey(DataProduct, null=True, blank=True, on_delete=models.CASCADE)
     data_type = models.CharField(
         max_length=100,
         default=''
@@ -352,3 +352,12 @@ def save(self, *args, **kwargs):
         else:
             raise ValidationError('Not a valid DataProduct type.')
         return super().save()
+
+    def validate_unique(self, *args, **kwargs):
+        super().validate_unique(*args, **kwargs)
+        model_dict = self.__dict__.copy()
+        del model_dict['_state']
+        del model_dict['id']
+        obs = ReducedDatum.objects.filter(**model_dict)
+        if obs:
+            raise ValidationError('Data point already exists.')
diff --git a/tom_dataproducts/serializers.py b/tom_dataproducts/serializers.py
index 223747567..7d6ba9993 100644
--- a/tom_dataproducts/serializers.py
+++ b/tom_dataproducts/serializers.py
@@ -18,6 +18,8 @@ class Meta:
 
 
 class ReducedDatumSerializer(serializers.ModelSerializer):
+    target = TargetFilteredPrimaryKeyRelatedField(queryset=Target.objects.all())
+
     class Meta:
         model = ReducedDatum
         fields = (
@@ -26,9 +28,31 @@ class Meta:
             'source_name',
             'source_location',
             'timestamp',
-            'value'
+            'value',
+            'target'
         )
 
+    def create(self, validated_data):
+        """DRF requires explicitly handling writeable nested serializers,
+        here we pop the groups data and save it using its serializer.
+        """
+        groups = validated_data.pop('groups', [])
+
+        rd = ReducedDatum(**validated_data)
+        rd.full_clean()
+        rd.save()
+
+        # Save groups for this target
+        group_serializer = GroupSerializer(data=groups, many=True)
+        if group_serializer.is_valid() and settings.TARGET_PERMISSIONS_ONLY is False:
+            for group in groups:
+                group_instance = Group.objects.get(pk=group['id'])
+                assign_perm('tom_dataproducts.view_dataproduct', group_instance, rd)
+                assign_perm('tom_dataproducts.change_dataproduct', group_instance, rd)
+                assign_perm('tom_dataproducts.delete_dataproduct', group_instance, rd)
+
+        return rd
+
 
 class DataProductSerializer(serializers.ModelSerializer):
     target = TargetFilteredPrimaryKeyRelatedField(queryset=Target.objects.all())
diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index 9bf67f4ec..cf0ddab52 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -6,7 +6,7 @@
 from tom_targets.models import Target
 from tom_dataproducts.models import DataProduct, DataProductGroup, ReducedDatum
 from tom_dataproducts.alertstreams.hermes import publish_photometry_to_hermes, BuildHermesMessage
-from tom_dataproducts.serializers import DataProductSerializer
+from tom_dataproducts.serializers import DataProductSerializer, ReducedDatumSerializer
 
 
 def share_data_with_hermes(share_destination, form_data, product_id=None, target_id=None, selected_data=None):
@@ -71,55 +71,70 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
     except KeyError as err:
         raise ImproperlyConfigured(f'Check DATA_SHARING configuration for {share_destination}: Key {err} not found.')
     auth = (username, password)
-    headers = {'Media-Type': 'application/json'}
+    headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
 
     dataproducts_url = destination_tom_base_url + 'api/dataproducts/'
     targets_url = destination_tom_base_url + 'api/targets/'
+    reduced_datums_url = destination_tom_base_url + 'api/reduceddatums/'
     reduced_datums = ReducedDatum.objects.none()
+
     if product_id:
         product = DataProduct.objects.get(pk=product_id)
         target = product.target
         serialized_data = DataProductSerializer(product).data
-    # elif selected_data:
-    #     reduced_datums = ReducedDatum.objects.filter(pk__in=selected_data)
-    # elif target_id:
-    #     target = Target.objects.get(pk=target_id)
-    #     data_type = form_data['data_type']
-    #     reduced_datums = ReducedDatum.objects.filter(target=target, data_type=data_type)
+        destination_target_id = get_destination_target(target, targets_url, headers, auth)
+        serialized_data['target'] = destination_target_id
+        # TODO: this should be updated when tom_dataproducts is updated to use django.core.storage
+        dataproduct_filename = os.path.join(settings.MEDIA_ROOT, product.data.name)
+        # Save DataProduct in Destination TOM
+        with open(dataproduct_filename, 'rb') as dataproduct_filep:
+            files = {'file': (product.data.name, dataproduct_filep, 'text/csv')}
+            headers = {'Media-Type': 'multipart/form-data'}
+            response = requests.post(dataproducts_url, data=serialized_data, files=files, headers=headers, auth=auth)
+    elif selected_data or target_id:
+        if selected_data:
+            reduced_datums = ReducedDatum.objects.filter(pk__in=selected_data)
+            targets = set(reduced_datum.target for reduced_datum in reduced_datums)
+            target_dict = {}
+            for target in targets:
+                # get destination Target
+                destination_target_id = get_destination_target(target, targets_url, headers, auth)
+                target_dict[target.name] = destination_target_id
+        else:
+            target = Target.objects.get(pk=target_id)
+            reduced_datums = ReducedDatum.objects.filter(target=target)
+            destination_target_id = get_destination_target(target, targets_url, headers, auth)
+            target_dict = {target.name:  destination_target_id}
+        response_codes = []
+        for datum in reduced_datums:
+            if target_dict[datum.target.name]:
+                serialized_data = ReducedDatumSerializer(datum).data
+                serialized_data['target'] = target_dict[datum.target.name]
+                serialized_data['data_product'] = ''
+                if not serialized_data['source_name']:
+                    serialized_data['source_name'] = settings.TOM_NAME
+                    serialized_data['source_location'] = "TOM-TOM Direct Sharing"
+                response = requests.post(reduced_datums_url, json=serialized_data, headers=headers, auth=auth)
+                response_codes.append(response.status_code)
+        failed_data_count = response_codes.count(500)
+        if failed_data_count < len(response_codes):
+            return {'message': f'{len(response_codes)-failed_data_count} of {len(response_codes)} datums successfully saved.'}
+        else:
+            return {'message': f'ERROR: No valid data shared. These data may already exist in target TOM.'}
     else:
         return {'message': f'ERROR: No valid data to share.'}
 
-    # get destination Target
+    return response
+
+
+def get_destination_target(target, targets_url, headers, auth):
     target_response = requests.get(f'{targets_url}?name={target.name}', headers=headers, auth=auth)
     target_response_json = target_response.json()
     if target_response_json['results']:
         destination_target_id = target_response_json['results'][0]['id']
+        return destination_target_id
     else:
-        return target_response
-
-    serialized_data['target'] = destination_target_id
-
-    # TODO: this should be updated when tom_dataproducts is updated to use django.core.storage
-    dataproduct_filename = os.path.join(settings.MEDIA_ROOT, product.data.name)
-    # Save DataProduct in Destination TOM
-    with open(dataproduct_filename, 'rb') as dataproduct_filep:
-        files = {'file': (product.data.name, dataproduct_filep, 'text/csv')}
-        headers = {'Media-Type': 'multipart/form-data'}
-        response = requests.post(dataproducts_url, data=serialized_data, files=files,
-                                 headers=headers, auth=auth)
-    return response
-    # serialized_target_data = TargetSerializer(target).data
-    # TODO: Make sure aliases are checked before creating new target
-    # Attempt to create Target in Destination TOM
-    # response = requests.post(targets_url, headers=headers, auth=auth, data=serialized_target_data)
-    # try:
-    #     target_response = response.json()
-    #     destination_target_id = target_response['id']
-    # except KeyError:
-    #     # If Target already exists at destination, find ID
-    #     response = requests.get(targets_url, headers=headers, auth=auth, data=serialized_target_data)
-    #     target_response = response.json()
-    #     destination_target_id = target_response['results'][0]['id']
+        return None
 
 
 def check_for_share_safe_datums(destination, reduced_datums, **kwargs):
diff --git a/tom_dataproducts/tests/test_api.py b/tom_dataproducts/tests/test_api.py
index fb86fdecd..c1eb5636a 100644
--- a/tom_dataproducts/tests/test_api.py
+++ b/tom_dataproducts/tests/test_api.py
@@ -1,6 +1,8 @@
+from datetime import datetime
 from django.contrib.auth.models import Group, User
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.urls import reverse
+from django.core.exceptions import ValidationError
 from guardian.shortcuts import assign_perm
 from rest_framework import status
 from rest_framework.test import APITestCase
@@ -102,3 +104,41 @@ def test_data_product_list(self):
 
         response = self.client.get(reverse('api:dataproducts-list'))
         self.assertContains(response, dp.product_id, status_code=status.HTTP_200_OK)
+
+
+class TestReducedDatumViewset(APITestCase):
+    def setUp(self):
+        self.user = User.objects.create(username='testuser')
+        self.client.force_login(self.user)
+        self.st = SiderealTargetFactory.create()
+        self.obsr = ObservingRecordFactory.create(target_id=self.st.id)
+        self.rd_data = {
+            'data_product': '',
+            'data_type': 'photometry',
+            'source_name': 'TOM Toolkit',
+            'source_location': 'TOM-TOM Direct Sharing',
+            'value': {'magnitude': 15.582, 'filter': 'r', 'error': 0.005},
+            'target': self.st.id,
+            'timestamp': '2012-02-12T01:40:47Z'
+        }
+
+        assign_perm('tom_dataproducts.add_reduceddatum', self.user)
+        assign_perm('tom_targets.add_target', self.user, self.st)
+        assign_perm('tom_targets.view_target', self.user, self.st)
+        assign_perm('tom_targets.change_target', self.user, self.st)
+
+    def test_upload_reduced_datum(self):
+        response = self.client.post(reverse('api:reduceddatums-list'), self.rd_data, format='json')
+        self.assertContains(response, self.rd_data['source_name'], status_code=status.HTTP_201_CREATED)
+
+    def test_upload_same_reduced_datum_twice(self):
+        """
+        Test that identical data raises a validation error while similar but different JSON will make it through.
+        """
+        response = self.client.post(reverse('api:reduceddatums-list'), self.rd_data, format='json')
+        with self.assertRaises(ValidationError):
+            self.client.post(reverse('api:reduceddatums-list'), self.rd_data, format='json')
+        self.rd_data['value'] = {'magnitude': 15.582, 'filter': 'B', 'error': 0.005}
+        response3 = self.client.post(reverse('api:reduceddatums-list'), self.rd_data, format='json')
+        rd_queryset = ReducedDatum.objects.all()
+        self.assertEqual(rd_queryset.count(), 2)
diff --git a/tom_dataproducts/urls.py b/tom_dataproducts/urls.py
index ebd4b450b..c08dddde5 100644
--- a/tom_dataproducts/urls.py
+++ b/tom_dataproducts/urls.py
@@ -7,10 +7,11 @@
 from tom_dataproducts.views import DataShareView
 
 from tom_common.api_router import SharedAPIRootRouter
-from tom_dataproducts.api_views import DataProductViewSet
+from tom_dataproducts.api_views import DataProductViewSet, ReducedDatumViewSet
 
 router = SharedAPIRootRouter()
 router.register(r'dataproducts', DataProductViewSet, 'dataproducts')
+router.register(r'reduceddatums', ReducedDatumViewSet, 'reduceddatums')
 
 app_name = 'tom_dataproducts'
 

From b758531241149338d55d67821fed2bcaa02f55f6 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Thu, 22 Jun 2023 14:45:57 -0700
Subject: [PATCH 06/37] fix some lint issues

---
 tom_dataproducts/sharing.py        | 11 +++++++----
 tom_dataproducts/tests/test_api.py |  5 ++---
 tom_dataproducts/tests/tests.py    |  2 +-
 tom_dataproducts/views.py          |  6 ------
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index cf0ddab52..04e38f408 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -2,9 +2,10 @@
 import os
 
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 
 from tom_targets.models import Target
-from tom_dataproducts.models import DataProduct, DataProductGroup, ReducedDatum
+from tom_dataproducts.models import DataProduct, ReducedDatum
 from tom_dataproducts.alertstreams.hermes import publish_photometry_to_hermes, BuildHermesMessage
 from tom_dataproducts.serializers import DataProductSerializer, ReducedDatumSerializer
 
@@ -106,6 +107,7 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
             destination_target_id = get_destination_target(target, targets_url, headers, auth)
             target_dict = {target.name:  destination_target_id}
         response_codes = []
+        reduced_datums = check_for_share_safe_datums(share_destination, reduced_datums)
         for datum in reduced_datums:
             if target_dict[datum.target.name]:
                 serialized_data = ReducedDatumSerializer(datum).data
@@ -118,11 +120,12 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
                 response_codes.append(response.status_code)
         failed_data_count = response_codes.count(500)
         if failed_data_count < len(response_codes):
-            return {'message': f'{len(response_codes)-failed_data_count} of {len(response_codes)} datums successfully saved.'}
+            return {'message': f'{len(response_codes)-failed_data_count} of {len(response_codes)} '
+                               'datums successfully saved.'}
         else:
-            return {'message': f'ERROR: No valid data shared. These data may already exist in target TOM.'}
+            return {'message': 'ERROR: No valid data shared. These data may already exist in target TOM.'}
     else:
-        return {'message': f'ERROR: No valid data to share.'}
+        return {'message': 'ERROR: No valid data to share.'}
 
     return response
 
diff --git a/tom_dataproducts/tests/test_api.py b/tom_dataproducts/tests/test_api.py
index c1eb5636a..5bb39b4d8 100644
--- a/tom_dataproducts/tests/test_api.py
+++ b/tom_dataproducts/tests/test_api.py
@@ -1,4 +1,3 @@
-from datetime import datetime
 from django.contrib.auth.models import Group, User
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.urls import reverse
@@ -135,10 +134,10 @@ def test_upload_same_reduced_datum_twice(self):
         """
         Test that identical data raises a validation error while similar but different JSON will make it through.
         """
-        response = self.client.post(reverse('api:reduceddatums-list'), self.rd_data, format='json')
+        self.client.post(reverse('api:reduceddatums-list'), self.rd_data, format='json')
         with self.assertRaises(ValidationError):
             self.client.post(reverse('api:reduceddatums-list'), self.rd_data, format='json')
         self.rd_data['value'] = {'magnitude': 15.582, 'filter': 'B', 'error': 0.005}
-        response3 = self.client.post(reverse('api:reduceddatums-list'), self.rd_data, format='json')
+        self.client.post(reverse('api:reduceddatums-list'), self.rd_data, format='json')
         rd_queryset = ReducedDatum.objects.all()
         self.assertEqual(rd_queryset.count(), 2)
diff --git a/tom_dataproducts/tests/tests.py b/tom_dataproducts/tests/tests.py
index 9c6679f7b..a00049391 100644
--- a/tom_dataproducts/tests/tests.py
+++ b/tom_dataproducts/tests/tests.py
@@ -542,4 +542,4 @@ def test_share_data_for_target(self, run_data_processor_mock):
             },
             follow=True
         )
-        self.assertContains(response, 'TOM-TOM sharing is not yet supported.')
\ No newline at end of file
+        self.assertContains(response, 'TOM-TOM sharing is not yet supported.')
diff --git a/tom_dataproducts/views.py b/tom_dataproducts/views.py
index 093ef8a6a..b9d489795 100644
--- a/tom_dataproducts/views.py
+++ b/tom_dataproducts/views.py
@@ -1,6 +1,5 @@
 from io import StringIO
 import logging
-import os
 from urllib.parse import urlencode, urlparse
 
 from django.conf import settings
@@ -9,7 +8,6 @@
 from django.contrib.auth.models import Group
 from django.core.cache import cache
 from django.core.cache.utils import make_template_fragment_key
-from django.core.exceptions import ImproperlyConfigured
 from django.core.management import call_command
 from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
@@ -25,8 +23,6 @@
 from tom_common.hooks import run_hook
 from tom_common.hints import add_hint
 from tom_common.mixins import Raise403PermissionRequiredMixin
-from tom_targets.serializers import TargetSerializer
-from tom_targets.models import Target
 from tom_dataproducts.models import DataProduct, DataProductGroup, ReducedDatum
 from tom_dataproducts.exceptions import InvalidFileFormatException
 from tom_dataproducts.forms import AddProductToGroupForm, DataProductUploadForm, DataShareForm
@@ -36,8 +32,6 @@
 from tom_observations.facility import get_service_class
 from tom_dataproducts.sharing import share_data_with_hermes, share_data_with_tom
 
-import requests
-
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 

From 89b08763126f7aeb834face75e6f60792455bf98 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 27 Jun 2023 12:59:43 -0700
Subject: [PATCH 07/37] add tests for no connection to target tom

---
 setup.py                        |   1 +
 tom_dataproducts/sharing.py     |  17 +++--
 tom_dataproducts/tests/tests.py | 112 ++++++++++++++++++++++++++++++--
 3 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/setup.py b/setup.py
index ef8ff72b0..538655a77 100644
--- a/setup.py
+++ b/setup.py
@@ -49,6 +49,7 @@
         'plotly~=5.0',
         'python-dateutil~=2.8',
         'requests~=2.25',
+        'responses~=0.23',
         'specutils~=1.8',
     ],
     extras_require={
diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index 04e38f408..8995bd39e 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -84,6 +84,8 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
         target = product.target
         serialized_data = DataProductSerializer(product).data
         destination_target_id = get_destination_target(target, targets_url, headers, auth)
+        if destination_target_id is None:
+            return {'message': 'ERROR: No matching target found.'}
         serialized_data['target'] = destination_target_id
         # TODO: this should be updated when tom_dataproducts is updated to use django.core.storage
         dataproduct_filename = os.path.join(settings.MEDIA_ROOT, product.data.name)
@@ -101,10 +103,14 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
                 # get destination Target
                 destination_target_id = get_destination_target(target, targets_url, headers, auth)
                 target_dict[target.name] = destination_target_id
+            if all(value is None for value in target_dict.values()):
+                return {'message': 'ERROR: No matching targets found.'}
         else:
             target = Target.objects.get(pk=target_id)
             reduced_datums = ReducedDatum.objects.filter(target=target)
             destination_target_id = get_destination_target(target, targets_url, headers, auth)
+            if destination_target_id is None:
+                return {'message': 'ERROR: No matching target found.'}
             target_dict = {target.name:  destination_target_id}
         response_codes = []
         reduced_datums = check_for_share_safe_datums(share_destination, reduced_datums)
@@ -133,10 +139,13 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
 def get_destination_target(target, targets_url, headers, auth):
     target_response = requests.get(f'{targets_url}?name={target.name}', headers=headers, auth=auth)
     target_response_json = target_response.json()
-    if target_response_json['results']:
-        destination_target_id = target_response_json['results'][0]['id']
-        return destination_target_id
-    else:
+    try:
+        if target_response_json['results']:
+            destination_target_id = target_response_json['results'][0]['id']
+            return destination_target_id
+        else:
+            return None
+    except KeyError:
         return None
 
 
diff --git a/tom_dataproducts/tests/tests.py b/tom_dataproducts/tests/tests.py
index a00049391..75a41f841 100644
--- a/tom_dataproducts/tests/tests.py
+++ b/tom_dataproducts/tests/tests.py
@@ -1,6 +1,7 @@
 import os
 from http import HTTPStatus
 import tempfile
+import responses
 
 from astropy import units
 from astropy.io import fits
@@ -18,7 +19,7 @@
 
 from tom_dataproducts.exceptions import InvalidFileFormatException
 from tom_dataproducts.forms import DataProductUploadForm
-from tom_dataproducts.models import DataProduct, is_fits_image_file
+from tom_dataproducts.models import DataProduct, is_fits_image_file, ReducedDatum
 from tom_dataproducts.processors.data_serializers import SpectrumSerializer
 from tom_dataproducts.processors.photometry_processor import PhotometryProcessor
 from tom_dataproducts.processors.spectroscopy_processor import SpectroscopyProcessor
@@ -493,7 +494,6 @@ def test_create_thumbnail(self, mock_is_fits_image_file):
 
 @override_settings(TOM_FACILITY_CLASSES=['tom_observations.tests.utils.FakeRoboticFacility'],
                    TARGET_PERMISSIONS_ONLY=True)
-@patch('tom_dataproducts.views.run_data_processor')
 class TestShareDataProducts(TestCase):
     def setUp(self):
         self.target = SiderealTargetFactory.create()
@@ -512,7 +512,40 @@ def setUp(self):
         assign_perm('tom_targets.view_target', self.user, self.target)
         self.client.force_login(self.user)
 
-    def test_share_dataproduct(self, run_data_processor_mock):
+        self.rd1 = ReducedDatum.objects.create(
+            target=self.target,
+            data_type='photometry',
+            value={'magnitude': 18.5, 'error': .5, 'filter': 'V'}
+        )
+        self.rd2 = ReducedDatum.objects.create(
+            target=self.target,
+            data_type='photometry',
+            value={'magnitude': 19.5, 'error': .5, 'filter': 'B'}
+        )
+        self.rd3 = ReducedDatum.objects.create(
+            target=self.target,
+            data_type='photometry',
+            value={'magnitude': 17.5, 'error': .5, 'filter': 'R'}
+        )
+
+    @responses.activate
+    def test_share_dataproduct_no_valid_responses(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"error": "not found"},
+            status=500
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
 
         response = self.client.post(
             reverse('dataproducts:share', kwargs={'dp_pk': self.data_product.id}),
@@ -520,13 +553,80 @@ def test_share_dataproduct(self, run_data_processor_mock):
                 'share_authors': ['test_author'],
                 'target': self.target.id,
                 'submitter': ['test_submitter'],
-                'share_destination': ['local_host'],
+                'share_destination': [share_destination],
                 'share_title': ['Updated data for thingy.'],
                 'share_message': ['test_message']
             },
             follow=True
         )
-        self.assertContains(response, 'TOM-TOM sharing is not yet supported.')
+        self.assertContains(response, 'ERROR: No matching target found.')
+
+    @responses.activate
+    def test_share_reduceddatums_target_no_valid_responses(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"error": "not found"},
+            status=500
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+
+        response = self.client.post(
+            reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
+            {
+                'share_authors': ['test_author'],
+                'target': self.target.id,
+                'submitter': ['test_submitter'],
+                'share_destination': [share_destination],
+                'share_title': ['Updated data for thingy.'],
+                'share_message': ['test_message']
+            },
+            follow=True
+        )
+        self.assertContains(response, 'ERROR: No matching target found.')
+
+    @responses.activate
+    def test_share_reduced_datums_no_valid_responses(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"error": "not found"},
+            status=500
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+
+        response = self.client.post(
+            reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
+            {
+                'share_authors': ['test_author'],
+                'target': self.target.id,
+                'submitter': ['test_submitter'],
+                'share_destination': [share_destination],
+                'share_title': ['Updated data for thingy.'],
+                'share_message': ['test_message'],
+                'share-box': [1, 2]
+            },
+            follow=True
+        )
+        self.assertContains(response, 'ERROR: No matching targets found.')
 
     def test_share_data_for_target(self, run_data_processor_mock):
 
@@ -542,4 +642,4 @@ def test_share_data_for_target(self, run_data_processor_mock):
             },
             follow=True
         )
-        self.assertContains(response, 'TOM-TOM sharing is not yet supported.')
+        self.assertContains(response, 'Data successfully uploaded.')

From 06d2f70846e973820573f0975ab707b682a00d75 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 27 Jun 2023 13:14:27 -0700
Subject: [PATCH 08/37] fix tests to spoof settings

---
 tom_dataproducts/tests/tests.py | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/tom_dataproducts/tests/tests.py b/tom_dataproducts/tests/tests.py
index 75a41f841..a00ad8589 100644
--- a/tom_dataproducts/tests/tests.py
+++ b/tom_dataproducts/tests/tests.py
@@ -493,7 +493,8 @@ def test_create_thumbnail(self, mock_is_fits_image_file):
 
 
 @override_settings(TOM_FACILITY_CLASSES=['tom_observations.tests.utils.FakeRoboticFacility'],
-                   TARGET_PERMISSIONS_ONLY=True)
+                   TARGET_PERMISSIONS_ONLY=True,
+                   DATA_SHARING={'local_host': {'BASE_URL': 'fake.url/example'}})
 class TestShareDataProducts(TestCase):
     def setUp(self):
         self.target = SiderealTargetFactory.create()
@@ -628,18 +629,18 @@ def test_share_reduced_datums_no_valid_responses(self):
         )
         self.assertContains(response, 'ERROR: No matching targets found.')
 
-    def test_share_data_for_target(self, run_data_processor_mock):
-
-        response = self.client.post(
-            reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
-            {
-                'share_authors': ['test_author'],
-                'target': self.target.id,
-                'submitter': ['test_submitter'],
-                'share_destination': ['local_host'],
-                'share_title': ['Updated data for thingy.'],
-                'share_message': ['test_message']
-            },
-            follow=True
-        )
-        self.assertContains(response, 'Data successfully uploaded.')
+    # def test_share_data_for_target(self, run_data_processor_mock):
+    #
+    #     response = self.client.post(
+    #         reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
+    #         {
+    #             'share_authors': ['test_author'],
+    #             'target': self.target.id,
+    #             'submitter': ['test_submitter'],
+    #             'share_destination': ['local_host'],
+    #             'share_title': ['Updated data for thingy.'],
+    #             'share_message': ['test_message']
+    #         },
+    #         follow=True
+    #     )
+    #     self.assertContains(response, 'Data successfully uploaded.')

From f4deef8204949fe0162128402543f6a6564b0c40 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 27 Jun 2023 13:22:55 -0700
Subject: [PATCH 09/37] add username/password to settings override

---
 tom_dataproducts/tests/tests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tom_dataproducts/tests/tests.py b/tom_dataproducts/tests/tests.py
index a00ad8589..2d90ab838 100644
--- a/tom_dataproducts/tests/tests.py
+++ b/tom_dataproducts/tests/tests.py
@@ -494,7 +494,9 @@ def test_create_thumbnail(self, mock_is_fits_image_file):
 
 @override_settings(TOM_FACILITY_CLASSES=['tom_observations.tests.utils.FakeRoboticFacility'],
                    TARGET_PERMISSIONS_ONLY=True,
-                   DATA_SHARING={'local_host': {'BASE_URL': 'fake.url/example'}})
+                   DATA_SHARING={'local_host': {'BASE_URL': 'fake.url/example',
+                                                'USERNAME': 'fake_user',
+                                                'PASSWORD': 'password'}})
 class TestShareDataProducts(TestCase):
     def setUp(self):
         self.target = SiderealTargetFactory.create()

From 71ef6acfe6b5008705eaf88d6df6bf600ccc4138 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 27 Jun 2023 13:35:59 -0700
Subject: [PATCH 10/37] make properly formatted fake url

---
 tom_dataproducts/tests/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tom_dataproducts/tests/tests.py b/tom_dataproducts/tests/tests.py
index 2d90ab838..9832b0c1a 100644
--- a/tom_dataproducts/tests/tests.py
+++ b/tom_dataproducts/tests/tests.py
@@ -494,7 +494,7 @@ def test_create_thumbnail(self, mock_is_fits_image_file):
 
 @override_settings(TOM_FACILITY_CLASSES=['tom_observations.tests.utils.FakeRoboticFacility'],
                    TARGET_PERMISSIONS_ONLY=True,
-                   DATA_SHARING={'local_host': {'BASE_URL': 'fake.url/example',
+                   DATA_SHARING={'local_host': {'BASE_URL': 'https://fake.url/example',
                                                 'USERNAME': 'fake_user',
                                                 'PASSWORD': 'password'}})
 class TestShareDataProducts(TestCase):

From 17a7a03ceec1da2c180d3fe7edbfedfef904a6e0 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Wed, 28 Jun 2023 16:19:04 -0700
Subject: [PATCH 11/37] add tests for succesful sharing

---
 tom_dataproducts/tests/tests.py | 134 ++++++++++++++++++++++++++++----
 1 file changed, 118 insertions(+), 16 deletions(-)

diff --git a/tom_dataproducts/tests/tests.py b/tom_dataproducts/tests/tests.py
index 9832b0c1a..a06d39245 100644
--- a/tom_dataproducts/tests/tests.py
+++ b/tom_dataproducts/tests/tests.py
@@ -494,7 +494,7 @@ def test_create_thumbnail(self, mock_is_fits_image_file):
 
 @override_settings(TOM_FACILITY_CLASSES=['tom_observations.tests.utils.FakeRoboticFacility'],
                    TARGET_PERMISSIONS_ONLY=True,
-                   DATA_SHARING={'local_host': {'BASE_URL': 'https://fake.url/example',
+                   DATA_SHARING={'local_host': {'BASE_URL': 'https://fake.url/example/',
                                                 'USERNAME': 'fake_user',
                                                 'PASSWORD': 'password'}})
 class TestShareDataProducts(TestCase):
@@ -631,18 +631,120 @@ def test_share_reduced_datums_no_valid_responses(self):
         )
         self.assertContains(response, 'ERROR: No matching targets found.')
 
-    # def test_share_data_for_target(self, run_data_processor_mock):
-    #
-    #     response = self.client.post(
-    #         reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
-    #         {
-    #             'share_authors': ['test_author'],
-    #             'target': self.target.id,
-    #             'submitter': ['test_submitter'],
-    #             'share_destination': ['local_host'],
-    #             'share_title': ['Updated data for thingy.'],
-    #             'share_message': ['test_message']
-    #         },
-    #         follow=True
-    #     )
-    #     self.assertContains(response, 'Data successfully uploaded.')
+    @responses.activate
+    def test_share_dataproduct_valid_target_found(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"results": [{'id': 1}]},
+            status=200
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+        responses.add(
+            responses.POST,
+            destination_tom_base_url + 'api/dataproducts/',
+            json={"message": "Data product successfully uploaded."},
+            status=200,
+        )
+
+        response = self.client.post(
+            reverse('dataproducts:share', kwargs={'dp_pk': self.data_product.id}),
+            {
+                'share_authors': ['test_author'],
+                'target': self.target.id,
+                'submitter': ['test_submitter'],
+                'share_destination': [share_destination],
+                'share_title': ['Updated data for thingy.'],
+                'share_message': ['test_message']
+            },
+            follow=True
+        )
+        self.assertContains(response, 'Data product successfully uploaded.')
+
+    @responses.activate
+    def test_share_reduceddatums_target_valid_responses(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"results": [{'id': 1}]},
+            status=200
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+        responses.add(
+            responses.POST,
+            destination_tom_base_url + 'api/reduceddatums/',
+            json={},
+            status=201,
+        )
+
+        response = self.client.post(
+            reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
+            {
+                'share_authors': ['test_author'],
+                'target': self.target.id,
+                'submitter': ['test_submitter'],
+                'share_destination': [share_destination],
+                'share_title': ['Updated data for thingy.'],
+                'share_message': ['test_message']
+            },
+            follow=True
+        )
+        self.assertContains(response, '3 of 3 datums successfully saved.')
+
+    @responses.activate
+    def test_share_reduced_datums_valid_responses(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"results": [{'id': 1}]},
+            status=200
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+        responses.add(
+            responses.POST,
+            destination_tom_base_url + 'api/reduceddatums/',
+            json={},
+            status=201,
+        )
+
+        response = self.client.post(
+            reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
+            {
+                'share_authors': ['test_author'],
+                'target': self.target.id,
+                'submitter': ['test_submitter'],
+                'share_destination': [share_destination],
+                'share_title': ['Updated data for thingy.'],
+                'share_message': ['test_message'],
+                'share-box': [1, 2]
+            },
+            follow=True
+        )
+        self.assertContains(response, '2 of 2 datums successfully saved.')

From e6e7e9567a503e181dfd95f91d44c8cbbd8cbf69 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Wed, 5 Jul 2023 17:05:31 -0700
Subject: [PATCH 12/37] set up ui buttons for sharing

---
 tom_dataproducts/views.py                     | 10 ----
 .../tom_targets/partials/target_buttons.html  |  5 +-
 tom_targets/urls.py                           |  1 +
 tom_targets/views.py                          | 58 +++++++++++++++++++
 4 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/tom_dataproducts/views.py b/tom_dataproducts/views.py
index b9d489795..314519b07 100644
--- a/tom_dataproducts/views.py
+++ b/tom_dataproducts/views.py
@@ -338,16 +338,6 @@ def post(self, request, *args, **kwargs):
                 messages.success(self.request, publish_feedback)
         return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
 
-        # if data_share_form.is_valid():
-        #     form_data = data_share_form.cleaned_data
-        #
-        #                 return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
-        #         else:
-        #             # messages.error(self.request, 'TOM-TOM sharing is not yet supported.')
-        #             response = self.share_with_tom(share_destination, product)
-        #             return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
-        #             # response = self.share_with_tom(share_destination, product)
-
 
 class DataProductGroupDetailView(DetailView):
     """
diff --git a/tom_targets/templates/tom_targets/partials/target_buttons.html b/tom_targets/templates/tom_targets/partials/target_buttons.html
index 5cd86e4f4..3f5216c37 100644
--- a/tom_targets/templates/tom_targets/partials/target_buttons.html
+++ b/tom_targets/templates/tom_targets/partials/target_buttons.html
@@ -1,2 +1,3 @@
-<a href="{% url 'tom_targets:update' pk=target.id %}" title="Update target" class="btn  btn-primary">Update Target</a>
-<a href="{% url 'tom_targets:delete' pk=target.id %}" title="Delete target" class="btn  btn-warning">Delete Target</a>
\ No newline at end of file
+<a href="{% url 'tom_targets:update' pk=target.id %}" title="Update target" class="btn  btn-primary">Update</a>
+<a href="{% url 'tom_targets:delete' pk=target.id %}" title="Delete target" class="btn  btn-warning">Delete</a>
+<a href="{% url 'tom_targets:share' pk=target.id %}" title="Share target" class="btn  btn-info">Share</a>
\ No newline at end of file
diff --git a/tom_targets/urls.py b/tom_targets/urls.py
index 33e98aa81..09bb8228f 100644
--- a/tom_targets/urls.py
+++ b/tom_targets/urls.py
@@ -24,6 +24,7 @@
     path('name/<str:name>', TargetNameSearchView.as_view(), name='name-search'),
     path('<int:pk>/update/', TargetUpdateView.as_view(), name='update'),
     path('<int:pk>/delete/', TargetDeleteView.as_view(), name='delete'),
+    path('<int:pk>/share/', TargetUpdateView.as_view(), name='share'),
     path('<int:pk>/', TargetDetailView.as_view(), name='detail'),
     path('targetgrouping/<int:pk>/delete/', TargetGroupingDeleteView.as_view(), name='delete-group'),
     path('targetgrouping/create/', TargetGroupingCreateView.as_view(), name='create-group')
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 500c1e472..d762e7e47 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -321,6 +321,64 @@ def get_form(self, *args, **kwargs):
         return form
 
 
+# class TargetShareView(FormView):
+#     """
+#     View that handles the sharing of data either through HERMES or with another TOM.
+#     """
+#
+#     form_class = DataShareForm
+#
+#     def get_form(self, *args, **kwargs):
+#         # TODO: Add permissions
+#         form = super().get_form(*args, **kwargs)
+#         return form
+#
+#     def form_invalid(self, form):
+#         """
+#         Adds errors to Django messaging framework in the case of an invalid form and redirects to the previous page.
+#         """
+#         # TODO: Format error messages in a more human-readable way
+#         messages.error(self.request, 'There was a problem sharing your Data: {}'.format(form.errors.as_json()))
+#         return redirect(form.cleaned_data.get('referrer', '/'))
+#
+#     def post(self, request, *args, **kwargs):
+#         """
+#         Method that handles the POST requests for sharing data.
+#         Handles Data Products and All the data of a type for a target as well as individual Reduced Datums.
+#         Submit to Hermes, or Share with TOM (soon).
+#         """
+#         data_share_form = DataShareForm(request.POST, request.FILES)
+#
+#         if data_share_form.is_valid():
+#             form_data = data_share_form.cleaned_data
+#             share_destination = form_data['share_destination']
+#             product_id = kwargs.get('dp_pk', None)
+#             target_id = kwargs.get('tg_pk', None)
+#
+#             # Check if data points have been selected.
+#             selected_data = request.POST.getlist("share-box")
+#
+#             # Check Destination
+#             if 'HERMES' in share_destination.upper():
+#                 response = share_data_with_hermes(share_destination, form_data, product_id, target_id, selected_data)
+#             else:
+#                 response = share_data_with_tom(share_destination, form_data, product_id, target_id, selected_data)
+#             try:
+#                 if 'message' in response.json():
+#                     publish_feedback = response.json()['message']
+#                 else:
+#                     publish_feedback = f"ERROR: {response.text}"
+#             except AttributeError:
+#                 publish_feedback = response['message']
+#             except ValueError:
+#                 publish_feedback = f"ERROR: Returned Response code {response.status_code}"
+#             if "ERROR" in publish_feedback.upper():
+#                 messages.error(self.request, publish_feedback)
+#             else:
+#                 messages.success(self.request, publish_feedback)
+#         return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
+
+
 class TargetDeleteView(Raise403PermissionRequiredMixin, DeleteView):
     """
     View for deleting a target. Requires authorization.

From d342af2b0f946af2e9ed7cae99437d03b0ce4bb4 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Thu, 13 Jul 2023 16:42:06 -0700
Subject: [PATCH 13/37] Build Target sharing form page

---
 tom_dataproducts/forms.py                     |  31 +-----
 tom_dataproducts/sharing.py                   |  30 +++++-
 .../photometry_datalist_for_target.html       |  36 +++----
 .../templatetags/dataproduct_extras.py        |   5 +-
 tom_targets/forms.py                          |  16 +++
 .../tom_targets/partials/target_buttons.html  |   4 +-
 tom_targets/urls.py                           |   4 +-
 tom_targets/views.py                          | 101 +++++++-----------
 8 files changed, 111 insertions(+), 116 deletions(-)

diff --git a/tom_dataproducts/forms.py b/tom_dataproducts/forms.py
index e0b615a96..43fbbf309 100644
--- a/tom_dataproducts/forms.py
+++ b/tom_dataproducts/forms.py
@@ -5,7 +5,7 @@
 from tom_dataproducts.models import DataProductGroup, DataProduct
 from tom_observations.models import ObservationRecord
 from tom_targets.models import Target
-from tom_dataproducts.alertstreams.hermes import get_hermes_topics
+from tom_dataproducts.sharing import get_sharing_destination_options
 
 
 DATA_TYPE_OPTIONS = (('photometry', 'Photometry'),
@@ -65,33 +65,6 @@ class DataShareForm(forms.Form):
         widget=forms.HiddenInput()
     )
 
-    def get_sharing_destination_options(self):
-        """
-        Build the Display options and headers for the dropdown form for choosing sharing topics.
-        Customize for a different selection experience.
-        :return: Tuple: Possible Destinations and their Display Names
-        """
-        choices = []
-        try:
-            for destination, details in settings.DATA_SHARING.items():
-                new_destination = [details.get('DISPLAY_NAME', destination)]
-                if details.get('USER_TOPICS', None):
-                    # If topics exist for a destination (Such as HERMES) give topics as sub-choices
-                    #   for non-selectable Destination
-                    if destination == "hermes":
-                        destination_topics = get_hermes_topics()
-                    else:
-                        destination_topics = details['USER_TOPICS']
-                    topic_list = [(f'{destination}:{topic}', topic) for topic in destination_topics]
-                    new_destination.append(tuple(topic_list))
-                else:
-                    # Otherwise just use destination as option
-                    new_destination.insert(0, destination)
-                choices.append(tuple(new_destination))
-        except AttributeError:
-            pass
-        return tuple(choices)
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['share_destination'].choices = self.get_sharing_destination_options()
+        self.fields['share_destination'].choices = get_sharing_destination_options()
diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index 8995bd39e..f6a7cda1e 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -6,7 +6,7 @@
 
 from tom_targets.models import Target
 from tom_dataproducts.models import DataProduct, ReducedDatum
-from tom_dataproducts.alertstreams.hermes import publish_photometry_to_hermes, BuildHermesMessage
+from tom_dataproducts.alertstreams.hermes import publish_photometry_to_hermes, BuildHermesMessage, get_hermes_topics
 from tom_dataproducts.serializers import DataProductSerializer, ReducedDatumSerializer
 
 
@@ -170,3 +170,31 @@ def check_for_share_safe_datums(destination, reduced_datums, **kwargs):
 
 def check_for_save_safe_datums():
     return
+
+
+def get_sharing_destination_options():
+    """
+    Build the Display options and headers for the dropdown form for choosing sharing topics.
+    Customize for a different selection experience.
+    :return: Tuple: Possible Destinations and their Display Names
+    """
+    choices = []
+    try:
+        for destination, details in settings.DATA_SHARING.items():
+            new_destination = [details.get('DISPLAY_NAME', destination)]
+            if details.get('USER_TOPICS', None):
+                # If topics exist for a destination (Such as HERMES) give topics as sub-choices
+                #   for non-selectable Destination
+                if destination == "hermes":
+                    destination_topics = get_hermes_topics()
+                else:
+                    destination_topics = details['USER_TOPICS']
+                topic_list = [(f'{destination}:{topic}', topic) for topic in destination_topics]
+                new_destination.append(tuple(topic_list))
+            else:
+                # Otherwise just use destination as option
+                new_destination.insert(0, destination)
+            choices.append(tuple(new_destination))
+    except AttributeError:
+        pass
+    return tuple(choices)
diff --git a/tom_dataproducts/templates/tom_dataproducts/partials/photometry_datalist_for_target.html b/tom_dataproducts/templates/tom_dataproducts/partials/photometry_datalist_for_target.html
index 953af3b88..1a2e499f5 100644
--- a/tom_dataproducts/templates/tom_dataproducts/partials/photometry_datalist_for_target.html
+++ b/tom_dataproducts/templates/tom_dataproducts/partials/photometry_datalist_for_target.html
@@ -46,25 +46,25 @@
             {% endfor %}
             </tbody>
         </table>
-        <div class="card">
-        <div class="card-header">
-          Share Selected Data
-        </div>
-            {% if sharing_destinations %}
-          <div class="form-row" style="padding-inline:1rem">
-            <div class="col-sm-4">
-              {% bootstrap_field target_data_share_form.share_destination %}
-            </div>
-            <div class="col-sm-2">
-              <input type="submit" class="btn btn-primary" id="submit_selected" value="Submit" name="share_targetdata_form" style="position:absolute; bottom:1rem" disabled>
-            </div>
-          </div>
-            {% else %}
-            <em style="padding-inline:1rem">Not Configured</em>
-            {% endif %}
-
-
+        {% if not target_share %}
+            <div class="card">
+                <div class="card-header">
+                    Share Selected Data
+                </div>
+                {% if sharing_destinations %}
+                    <div class="form-row" style="padding-inline:1rem">
+                        <div class="col-sm-4">
+                            {% bootstrap_field target_data_share_form.share_destination %}
+                        </div>
+                        <div class="col-sm-2">
+                            <input type="submit" class="btn btn-primary" id="submit_selected" value="Submit" name="share_targetdata_form" style="position:absolute; bottom:1rem" disabled>
+                        </div>
+                    </div>
+                {% else %}
+                    <em style="padding-inline:1rem">Not Configured</em>
+                {% endif %}
             </div>
+        {% endif %}
     </div>
 </form>
 <script>
diff --git a/tom_dataproducts/templatetags/dataproduct_extras.py b/tom_dataproducts/templatetags/dataproduct_extras.py
index adbc76816..b1fb24c3b 100644
--- a/tom_dataproducts/templatetags/dataproduct_extras.py
+++ b/tom_dataproducts/templatetags/dataproduct_extras.py
@@ -164,7 +164,7 @@ def recent_photometry(target, limit=1):
 
 
 @register.inclusion_tag('tom_dataproducts/partials/photometry_datalist_for_target.html', takes_context=True)
-def get_photometry_data(context, target):
+def get_photometry_data(context, target, target_share=False):
     """
     Displays a table of the all photometric points for a target.
     """
@@ -208,7 +208,8 @@ def get_photometry_data(context, target):
     context = {'data': data,
                'target': target,
                'target_data_share_form': form,
-               'sharing_destinations': form.fields['share_destination'].choices}
+               'sharing_destinations': form.fields['share_destination'].choices,
+               'target_share': target_share}
     return context
 
 
diff --git a/tom_targets/forms.py b/tom_targets/forms.py
index 149ec5cdb..69dc3aa1c 100644
--- a/tom_targets/forms.py
+++ b/tom_targets/forms.py
@@ -6,6 +6,7 @@
 from django.contrib.auth.models import Group
 from guardian.shortcuts import assign_perm, get_groups_with_perms, remove_perm
 
+from tom_dataproducts.sharing import get_sharing_destination_options
 from .models import (
     Target, TargetExtra, TargetName, SIDEREAL_FIELDS, NON_SIDEREAL_FIELDS, REQUIRED_SIDEREAL_FIELDS,
     REQUIRED_NON_SIDEREAL_FIELDS, REQUIRED_NON_SIDEREAL_FIELDS_PER_SCHEME
@@ -166,3 +167,18 @@ def clean(self):
                                            widgets={'value': forms.TextInput()})
 TargetNamesFormset = inlineformset_factory(Target, TargetName, fields=('name',), validate_min=False, can_delete=True,
                                            extra=3)
+
+
+class TargetShareForm(forms.Form):
+    share_destination = forms.ChoiceField(required=True, choices=[], label="Destination")
+    target = forms.ModelChoiceField(
+        Target.objects.all(),
+        widget=forms.HiddenInput(),
+        required=False)
+    submitter = forms.CharField(
+        widget=forms.HiddenInput()
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['share_destination'].choices = get_sharing_destination_options()
diff --git a/tom_targets/templates/tom_targets/partials/target_buttons.html b/tom_targets/templates/tom_targets/partials/target_buttons.html
index 3f5216c37..76af2cfed 100644
--- a/tom_targets/templates/tom_targets/partials/target_buttons.html
+++ b/tom_targets/templates/tom_targets/partials/target_buttons.html
@@ -1,3 +1,3 @@
 <a href="{% url 'tom_targets:update' pk=target.id %}" title="Update target" class="btn  btn-primary">Update</a>
-<a href="{% url 'tom_targets:delete' pk=target.id %}" title="Delete target" class="btn  btn-warning">Delete</a>
-<a href="{% url 'tom_targets:share' pk=target.id %}" title="Share target" class="btn  btn-info">Share</a>
\ No newline at end of file
+<a href="{% url 'tom_targets:share' pk=target.id %}" title="Share target" class="btn  btn-info">Share</a>
+<a href="{% url 'tom_targets:delete' pk=target.id %}" title="Delete target" class="btn  btn-warning">Delete</a>
\ No newline at end of file
diff --git a/tom_targets/urls.py b/tom_targets/urls.py
index 09bb8228f..2757371c4 100644
--- a/tom_targets/urls.py
+++ b/tom_targets/urls.py
@@ -1,7 +1,7 @@
 from django.urls import path
 
 from .views import TargetCreateView, TargetUpdateView, TargetDetailView, TargetNameSearchView
-from .views import TargetDeleteView, TargetListView, TargetImportView, TargetExportView
+from .views import TargetDeleteView, TargetListView, TargetImportView, TargetExportView, TargetShareView
 from .views import TargetGroupingView, TargetGroupingDeleteView, TargetGroupingCreateView, TargetAddRemoveGroupingView
 
 from .api_views import TargetViewSet, TargetExtraViewSet, TargetNameViewSet
@@ -24,7 +24,7 @@
     path('name/<str:name>', TargetNameSearchView.as_view(), name='name-search'),
     path('<int:pk>/update/', TargetUpdateView.as_view(), name='update'),
     path('<int:pk>/delete/', TargetDeleteView.as_view(), name='delete'),
-    path('<int:pk>/share/', TargetUpdateView.as_view(), name='share'),
+    path('<int:pk>/share/', TargetShareView.as_view(), name='share'),
     path('<int:pk>/', TargetDetailView.as_view(), name='detail'),
     path('targetgrouping/<int:pk>/delete/', TargetGroupingDeleteView.as_view(), name='delete-group'),
     path('targetgrouping/create/', TargetGroupingCreateView.as_view(), name='create-group')
diff --git a/tom_targets/views.py b/tom_targets/views.py
index d762e7e47..a0dc8d021 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -17,7 +17,7 @@
 from django.urls import reverse_lazy, reverse
 from django.utils.text import slugify
 from django.utils.safestring import mark_safe
-from django.views.generic.edit import CreateView, UpdateView, DeleteView
+from django.views.generic.edit import CreateView, UpdateView, DeleteView, FormView
 from django.views.generic.detail import DetailView
 from django.views.generic.list import ListView
 from django.views.generic import RedirectView, TemplateView, View
@@ -32,9 +32,9 @@
 from tom_observations.observation_template import ApplyObservationTemplateForm
 from tom_observations.models import ObservationTemplate
 from tom_targets.filters import TargetFilter
-from tom_targets.forms import (
-    SiderealTargetCreateForm, NonSiderealTargetCreateForm, TargetExtraFormset, TargetNamesFormset
-)
+from tom_targets.forms import SiderealTargetCreateForm, NonSiderealTargetCreateForm, TargetExtraFormset
+from tom_targets.forms import TargetNamesFormset, TargetShareForm
+
 from tom_targets.groups import (
     add_all_to_grouping, add_selected_to_grouping, remove_all_from_grouping, remove_selected_from_grouping,
     move_all_to_grouping, move_selected_to_grouping
@@ -321,64 +321,6 @@ def get_form(self, *args, **kwargs):
         return form
 
 
-# class TargetShareView(FormView):
-#     """
-#     View that handles the sharing of data either through HERMES or with another TOM.
-#     """
-#
-#     form_class = DataShareForm
-#
-#     def get_form(self, *args, **kwargs):
-#         # TODO: Add permissions
-#         form = super().get_form(*args, **kwargs)
-#         return form
-#
-#     def form_invalid(self, form):
-#         """
-#         Adds errors to Django messaging framework in the case of an invalid form and redirects to the previous page.
-#         """
-#         # TODO: Format error messages in a more human-readable way
-#         messages.error(self.request, 'There was a problem sharing your Data: {}'.format(form.errors.as_json()))
-#         return redirect(form.cleaned_data.get('referrer', '/'))
-#
-#     def post(self, request, *args, **kwargs):
-#         """
-#         Method that handles the POST requests for sharing data.
-#         Handles Data Products and All the data of a type for a target as well as individual Reduced Datums.
-#         Submit to Hermes, or Share with TOM (soon).
-#         """
-#         data_share_form = DataShareForm(request.POST, request.FILES)
-#
-#         if data_share_form.is_valid():
-#             form_data = data_share_form.cleaned_data
-#             share_destination = form_data['share_destination']
-#             product_id = kwargs.get('dp_pk', None)
-#             target_id = kwargs.get('tg_pk', None)
-#
-#             # Check if data points have been selected.
-#             selected_data = request.POST.getlist("share-box")
-#
-#             # Check Destination
-#             if 'HERMES' in share_destination.upper():
-#                 response = share_data_with_hermes(share_destination, form_data, product_id, target_id, selected_data)
-#             else:
-#                 response = share_data_with_tom(share_destination, form_data, product_id, target_id, selected_data)
-#             try:
-#                 if 'message' in response.json():
-#                     publish_feedback = response.json()['message']
-#                 else:
-#                     publish_feedback = f"ERROR: {response.text}"
-#             except AttributeError:
-#                 publish_feedback = response['message']
-#             except ValueError:
-#                 publish_feedback = f"ERROR: Returned Response code {response.status_code}"
-#             if "ERROR" in publish_feedback.upper():
-#                 messages.error(self.request, publish_feedback)
-#             else:
-#                 messages.success(self.request, publish_feedback)
-#         return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
-
-
 class TargetDeleteView(Raise403PermissionRequiredMixin, DeleteView):
     """
     View for deleting a target. Requires authorization.
@@ -388,6 +330,41 @@ class TargetDeleteView(Raise403PermissionRequiredMixin, DeleteView):
     model = Target
 
 
+class TargetShareView(FormView):
+    """
+    View for deleting a target. Requires authorization.
+    """
+    template_name = 'tom_targets/target_share.html'
+    # permission_required = 'tom_targets.share_target'
+    form_class = TargetShareForm
+
+    def get_context_data(self, *args, **kwargs):
+        """
+        Adds the ``DataProductUploadForm`` to the context and prepopulates the hidden fields.
+        :returns: context object
+        :rtype: dict
+        """
+        context = super().get_context_data(*args, **kwargs)
+        target_id = self.kwargs.get('pk', None)
+        context['target'] = Target.objects.get(id=target_id)
+        return context
+
+    def get_success_url(self):
+        return reverse_lazy('targets:detail', kwargs={'pk': self.kwargs.get('pk', None)})
+
+    def form_invalid(self, form):
+        """
+        Adds errors to Django messaging framework in the case of an invalid form and redirects to the previous page.
+        """
+        # TODO: Format error messages in a more human-readable way
+        messages.error(self.request, 'There was a problem sharing your Data: {}'.format(form.errors.as_json()))
+        return redirect(self.get_success_url())
+
+    def form_valid(self, form):
+        messages.success(self.request, "Target successfully shared.")
+        return redirect(self.get_success_url())
+
+
 class TargetDetailView(Raise403PermissionRequiredMixin, DetailView):
     """
     View that handles the display of the target details. Requires authorization.

From 1977bf8905fb51ee6ab31081b66f90ea59709139 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 18 Jul 2023 17:43:36 -0700
Subject: [PATCH 14/37] share target.

---
 tom_dataproducts/sharing.py |  28 ++++--
 tom_targets/api_views.py    |  10 ++
 tom_targets/forms.py        |   6 +-
 tom_targets/serializers.py  |   2 +-
 tom_targets/tests/tests.py  | 183 ++++++++++++++++++++++++++++++++++++
 tom_targets/views.py        |  29 +++++-
 6 files changed, 244 insertions(+), 14 deletions(-)

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index f6a7cda1e..22e64d4ad 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -24,25 +24,29 @@ def share_data_with_hermes(share_destination, form_data, product_id=None, target
     accepted_data_types = ['photometry']
     if product_id:
         product = DataProduct.objects.get(pk=product_id)
+        target = product.target
         reduced_datums = ReducedDatum.objects.filter(data_product=product)
     elif selected_data:
         reduced_datums = ReducedDatum.objects.filter(pk__in=selected_data)
+        target = reduced_datums[0].target
     elif target_id:
         target = Target.objects.get(pk=target_id)
-        data_type = form_data['data_type']
+        data_type = form_data.get('data_type', 'photometry')
         reduced_datums = ReducedDatum.objects.filter(target=target, data_type=data_type)
     else:
         reduced_datums = ReducedDatum.objects.none()
+        target = Target.objects.none()
 
     reduced_datums.filter(data_type__in=accepted_data_types)
 
     # Build and submit hermes table from Reduced Datums
     hermes_topic = share_destination.split(':')[1]
     destination = share_destination.split(':')[0]
-    message_info = BuildHermesMessage(title=form_data['share_title'],
-                                      submitter=form_data['submitter'],
-                                      authors=form_data['share_authors'],
-                                      message=form_data['share_message'],
+    message_info = BuildHermesMessage(title=form_data.get('share_title', f"Updated data for {target.name} from "
+                                                                         f"{getattr(settings, 'TOM_NAME','TOM Toolkit')}."),
+                                      submitter=form_data.get('submitter'),
+                                      authors=form_data.get('share_authors', None),
+                                      message=form_data.get('share_message', None),
                                       topic=hermes_topic
                                       )
     # Run ReducedDatums Queryset through sharing protocols to make sure they are safe to share.
@@ -137,16 +141,24 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
 
 
 def get_destination_target(target, targets_url, headers, auth):
+    """
+    Retrieve the target ID from a destination TOM
+    :param target: Target Model
+    :param targets_url: Destination API URL for TOM Target List
+    :param headers:
+    :param auth:
+    :return:
+    """
     target_response = requests.get(f'{targets_url}?name={target.name}', headers=headers, auth=auth)
     target_response_json = target_response.json()
     try:
         if target_response_json['results']:
             destination_target_id = target_response_json['results'][0]['id']
-            return destination_target_id
+            return destination_target_id, target_response
         else:
-            return None
+            return None, target_response
     except KeyError:
-        return None
+        return None, target_response
 
 
 def check_for_share_safe_datums(destination, reduced_datums, **kwargs):
diff --git a/tom_targets/api_views.py b/tom_targets/api_views.py
index 6e87576ac..edb289e4b 100644
--- a/tom_targets/api_views.py
+++ b/tom_targets/api_views.py
@@ -3,6 +3,7 @@
 from guardian.shortcuts import get_objects_for_user
 from rest_framework.mixins import DestroyModelMixin, RetrieveModelMixin
 from rest_framework.viewsets import GenericViewSet, ModelViewSet
+from rest_framework import status
 
 from tom_targets.filters import TargetFilter
 from tom_targets.models import TargetExtra, TargetName
@@ -53,6 +54,15 @@ def get_queryset(self):
         permission_required = permissions_map.get(self.request.method)
         return get_objects_for_user(self.request.user, f'tom_targets.{permission_required}')
 
+    def create(self, request, *args, **kwargs):
+        print(request)
+        response = super().create(request, *args, **kwargs)
+
+        if response.status_code == status.HTTP_201_CREATED:
+            response.data['message'] = 'Target successfully uploaded.'
+            print(response.data)
+        return response
+
 
 class TargetNameViewSet(DestroyModelMixin, PermissionListMixin, RetrieveModelMixin, GenericViewSet):
     """
diff --git a/tom_targets/forms.py b/tom_targets/forms.py
index 69dc3aa1c..9f8f8ca7c 100644
--- a/tom_targets/forms.py
+++ b/tom_targets/forms.py
@@ -174,10 +174,8 @@ class TargetShareForm(forms.Form):
     target = forms.ModelChoiceField(
         Target.objects.all(),
         widget=forms.HiddenInput(),
-        required=False)
-    submitter = forms.CharField(
-        widget=forms.HiddenInput()
-    )
+        required=True)
+    submitter = forms.CharField(widget=forms.HiddenInput())
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/tom_targets/serializers.py b/tom_targets/serializers.py
index a39dec43c..0d5dddce3 100644
--- a/tom_targets/serializers.py
+++ b/tom_targets/serializers.py
@@ -24,7 +24,7 @@ class Meta:
 
 
 class TargetSerializer(serializers.ModelSerializer):
-    """Target serializer responsbile for transforming models to/from
+    """Target serializer responsible for transforming models to/from
     json (or other representations). See
     https://www.django-rest-framework.org/api-guide/serializers/#modelserializer
     """
diff --git a/tom_targets/tests/tests.py b/tom_targets/tests/tests.py
index 661acff85..e3f7e9404 100644
--- a/tom_targets/tests/tests.py
+++ b/tom_targets/tests/tests.py
@@ -1,16 +1,21 @@
 import pytz
 from datetime import datetime
+import responses
 
 from django.contrib.auth.models import User, Group
 from django.contrib.messages import get_messages
 from django.contrib.messages.constants import SUCCESS, WARNING
 from django.test import TestCase, override_settings
+from django.conf import settings
 from django.urls import reverse
 from django.core.exceptions import ValidationError
 
 from .factories import SiderealTargetFactory, NonSiderealTargetFactory, TargetGroupingFactory, TargetNameFactory
+from tom_observations.tests.utils import FakeRoboticFacility
+from tom_observations.tests.factories import ObservingRecordFactory
 from tom_targets.models import Target, TargetExtra, TargetList, TargetName
 from tom_targets.utils import import_targets
+from tom_dataproducts.models import ReducedDatum
 from guardian.shortcuts import assign_perm
 
 
@@ -1275,3 +1280,181 @@ def test_persist_filter_empty(self):
         response = self.client.post(reverse('targets:add-remove-grouping'), data={}, follow=True)
         response_query_dict = response.context['filter'].data
         self.assertEqual(response_query_dict, expected_query_dict)
+
+
+@override_settings(TOM_FACILITY_CLASSES=['tom_observations.tests.utils.FakeRoboticFacility'],
+                   TARGET_PERMISSIONS_ONLY=True,
+                   DATA_SHARING={'local_host': {'BASE_URL': 'https://fake.url/example/',
+                                                'USERNAME': 'fake_user',
+                                                'PASSWORD': 'password'}})
+class TestShareTargets(TestCase):
+    def setUp(self):
+        self.target = SiderealTargetFactory.create()
+        self.observation_record = ObservingRecordFactory.create(
+            target_id=self.target.id,
+            facility=FakeRoboticFacility.name,
+            parameters={}
+        )
+        self.user = User.objects.create_user(username='test', email='test@example.com')
+        assign_perm('tom_targets.view_target', self.user, self.target)
+        self.client.force_login(self.user)
+        self.rd1 = ReducedDatum.objects.create(
+            target=self.target,
+            data_type='photometry',
+            value={'magnitude': 18.5, 'error': .5, 'filter': 'V'}
+        )
+        self.rd2 = ReducedDatum.objects.create(
+            target=self.target,
+            data_type='photometry',
+            value={'magnitude': 19.5, 'error': .5, 'filter': 'B'}
+        )
+        self.rd3 = ReducedDatum.objects.create(
+            target=self.target,
+            data_type='photometry',
+            value={'magnitude': 17.5, 'error': .5, 'filter': 'R'}
+        )
+
+    @responses.activate
+    def test_share_target_no_valid_responses(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"error": "not found"},
+            status=500
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+
+        response = self.client.post(
+            reverse('targets:share', kwargs={'pk': self.target.id}),
+            {
+                'submitter': ['test_submitter'],
+                'target': self.target.id,
+                'share_destination': [share_destination],
+            },
+            follow=True
+        )
+        self.assertContains(response, "not found")
+
+    @responses.activate
+    def test_share_target_valid_connection_no_target_found(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"results": []},
+            status=200
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+        responses.add(
+            responses.POST,
+            destination_tom_base_url + 'api/targets/',
+            json={"message": "Target successfully uploaded."},
+            status=200,
+        )
+        response = self.client.post(
+            reverse('targets:share', kwargs={'pk': self.target.id}),
+            {
+                'submitter': ['test_submitter'],
+                'target': self.target.id,
+                'share_destination': [share_destination],
+            },
+            follow=True
+        )
+
+        self.assertContains(response, 'Target successfully uploaded.')
+
+    @responses.activate
+    def test_share_reduceddatums_target_valid_responses(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"results": [{'id': 1}]},
+            status=200
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+        responses.add(
+            responses.POST,
+            destination_tom_base_url + 'api/reduceddatums/',
+            json={},
+            status=201,
+        )
+
+        response = self.client.post(
+            reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
+            {
+                'share_authors': ['test_author'],
+                'target': self.target.id,
+                'submitter': ['test_submitter'],
+                'share_destination': [share_destination],
+                'share_title': ['Updated data for thingy.'],
+                'share_message': ['test_message']
+            },
+            follow=True
+        )
+        self.assertContains(response, '3 of 3 datums successfully saved.')
+
+    @responses.activate
+    def test_share_reduced_datums_valid_responses(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"results": [{'id': 1}]},
+            status=200
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+        responses.add(
+            responses.POST,
+            destination_tom_base_url + 'api/reduceddatums/',
+            json={},
+            status=201,
+        )
+
+        response = self.client.post(
+            reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
+            {
+                'share_authors': ['test_author'],
+                'target': self.target.id,
+                'submitter': ['test_submitter'],
+                'share_destination': [share_destination],
+                'share_title': ['Updated data for thingy.'],
+                'share_message': ['test_message'],
+                'share-box': [1, 2]
+            },
+            follow=True
+        )
+        self.assertContains(response, '2 of 2 datums successfully saved.')
diff --git a/tom_targets/views.py b/tom_targets/views.py
index a0dc8d021..b147f13a8 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -34,6 +34,8 @@
 from tom_targets.filters import TargetFilter
 from tom_targets.forms import SiderealTargetCreateForm, NonSiderealTargetCreateForm, TargetExtraFormset
 from tom_targets.forms import TargetNamesFormset, TargetShareForm
+from tom_targets.sharing import share_target_with_tom
+from tom_dataproducts.sharing import share_data_with_hermes
 
 from tom_targets.groups import (
     add_all_to_grouping, add_selected_to_grouping, remove_all_from_grouping, remove_selected_from_grouping,
@@ -347,6 +349,7 @@ def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
         target_id = self.kwargs.get('pk', None)
         context['target'] = Target.objects.get(id=target_id)
+
         return context
 
     def get_success_url(self):
@@ -357,11 +360,35 @@ def form_invalid(self, form):
         Adds errors to Django messaging framework in the case of an invalid form and redirects to the previous page.
         """
         # TODO: Format error messages in a more human-readable way
+        print(form.cleaned_data)
+        print('There was a problem sharing your Data: {}'.format(form.errors.as_json()))
         messages.error(self.request, 'There was a problem sharing your Data: {}'.format(form.errors.as_json()))
         return redirect(self.get_success_url())
 
     def form_valid(self, form):
-        messages.success(self.request, "Target successfully shared.")
+        form_data = form.cleaned_data
+        share_destination = form_data['share_destination']
+        target_id = self.kwargs.get('pk', None)
+        selected_data = self.request.POST.getlist("share-box")
+        print(form_data)
+        print(selected_data)
+        if 'HERMES' in share_destination.upper():
+            response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
+        else:
+            response = share_target_with_tom(share_destination, form_data, selected_data)
+        try:
+            if 'message' in response.json():
+                publish_feedback = response.json()['message']
+            else:
+                publish_feedback = f"ERROR: {response.text}"
+        except AttributeError:
+            publish_feedback = response['message']
+        except ValueError:
+            publish_feedback = f"ERROR: Returned Response code {response.status_code}"
+        if "ERROR" in publish_feedback.upper():
+            messages.error(self.request, publish_feedback)
+        else:
+            messages.success(self.request, publish_feedback)
         return redirect(self.get_success_url())
 
 

From 2d5eb964dc0ade865791d31b0ee40440bd92c911 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Thu, 20 Jul 2023 10:06:20 -0700
Subject: [PATCH 15/37] move data_sharing to view.

---
 tom_targets/views.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tom_targets/views.py b/tom_targets/views.py
index b147f13a8..38b231517 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -35,7 +35,7 @@
 from tom_targets.forms import SiderealTargetCreateForm, NonSiderealTargetCreateForm, TargetExtraFormset
 from tom_targets.forms import TargetNamesFormset, TargetShareForm
 from tom_targets.sharing import share_target_with_tom
-from tom_dataproducts.sharing import share_data_with_hermes
+from tom_dataproducts.sharing import share_data_with_hermes, share_data_with_tom
 
 from tom_targets.groups import (
     add_all_to_grouping, add_selected_to_grouping, remove_all_from_grouping, remove_selected_from_grouping,
@@ -360,8 +360,6 @@ def form_invalid(self, form):
         Adds errors to Django messaging framework in the case of an invalid form and redirects to the previous page.
         """
         # TODO: Format error messages in a more human-readable way
-        print(form.cleaned_data)
-        print('There was a problem sharing your Data: {}'.format(form.errors.as_json()))
         messages.error(self.request, 'There was a problem sharing your Data: {}'.format(form.errors.as_json()))
         return redirect(self.get_success_url())
 
@@ -376,6 +374,8 @@ def form_valid(self, form):
             response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
         else:
             response = share_target_with_tom(share_destination, form_data, selected_data)
+            if selected_data:
+                data_creation_response = share_data_with_tom(share_destination, form_data, selected_data=selected_data)
         try:
             if 'message' in response.json():
                 publish_feedback = response.json()['message']

From ccb05889ef15aacfba49c45ac0b26412318583a5 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Thu, 20 Jul 2023 10:18:29 -0700
Subject: [PATCH 16/37] actually include target sharing .py

---
 tom_targets/sharing.py                        | 45 +++++++++++++++++++
 .../templates/tom_targets/target_share.html   | 28 ++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 tom_targets/sharing.py
 create mode 100644 tom_targets/templates/tom_targets/target_share.html

diff --git a/tom_targets/sharing.py b/tom_targets/sharing.py
new file mode 100644
index 000000000..5bef33766
--- /dev/null
+++ b/tom_targets/sharing.py
@@ -0,0 +1,45 @@
+import requests
+
+from django.conf import settings
+
+from tom_targets.serializers import TargetSerializer, TargetNameSerializer, TargetExtraSerializer
+from tom_dataproducts.sharing import get_destination_target
+
+
+def share_target_with_tom(share_destination, form_data, selected_data):
+    """
+
+    :param share_destination:
+    :param form_data:
+    :param selected_data:
+    :return:
+    """
+    # Try to get destination tom authentication/URL information
+    try:
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+        username = settings.DATA_SHARING[share_destination]['USERNAME']
+        password = settings.DATA_SHARING[share_destination]['PASSWORD']
+    except KeyError as err:
+        raise ImproperlyConfigured(f'Check DATA_SHARING configuration for {share_destination}: Key {err} not found.')
+    auth = (username, password)
+    headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
+
+    # establish destination TOM URLs
+    targets_url = destination_tom_base_url + 'api/targets/'
+
+    # Check if target already exists in destination DB
+    destination_target_id, target_search_response = get_destination_target(form_data['target'], targets_url, headers,
+                                                                           auth)
+    target_create_response = []
+    if target_search_response.status_code != 200:
+        return target_search_response
+    if destination_target_id is None:
+        # If target is not in Destination, serialize and create new target.
+        serialized_target = TargetSerializer(form_data['target']).data
+        # Remove local Groups
+        serialized_target['groups'] = []
+        target_create_response = requests.post(targets_url, json=serialized_target, headers=headers, auth=auth)
+
+    return target_create_response
+
+
diff --git a/tom_targets/templates/tom_targets/target_share.html b/tom_targets/templates/tom_targets/target_share.html
new file mode 100644
index 000000000..0a9a034bf
--- /dev/null
+++ b/tom_targets/templates/tom_targets/target_share.html
@@ -0,0 +1,28 @@
+{% extends 'tom_common/base.html' %}
+{% load bootstrap4 dataproduct_extras static %}
+{% block title %}Share Target {{ target.name }}{% endblock %}
+{% block additional_css %}
+<link rel="stylesheet" href="{% static 'tom_common/css/main.css' %}">
+<link rel="stylesheet" href="{% static 'tom_targets/css/main.css' %}">
+{% endblock %}
+{% block content %}
+<h3> Share <a href="{% url 'targets:detail' pk=target.id %}" title="Back">{{ target.name }}</a></h3>
+<form method="post" class="form">
+    <div class="form-row" style="padding-inline:1rem">
+        <div class="col-sm-4">
+            {% bootstrap_form form %}
+        </div>
+        <div class="col-sm-2">
+            <input type="submit" class="btn btn-primary" formaction="{% url 'targets:share' pk=target.id %}" id="submit_selected" value="Submit" name="share_target_form" style="position:absolute; bottom:1rem">
+        </div>
+    </div>
+    <h4> Include Data </h4>
+    {% with target_share=True %}
+        {% get_photometry_data target target_share %}
+    {% endwith %}
+    {% buttons %}
+<!--        <input type="submit" class="btn btn-primary" formaction="{% url 'targets:share' pk=target.id %}" id="submit_selected_2" value="Submit" name="share_target_form">-->
+        <a href="{% url 'targets:detail' pk=target.id %}" class="btn btn-primary" title="Back">Back</a>
+    {% endbuttons %}
+</form>
+{% endblock %}
\ No newline at end of file

From 98a1ad2a6d09c687ab6b2f6b3c9b7e3f7e06d770 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Thu, 20 Jul 2023 11:06:29 -0700
Subject: [PATCH 17/37] fix tests

---
 tom_dataproducts/sharing.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index 22e64d4ad..c78795a97 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -87,7 +87,7 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
         product = DataProduct.objects.get(pk=product_id)
         target = product.target
         serialized_data = DataProductSerializer(product).data
-        destination_target_id = get_destination_target(target, targets_url, headers, auth)
+        destination_target_id, target_search_response = get_destination_target(target, targets_url, headers, auth)
         if destination_target_id is None:
             return {'message': 'ERROR: No matching target found.'}
         serialized_data['target'] = destination_target_id
@@ -105,14 +105,14 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
             target_dict = {}
             for target in targets:
                 # get destination Target
-                destination_target_id = get_destination_target(target, targets_url, headers, auth)
+                destination_target_id, target_search_response = get_destination_target(target, targets_url, headers, auth)
                 target_dict[target.name] = destination_target_id
             if all(value is None for value in target_dict.values()):
                 return {'message': 'ERROR: No matching targets found.'}
         else:
             target = Target.objects.get(pk=target_id)
             reduced_datums = ReducedDatum.objects.filter(target=target)
-            destination_target_id = get_destination_target(target, targets_url, headers, auth)
+            destination_target_id, target_search_response = get_destination_target(target, targets_url, headers, auth)
             if destination_target_id is None:
                 return {'message': 'ERROR: No matching target found.'}
             target_dict = {target.name:  destination_target_id}

From bab12fd0d5ad95cbfc7c74b00ad81ae6db25f413 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Thu, 20 Jul 2023 15:47:56 -0700
Subject: [PATCH 18/37] fix up some tests

---
 setup.py                      |  3 +--
 tom_targets/api_views.py      |  2 --
 tom_targets/serializers.py    |  5 +++-
 tom_targets/sharing.py        |  2 +-
 tom_targets/tests/test_api.py |  2 +-
 tom_targets/tests/tests.py    | 45 ++---------------------------------
 tom_targets/views.py          |  4 +---
 7 files changed, 10 insertions(+), 53 deletions(-)

diff --git a/setup.py b/setup.py
index 237a9c69a..045344621 100644
--- a/setup.py
+++ b/setup.py
@@ -49,11 +49,10 @@
         'plotly~=5.0',
         'python-dateutil~=2.8',
         'requests~=2.25',
-        'responses~=0.23',
         'specutils~=1.8',
     ],
     extras_require={
-        'test': ['factory_boy~=3.2.1'],
+        'test': ['factory_boy~=3.2.1', 'responses~=0.23'],
         'docs': [
             'recommonmark~=0.7',
             'sphinx>=4,<8',
diff --git a/tom_targets/api_views.py b/tom_targets/api_views.py
index edb289e4b..12cf52079 100644
--- a/tom_targets/api_views.py
+++ b/tom_targets/api_views.py
@@ -55,12 +55,10 @@ def get_queryset(self):
         return get_objects_for_user(self.request.user, f'tom_targets.{permission_required}')
 
     def create(self, request, *args, **kwargs):
-        print(request)
         response = super().create(request, *args, **kwargs)
 
         if response.status_code == status.HTTP_201_CREATED:
             response.data['message'] = 'Target successfully uploaded.'
-            print(response.data)
         return response
 
 
diff --git a/tom_targets/serializers.py b/tom_targets/serializers.py
index 0d5dddce3..ecd4458c9 100644
--- a/tom_targets/serializers.py
+++ b/tom_targets/serializers.py
@@ -61,7 +61,10 @@ def create(self, validated_data):
         group_serializer = GroupSerializer(data=groups, many=True)
         if group_serializer.is_valid():
             for group in groups:
-                group_instance = Group.objects.get(pk=group['id'])
+                try:
+                    group_instance = Group.objects.get(pk=group['id'])
+                except KeyError:
+                    group_instance, _ = Group.objects.get_or_create(name=group['name'])
                 assign_perm('tom_targets.view_target', group_instance, target)
                 assign_perm('tom_targets.change_target', group_instance, target)
                 assign_perm('tom_targets.delete_target', group_instance, target)
diff --git a/tom_targets/sharing.py b/tom_targets/sharing.py
index 5bef33766..64a472fe4 100644
--- a/tom_targets/sharing.py
+++ b/tom_targets/sharing.py
@@ -37,7 +37,7 @@ def share_target_with_tom(share_destination, form_data, selected_data):
         # If target is not in Destination, serialize and create new target.
         serialized_target = TargetSerializer(form_data['target']).data
         # Remove local Groups
-        serialized_target['groups'] = []
+        serialized_target['groups'] = [{'name': f'Imported From {settings.TOM_NAME}'}]
         target_create_response = requests.post(targets_url, json=serialized_target, headers=headers, auth=auth)
 
     return target_create_response
diff --git a/tom_targets/tests/test_api.py b/tom_targets/tests/test_api.py
index 7c2261319..da50c40bc 100644
--- a/tom_targets/tests/test_api.py
+++ b/tom_targets/tests/test_api.py
@@ -64,7 +64,7 @@ def test_target_create(self):
             'ra': 123.456,
             'dec': -32.1,
             'groups': [
-                {'id': group.id}
+                {'id': group.id}, {'name': 'test_group'}
             ],
             'targetextra_set': [
                 {'key': 'foo', 'value': 5}
diff --git a/tom_targets/tests/tests.py b/tom_targets/tests/tests.py
index e3f7e9404..d0bbb88e0 100644
--- a/tom_targets/tests/tests.py
+++ b/tom_targets/tests/tests.py
@@ -1406,55 +1406,14 @@ def test_share_reduceddatums_target_valid_responses(self):
         )
 
         response = self.client.post(
-            reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
+            reverse('targets:share', kwargs={'pk': self.target.id}),
             {
-                'share_authors': ['test_author'],
-                'target': self.target.id,
                 'submitter': ['test_submitter'],
-                'share_destination': [share_destination],
-                'share_title': ['Updated data for thingy.'],
-                'share_message': ['test_message']
-            },
-            follow=True
-        )
-        self.assertContains(response, '3 of 3 datums successfully saved.')
-
-    @responses.activate
-    def test_share_reduced_datums_valid_responses(self):
-        share_destination = 'local_host'
-        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
-
-        rsp1 = responses.Response(
-            method="GET",
-            url=destination_tom_base_url + 'api/targets/',
-            json={"results": [{'id': 1}]},
-            status=200
-        )
-        responses.add(rsp1)
-        responses.add(
-            responses.GET,
-            "http://hermes-dev.lco.global/api/v0/profile/",
-            json={"error": "not found"},
-            status=404,
-        )
-        responses.add(
-            responses.POST,
-            destination_tom_base_url + 'api/reduceddatums/',
-            json={},
-            status=201,
-        )
-
-        response = self.client.post(
-            reverse('dataproducts:share_all', kwargs={'tg_pk': self.target.id}),
-            {
-                'share_authors': ['test_author'],
                 'target': self.target.id,
-                'submitter': ['test_submitter'],
                 'share_destination': [share_destination],
-                'share_title': ['Updated data for thingy.'],
-                'share_message': ['test_message'],
                 'share-box': [1, 2]
             },
             follow=True
         )
+
         self.assertContains(response, '2 of 2 datums successfully saved.')
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 38b231517..cf9f9ed61 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -368,14 +368,12 @@ def form_valid(self, form):
         share_destination = form_data['share_destination']
         target_id = self.kwargs.get('pk', None)
         selected_data = self.request.POST.getlist("share-box")
-        print(form_data)
-        print(selected_data)
         if 'HERMES' in share_destination.upper():
             response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
         else:
             response = share_target_with_tom(share_destination, form_data, selected_data)
             if selected_data:
-                data_creation_response = share_data_with_tom(share_destination, form_data, selected_data=selected_data)
+                response = share_data_with_tom(share_destination, form_data, selected_data=selected_data)
         try:
             if 'message' in response.json():
                 publish_feedback = response.json()['message']

From 5d70c0781701a884aefe46cb9254afd93c79d357 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Thu, 20 Jul 2023 15:58:28 -0700
Subject: [PATCH 19/37] address lint

---
 tom_dataproducts/sharing.py | 10 +++++++---
 tom_targets/sharing.py      |  7 +++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index c78795a97..61d0ebfd9 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -42,8 +42,9 @@ def share_data_with_hermes(share_destination, form_data, product_id=None, target
     # Build and submit hermes table from Reduced Datums
     hermes_topic = share_destination.split(':')[1]
     destination = share_destination.split(':')[0]
-    message_info = BuildHermesMessage(title=form_data.get('share_title', f"Updated data for {target.name} from "
-                                                                         f"{getattr(settings, 'TOM_NAME','TOM Toolkit')}."),
+    message_info = BuildHermesMessage(title=form_data.get('share_title',
+                                                          f"Updated data for {target.name} from "
+                                                          f"{getattr(settings, 'TOM_NAME','TOM Toolkit')}."),
                                       submitter=form_data.get('submitter'),
                                       authors=form_data.get('share_authors', None),
                                       message=form_data.get('share_message', None),
@@ -105,7 +106,10 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
             target_dict = {}
             for target in targets:
                 # get destination Target
-                destination_target_id, target_search_response = get_destination_target(target, targets_url, headers, auth)
+                destination_target_id, target_search_response = get_destination_target(target,
+                                                                                       targets_url,
+                                                                                       headers,
+                                                                                       auth)
                 target_dict[target.name] = destination_target_id
             if all(value is None for value in target_dict.values()):
                 return {'message': 'ERROR: No matching targets found.'}
diff --git a/tom_targets/sharing.py b/tom_targets/sharing.py
index 64a472fe4..3327afe84 100644
--- a/tom_targets/sharing.py
+++ b/tom_targets/sharing.py
@@ -1,8 +1,9 @@
 import requests
 
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 
-from tom_targets.serializers import TargetSerializer, TargetNameSerializer, TargetExtraSerializer
+from tom_targets.serializers import TargetSerializer
 from tom_dataproducts.sharing import get_destination_target
 
 
@@ -40,6 +41,4 @@ def share_target_with_tom(share_destination, form_data, selected_data):
         serialized_target['groups'] = [{'name': f'Imported From {settings.TOM_NAME}'}]
         target_create_response = requests.post(targets_url, json=serialized_target, headers=headers, auth=auth)
 
-    return target_create_response
-
-
+    return target_create_response
\ No newline at end of file

From c94dfb723341f1abc7506039ccebec0b1c5f90c1 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Thu, 20 Jul 2023 16:01:40 -0700
Subject: [PATCH 20/37] add newline

---
 tom_targets/sharing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tom_targets/sharing.py b/tom_targets/sharing.py
index 3327afe84..b3d30e5d2 100644
--- a/tom_targets/sharing.py
+++ b/tom_targets/sharing.py
@@ -41,4 +41,4 @@ def share_target_with_tom(share_destination, form_data, selected_data):
         serialized_target['groups'] = [{'name': f'Imported From {settings.TOM_NAME}'}]
         target_create_response = requests.post(targets_url, json=serialized_target, headers=headers, auth=auth)
 
-    return target_create_response
\ No newline at end of file
+    return target_create_response

From 75b649e0165e6bd9d859b580771f9101a1db99da Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 8 Aug 2023 14:25:14 -0700
Subject: [PATCH 21/37] fix submit button bug for target sharing

---
 tom_targets/templates/tom_targets/target_share.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tom_targets/templates/tom_targets/target_share.html b/tom_targets/templates/tom_targets/target_share.html
index 0a9a034bf..bf318be5e 100644
--- a/tom_targets/templates/tom_targets/target_share.html
+++ b/tom_targets/templates/tom_targets/target_share.html
@@ -13,7 +13,7 @@ <h3> Share <a href="{% url 'targets:detail' pk=target.id %}" title="Back">{{ tar
             {% bootstrap_form form %}
         </div>
         <div class="col-sm-2">
-            <input type="submit" class="btn btn-primary" formaction="{% url 'targets:share' pk=target.id %}" id="submit_selected" value="Submit" name="share_target_form" style="position:absolute; bottom:1rem">
+            <input type="submit" class="btn btn-primary" formaction="{% url 'targets:share' pk=target.id %}" id="submit_target" value="Submit" name="share_target_form" style="position:absolute; bottom:1rem">
         </div>
     </div>
     <h4> Include Data </h4>

From 53dad4f1e5556a7d2e112349a0befff149a94e65 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 8 Aug 2023 17:41:34 -0700
Subject: [PATCH 22/37] create barebones group share page/view

---
 .../tom_targets/target_group_share.html       | 25 ++++++++
 .../tom_targets/target_grouping.html          |  2 +
 .../templates/tom_targets/target_share.html   |  1 -
 tom_targets/urls.py                           |  5 +-
 tom_targets/views.py                          | 58 +++++++++++++++++++
 5 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 tom_targets/templates/tom_targets/target_group_share.html

diff --git a/tom_targets/templates/tom_targets/target_group_share.html b/tom_targets/templates/tom_targets/target_group_share.html
new file mode 100644
index 000000000..3417360a0
--- /dev/null
+++ b/tom_targets/templates/tom_targets/target_group_share.html
@@ -0,0 +1,25 @@
+{% extends 'tom_common/base.html' %}
+{% load bootstrap4 dataproduct_extras static %}
+{% block title %}Share {{ group.name }} Group{% endblock %}
+{% block additional_css %}
+<link rel="stylesheet" href="{% static 'tom_common/css/main.css' %}">
+<link rel="stylesheet" href="{% static 'tom_targets/css/main.css' %}">
+{% endblock %}
+{% block content %}
+<h3> Share <button type="submit" class="btn btn-link" name="targetlist__name" value="{{group.id}}" title="View Group">{{ group.name }}</button> Group </h3>
+<form method="post" class="form">
+    <div class="form-row" style="padding-inline:1rem">
+        <div class="col-sm-4">
+            {% bootstrap_form form %}
+        </div>
+        <div class="col-sm-2">
+            <input type="submit" class="btn btn-primary" formaction="{% url 'targets:share-group' pk=group.id %}" id="submit_targetlist" value="Submit" name="share_targetlist_form" style="position:absolute; bottom:1rem">
+        </div>
+    </div>
+
+
+    {% buttons %}
+        <a href="{% url 'targets:targetgrouping' %}" class="btn btn-primary" title="Back">Back</a>
+    {% endbuttons %}
+</form>
+{% endblock %}
\ No newline at end of file
diff --git a/tom_targets/templates/tom_targets/target_grouping.html b/tom_targets/templates/tom_targets/target_grouping.html
index d5889db1a..647d0db44 100644
--- a/tom_targets/templates/tom_targets/target_grouping.html
+++ b/tom_targets/templates/tom_targets/target_grouping.html
@@ -17,6 +17,7 @@ <h1>Target Groupings</h1>
       <tr>
         <th>Group</th>
         <th>Total Targets</th>
+        <th>Share</th>
         <th>Delete</th>
       </tr>
     </thead>
@@ -25,6 +26,7 @@ <h1>Target Groupings</h1>
       <tr>
         <td><button type="submit" class="btn btn-link" name="targetlist__name" value="{{group.id}}" title="View Group">{{ group.name }}</button></td>
         <td valign="middle">{{ group.targets.count }}</td>
+        <td><a href="{% url 'targets:share-group' group.id%}" title="Share Group" class="btn btn-info">Share</a></td>
         <td><a href="{% url 'targets:delete-group' group.id%}" title="Delete Group" class="btn btn-danger">Delete</a></td>
       </tr>
       {% empty %}
diff --git a/tom_targets/templates/tom_targets/target_share.html b/tom_targets/templates/tom_targets/target_share.html
index bf318be5e..e1222c13a 100644
--- a/tom_targets/templates/tom_targets/target_share.html
+++ b/tom_targets/templates/tom_targets/target_share.html
@@ -21,7 +21,6 @@ <h4> Include Data </h4>
         {% get_photometry_data target target_share %}
     {% endwith %}
     {% buttons %}
-<!--        <input type="submit" class="btn btn-primary" formaction="{% url 'targets:share' pk=target.id %}" id="submit_selected_2" value="Submit" name="share_target_form">-->
         <a href="{% url 'targets:detail' pk=target.id %}" class="btn btn-primary" title="Back">Back</a>
     {% endbuttons %}
 </form>
diff --git a/tom_targets/urls.py b/tom_targets/urls.py
index 2757371c4..3d6822dad 100644
--- a/tom_targets/urls.py
+++ b/tom_targets/urls.py
@@ -3,6 +3,7 @@
 from .views import TargetCreateView, TargetUpdateView, TargetDetailView, TargetNameSearchView
 from .views import TargetDeleteView, TargetListView, TargetImportView, TargetExportView, TargetShareView
 from .views import TargetGroupingView, TargetGroupingDeleteView, TargetGroupingCreateView, TargetAddRemoveGroupingView
+from .views import TargetGroupingShareView
 
 from .api_views import TargetViewSet, TargetExtraViewSet, TargetNameViewSet
 from tom_common.api_router import SharedAPIRootRouter
@@ -27,5 +28,7 @@
     path('<int:pk>/share/', TargetShareView.as_view(), name='share'),
     path('<int:pk>/', TargetDetailView.as_view(), name='detail'),
     path('targetgrouping/<int:pk>/delete/', TargetGroupingDeleteView.as_view(), name='delete-group'),
-    path('targetgrouping/create/', TargetGroupingCreateView.as_view(), name='create-group')
+    path('targetgrouping/create/', TargetGroupingCreateView.as_view(), name='create-group'),
+    path('targetgrouping/<int:pk>/share/', TargetGroupingShareView.as_view(), name='share-group')
+
 ]
diff --git a/tom_targets/views.py b/tom_targets/views.py
index cf9f9ed61..1eb221df1 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -588,3 +588,61 @@ def form_valid(self, form):
         assign_perm('tom_targets.change_targetlist', self.request.user, obj)
         assign_perm('tom_targets.delete_targetlist', self.request.user, obj)
         return super().form_valid(form)
+
+
+class TargetGroupingShareView(FormView):
+    """
+    View for deleting a target. Requires authorization.
+    """
+    template_name = 'tom_targets/target_group_share.html'
+    # permission_required = 'tom_targets.share_target'
+    form_class = TargetShareForm
+
+    def get_context_data(self, *args, **kwargs):
+        """
+        Adds the ``DataProductUploadForm`` to the context and prepopulates the hidden fields.
+        :returns: context object
+        :rtype: dict
+        """
+        context = super().get_context_data(*args, **kwargs)
+        group_id = self.kwargs.get('pk', None)
+        context['group'] = TargetList.objects.get(id=group_id)
+
+        return context
+    #
+    # def get_success_url(self):
+    #     return reverse_lazy('targets:detail', kwargs={'pk': self.kwargs.get('pk', None)})
+    #
+    # def form_invalid(self, form):
+    #     """
+    #     Adds errors to Django messaging framework in the case of an invalid form and redirects to the previous page.
+    #     """
+    #     # TODO: Format error messages in a more human-readable way
+    #     messages.error(self.request, 'There was a problem sharing your Data: {}'.format(form.errors.as_json()))
+    #     return redirect(self.get_success_url())
+    #
+    # def form_valid(self, form):
+    #     form_data = form.cleaned_data
+    #     share_destination = form_data['share_destination']
+    #     target_id = self.kwargs.get('pk', None)
+    #     selected_data = self.request.POST.getlist("share-box")
+    #     if 'HERMES' in share_destination.upper():
+    #         response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
+    #     else:
+    #         response = share_target_with_tom(share_destination, form_data, selected_data)
+    #         if selected_data:
+    #             response = share_data_with_tom(share_destination, form_data, selected_data=selected_data)
+    #     try:
+    #         if 'message' in response.json():
+    #             publish_feedback = response.json()['message']
+    #         else:
+    #             publish_feedback = f"ERROR: {response.text}"
+    #     except AttributeError:
+    #         publish_feedback = response['message']
+    #     except ValueError:
+    #         publish_feedback = f"ERROR: Returned Response code {response.status_code}"
+    #     if "ERROR" in publish_feedback.upper():
+    #         messages.error(self.request, publish_feedback)
+    #     else:
+    #         messages.success(self.request, publish_feedback)
+    #     return redirect(self.get_success_url())

From 74f5fb3431227f14885773e5a44d076a139c2165 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 15 Aug 2023 09:06:50 -0700
Subject: [PATCH 23/37] add functioning target check boxes

---
 tom_targets/forms.py                          | 15 +++-
 .../tom_targets/partials/target_table.html    | 16 +++-
 .../tom_targets/target_group_share.html       | 27 ++++--
 tom_targets/templatetags/targets_extras.py    |  4 +-
 tom_targets/views.py                          | 90 +++++++++++--------
 5 files changed, 102 insertions(+), 50 deletions(-)

diff --git a/tom_targets/forms.py b/tom_targets/forms.py
index 9f8f8ca7c..1ad0a56e8 100644
--- a/tom_targets/forms.py
+++ b/tom_targets/forms.py
@@ -8,7 +8,7 @@
 
 from tom_dataproducts.sharing import get_sharing_destination_options
 from .models import (
-    Target, TargetExtra, TargetName, SIDEREAL_FIELDS, NON_SIDEREAL_FIELDS, REQUIRED_SIDEREAL_FIELDS,
+    Target, TargetExtra, TargetName, TargetList, SIDEREAL_FIELDS, NON_SIDEREAL_FIELDS, REQUIRED_SIDEREAL_FIELDS,
     REQUIRED_NON_SIDEREAL_FIELDS, REQUIRED_NON_SIDEREAL_FIELDS_PER_SCHEME
 )
 
@@ -180,3 +180,16 @@ class TargetShareForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['share_destination'].choices = get_sharing_destination_options()
+
+
+class TargetGroupShareForm(forms.Form):
+    share_destination = forms.ChoiceField(required=True, choices=[], label="Destination")
+    group = forms.ModelChoiceField(
+        TargetList.objects.all(),
+        widget=forms.HiddenInput(),
+        required=True)
+    submitter = forms.CharField(widget=forms.HiddenInput())
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['share_destination'].choices = get_sharing_destination_options()
\ No newline at end of file
diff --git a/tom_targets/templates/tom_targets/partials/target_table.html b/tom_targets/templates/tom_targets/partials/target_table.html
index 725ea5e10..f6ff3b51a 100644
--- a/tom_targets/templates/tom_targets/partials/target_table.html
+++ b/tom_targets/templates/tom_targets/partials/target_table.html
@@ -1,7 +1,13 @@
 <table class="table table-hover">
   <thead>
     <tr>
-      <th><input type="checkbox" id="selectPage" onClick="select_page(this, {{ targets|length }})" /></th>
+      <th>
+        {% if all_checked %}
+          <input type="checkbox" id="selectPage" onClick="select_page(this, {{ targets|length }})" checked/>
+        {% else %}
+          <input type="checkbox" id="selectPage" onClick="select_page(this, {{ targets|length }})" />
+        {% endif %}
+      </th>
       <th>Name</th>
       <th>Type</th>
       {% if request.GET.type == 'SIDEREAL' %}
@@ -15,7 +21,13 @@
   <tbody>
     {% for target in targets %}
     <tr>
-      <td><input type="checkbox" name="selected-target" value="{{ target.id }}" onClick="single_select()"/></td>
+      <td>
+        {% if all_checked %}
+          <input type="checkbox" name="selected-target" value="{{ target.id }}" onClick="single_select()" checked/>
+        {% else %}
+          <input type="checkbox" name="selected-target" value="{{ target.id }}" onClick="single_select()"/>
+        {% endif %}
+      </td>
       <td>
           <a href="{% url 'targets:detail' target.id %}" title="{{ target.name }}">{{ target.names|join:", " }}</a>
       </td>
diff --git a/tom_targets/templates/tom_targets/target_group_share.html b/tom_targets/templates/tom_targets/target_group_share.html
index 3417360a0..f6c787fba 100644
--- a/tom_targets/templates/tom_targets/target_group_share.html
+++ b/tom_targets/templates/tom_targets/target_group_share.html
@@ -1,12 +1,12 @@
 {% extends 'tom_common/base.html' %}
-{% load bootstrap4 dataproduct_extras static %}
+{% load bootstrap4 static targets_extras %}
 {% block title %}Share {{ group.name }} Group{% endblock %}
 {% block additional_css %}
 <link rel="stylesheet" href="{% static 'tom_common/css/main.css' %}">
 <link rel="stylesheet" href="{% static 'tom_targets/css/main.css' %}">
 {% endblock %}
 {% block content %}
-<h3> Share <button type="submit" class="btn btn-link" name="targetlist__name" value="{{group.id}}" title="View Group">{{ group.name }}</button> Group </h3>
+<h3> Share <a href="{% url 'targets:list' %}?targetlist__name={{ group.id }}" title="View Group">{{ group.name }}</a> Group </h3>
 <form method="post" class="form">
     <div class="form-row" style="padding-inline:1rem">
         <div class="col-sm-4">
@@ -17,9 +17,24 @@ <h3> Share <button type="submit" class="btn btn-link" name="targetlist__name" va
         </div>
     </div>
 
-
-    {% buttons %}
-        <a href="{% url 'targets:targetgrouping' %}" class="btn btn-primary" title="Back">Back</a>
-    {% endbuttons %}
+    <div class="col-md-10">
+        {% select_target_js %}
+        <label id="displaySelected"></label>
+        <div class="custom-control custom-switch">
+          <input type="checkbox" class="custom-control-input" checked id="dataSwitch">
+          <label class="custom-control-label" for="dataSwitch">Include Photometric Data</label>
+        </div>
+        {% csrf_token %}
+        <div class="form-group d-flex justify-content-end align-items-baseline">
+            <input type="hidden" value="{{ query_string }}" name="query_string">
+            <input type="hidden" value="False" id="isSelectAll" name="isSelectAll">
+        </div>
+      {% target_table group.targets.all True %}
+    </div>
 </form>
+
+{% buttons %}
+    <a href="{% url 'targets:targetgrouping' %}" class="btn btn-primary" title="Back">Back</a>
+{% endbuttons %}
+
 {% endblock %}
\ No newline at end of file
diff --git a/tom_targets/templatetags/targets_extras.py b/tom_targets/templatetags/targets_extras.py
index d5c8a40b1..8fe179d37 100644
--- a/tom_targets/templatetags/targets_extras.py
+++ b/tom_targets/templatetags/targets_extras.py
@@ -310,9 +310,9 @@ def aladin(target):
 
 
 @register.inclusion_tag('tom_targets/partials/target_table.html')
-def target_table(targets):
+def target_table(targets, all_checked=False):
     """
     Returns a partial for a table of targets, used in the target_list.html template
     by default
     """
-    return {'targets': targets}
+    return {'targets': targets, 'all_checked': all_checked}
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 1eb221df1..7aa42cd85 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -33,7 +33,7 @@
 from tom_observations.models import ObservationTemplate
 from tom_targets.filters import TargetFilter
 from tom_targets.forms import SiderealTargetCreateForm, NonSiderealTargetCreateForm, TargetExtraFormset
-from tom_targets.forms import TargetNamesFormset, TargetShareForm
+from tom_targets.forms import TargetNamesFormset, TargetShareForm, TargetGroupShareForm
 from tom_targets.sharing import share_target_with_tom
 from tom_dataproducts.sharing import share_data_with_hermes, share_data_with_tom
 
@@ -365,6 +365,9 @@ def form_invalid(self, form):
 
     def form_valid(self, form):
         form_data = form.cleaned_data
+        print(form_data)
+        print(self.kwargs)
+        print(self.request.POST)
         share_destination = form_data['share_destination']
         target_id = self.kwargs.get('pk', None)
         selected_data = self.request.POST.getlist("share-box")
@@ -596,7 +599,7 @@ class TargetGroupingShareView(FormView):
     """
     template_name = 'tom_targets/target_group_share.html'
     # permission_required = 'tom_targets.share_target'
-    form_class = TargetShareForm
+    form_class = TargetGroupShareForm
 
     def get_context_data(self, *args, **kwargs):
         """
@@ -609,40 +612,49 @@ def get_context_data(self, *args, **kwargs):
         context['group'] = TargetList.objects.get(id=group_id)
 
         return context
-    #
-    # def get_success_url(self):
-    #     return reverse_lazy('targets:detail', kwargs={'pk': self.kwargs.get('pk', None)})
-    #
-    # def form_invalid(self, form):
-    #     """
-    #     Adds errors to Django messaging framework in the case of an invalid form and redirects to the previous page.
-    #     """
-    #     # TODO: Format error messages in a more human-readable way
-    #     messages.error(self.request, 'There was a problem sharing your Data: {}'.format(form.errors.as_json()))
-    #     return redirect(self.get_success_url())
-    #
-    # def form_valid(self, form):
-    #     form_data = form.cleaned_data
-    #     share_destination = form_data['share_destination']
-    #     target_id = self.kwargs.get('pk', None)
-    #     selected_data = self.request.POST.getlist("share-box")
-    #     if 'HERMES' in share_destination.upper():
-    #         response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
-    #     else:
-    #         response = share_target_with_tom(share_destination, form_data, selected_data)
-    #         if selected_data:
-    #             response = share_data_with_tom(share_destination, form_data, selected_data=selected_data)
-    #     try:
-    #         if 'message' in response.json():
-    #             publish_feedback = response.json()['message']
-    #         else:
-    #             publish_feedback = f"ERROR: {response.text}"
-    #     except AttributeError:
-    #         publish_feedback = response['message']
-    #     except ValueError:
-    #         publish_feedback = f"ERROR: Returned Response code {response.status_code}"
-    #     if "ERROR" in publish_feedback.upper():
-    #         messages.error(self.request, publish_feedback)
-    #     else:
-    #         messages.success(self.request, publish_feedback)
-    #     return redirect(self.get_success_url())
+
+    def get_success_url(self):
+        return reverse_lazy('targets:list')+f'?targetlist__name={self.kwargs.get("pk", None)}'
+        # return reverse_lazy('targets:detail', kwargs={'pk': self.kwargs.get('pk', None)})
+
+    def form_invalid(self, form):
+        """
+        Adds errors to Django messaging framework in the case of an invalid form and redirects to the previous page.
+        """
+        # TODO: Format error messages in a more human-readable way
+        form_data = form.cleaned_data
+        print(form_data)
+        print(self.kwargs)
+        print(self.request.POST)
+        messages.error(self.request, 'There was a problem sharing your Data: {}'.format(form.errors.as_json()))
+        return redirect(self.get_success_url())
+
+    def form_valid(self, form):
+        form_data = form.cleaned_data
+        print(form_data)
+        print(self.kwargs)
+        print(self.request.POST)
+        return redirect(self.get_success_url())
+        share_destination = form_data['share_destination']
+        target_id = self.kwargs.get('pk', None)
+        selected_data = self.request.POST.getlist("share-box")
+        if 'HERMES' in share_destination.upper():
+            response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
+        else:
+            response = share_target_with_tom(share_destination, form_data, selected_data)
+            if selected_data:
+                response = share_data_with_tom(share_destination, form_data, selected_data=selected_data)
+        try:
+            if 'message' in response.json():
+                publish_feedback = response.json()['message']
+            else:
+                publish_feedback = f"ERROR: {response.text}"
+        except AttributeError:
+            publish_feedback = response['message']
+        except ValueError:
+            publish_feedback = f"ERROR: Returned Response code {response.status_code}"
+        if "ERROR" in publish_feedback.upper():
+            messages.error(self.request, publish_feedback)
+        else:
+            messages.success(self.request, publish_feedback)
+        return redirect(self.get_success_url())

From 0e083623c5b3a20742d0c7fba360dcd684cfe98c Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 15 Aug 2023 11:19:53 -0700
Subject: [PATCH 24/37] initiate form

---
 .../tom_targets/target_group_share.html          |  1 +
 tom_targets/templatetags/targets_extras.py       |  1 +
 tom_targets/views.py                             | 16 ++++++++--------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tom_targets/templates/tom_targets/target_group_share.html b/tom_targets/templates/tom_targets/target_group_share.html
index f6c787fba..a1f45d604 100644
--- a/tom_targets/templates/tom_targets/target_group_share.html
+++ b/tom_targets/templates/tom_targets/target_group_share.html
@@ -10,6 +10,7 @@ <h3> Share <a href="{% url 'targets:list' %}?targetlist__name={{ group.id }}" ti
 <form method="post" class="form">
     <div class="form-row" style="padding-inline:1rem">
         <div class="col-sm-4">
+            {% csrf_token %}
             {% bootstrap_form form %}
         </div>
         <div class="col-sm-2">
diff --git a/tom_targets/templatetags/targets_extras.py b/tom_targets/templatetags/targets_extras.py
index 8fe179d37..140abe19c 100644
--- a/tom_targets/templatetags/targets_extras.py
+++ b/tom_targets/templatetags/targets_extras.py
@@ -315,4 +315,5 @@ def target_table(targets, all_checked=False):
     Returns a partial for a table of targets, used in the target_list.html template
     by default
     """
+
     return {'targets': targets, 'all_checked': all_checked}
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 7aa42cd85..a4d776e1c 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -609,24 +609,24 @@ def get_context_data(self, *args, **kwargs):
         """
         context = super().get_context_data(*args, **kwargs)
         group_id = self.kwargs.get('pk', None)
-        context['group'] = TargetList.objects.get(id=group_id)
-
+        group = TargetList.objects.get(id=group_id)
+        context['group'] = group
+        initial = {'submitter': self.request.user,
+                   'group': group,
+                   'share_title': f"Updated targets for group {group.name}."}
+        form = TargetGroupShareForm(initial=initial)
+        context['form'] = form
         return context
 
     def get_success_url(self):
         return reverse_lazy('targets:list')+f'?targetlist__name={self.kwargs.get("pk", None)}'
-        # return reverse_lazy('targets:detail', kwargs={'pk': self.kwargs.get('pk', None)})
 
     def form_invalid(self, form):
         """
         Adds errors to Django messaging framework in the case of an invalid form and redirects to the previous page.
         """
         # TODO: Format error messages in a more human-readable way
-        form_data = form.cleaned_data
-        print(form_data)
-        print(self.kwargs)
-        print(self.request.POST)
-        messages.error(self.request, 'There was a problem sharing your Data: {}'.format(form.errors.as_json()))
+        messages.error(self.request, 'There was a problem sharing your Group: {}'.format(form.errors.as_json()))
         return redirect(self.get_success_url())
 
     def form_valid(self, form):

From 316d6f51f7974ba3f715931c3824ea33181b07e1 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 15 Aug 2023 16:36:51 -0700
Subject: [PATCH 25/37] establish target sharing with groups

---
 tom_targets/sharing.py                        |  8 +++++---
 .../tom_targets/target_group_share.html       |  2 +-
 tom_targets/views.py                          | 20 ++++++++++++-------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/tom_targets/sharing.py b/tom_targets/sharing.py
index b3d30e5d2..04d2603c7 100644
--- a/tom_targets/sharing.py
+++ b/tom_targets/sharing.py
@@ -7,12 +7,12 @@
 from tom_dataproducts.sharing import get_destination_target
 
 
-def share_target_with_tom(share_destination, form_data, selected_data):
+def share_target_with_tom(share_destination, form_data, group_list=()):
     """
 
     :param share_destination:
     :param form_data:
-    :param selected_data:
+    :param group_list:
     :return:
     """
     # Try to get destination tom authentication/URL information
@@ -37,8 +37,10 @@ def share_target_with_tom(share_destination, form_data, selected_data):
     if destination_target_id is None:
         # If target is not in Destination, serialize and create new target.
         serialized_target = TargetSerializer(form_data['target']).data
-        # Remove local Groups
+        # Overwrite local Groups
         serialized_target['groups'] = [{'name': f'Imported From {settings.TOM_NAME}'}]
+        for group in group_list:
+            serialized_target['groups'].append({'name': group.name})
         target_create_response = requests.post(targets_url, json=serialized_target, headers=headers, auth=auth)
 
     return target_create_response
diff --git a/tom_targets/templates/tom_targets/target_group_share.html b/tom_targets/templates/tom_targets/target_group_share.html
index a1f45d604..10c92a4fc 100644
--- a/tom_targets/templates/tom_targets/target_group_share.html
+++ b/tom_targets/templates/tom_targets/target_group_share.html
@@ -22,7 +22,7 @@ <h3> Share <a href="{% url 'targets:list' %}?targetlist__name={{ group.id }}" ti
         {% select_target_js %}
         <label id="displaySelected"></label>
         <div class="custom-control custom-switch">
-          <input type="checkbox" class="custom-control-input" checked id="dataSwitch">
+          <input type="checkbox" class="custom-control-input" checked id="dataSwitch" name="dataSwitch">
           <label class="custom-control-label" for="dataSwitch">Include Photometric Data</label>
         </div>
         {% csrf_token %}
diff --git a/tom_targets/views.py b/tom_targets/views.py
index a4d776e1c..3c358983a 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -634,16 +634,22 @@ def form_valid(self, form):
         print(form_data)
         print(self.kwargs)
         print(self.request.POST)
-        return redirect(self.get_success_url())
         share_destination = form_data['share_destination']
-        target_id = self.kwargs.get('pk', None)
-        selected_data = self.request.POST.getlist("share-box")
+        selected_targets = self.request.POST.getlist('selected-target')
+        data_switch = self.request.POST.get('dataSwitch', False)
         if 'HERMES' in share_destination.upper():
-            response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
+            # response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
+            messages.error(self.request, "Publishing Groups to Hermes is not yet supported.")
+            return redirect(self.get_success_url())
         else:
-            response = share_target_with_tom(share_destination, form_data, selected_data)
-            if selected_data:
-                response = share_data_with_tom(share_destination, form_data, selected_data=selected_data)
+            for target in selected_targets:
+                form_data['target'] = Target.objects.get(id=target)
+                response = share_target_with_tom(share_destination, form_data, group_list=[form_data['group']])
+                if data_switch:
+                    response = share_data_with_tom(share_destination, form_data, target_id=target)
+            if not selected_targets:
+                messages.error(self.request, 'No targets shared.'.format(form.errors.as_json()))
+                return redirect(self.get_success_url())
         try:
             if 'message' in response.json():
                 publish_feedback = response.json()['message']

From 917b0d3e7e294c986febfba0ac271de90b759529 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 15 Aug 2023 17:50:39 -0700
Subject: [PATCH 26/37] add tests for group sharing

---
 tom_targets/tests/tests.py | 149 +++++++++++++++++++++++++++++++++++++
 tom_targets/views.py       |   3 -
 2 files changed, 149 insertions(+), 3 deletions(-)

diff --git a/tom_targets/tests/tests.py b/tom_targets/tests/tests.py
index d0bbb88e0..6fc650943 100644
--- a/tom_targets/tests/tests.py
+++ b/tom_targets/tests/tests.py
@@ -1417,3 +1417,152 @@ def test_share_reduceddatums_target_valid_responses(self):
         )
 
         self.assertContains(response, '2 of 2 datums successfully saved.')
+
+
+@override_settings(TOM_FACILITY_CLASSES=['tom_observations.tests.utils.FakeRoboticFacility'],
+                   TARGET_PERMISSIONS_ONLY=True,
+                   DATA_SHARING={'local_host': {'BASE_URL': 'https://fake.url/example/',
+                                                'USERNAME': 'fake_user',
+                                                'PASSWORD': 'password'}})
+class TestShareTargetList(TestCase):
+    def setUp(self):
+        self.target = SiderealTargetFactory.create()
+        self.target2 = SiderealTargetFactory.create()
+        self.observation_record = ObservingRecordFactory.create(
+            target_id=self.target.id,
+            facility=FakeRoboticFacility.name,
+            parameters={}
+        )
+        self.group = TargetList.objects.create(
+            name="test_group",
+        )
+        self.group.targets.set(Target.objects.all())
+        self.user = User.objects.create_user(username='test', email='test@example.com')
+        assign_perm('tom_targets.view_target', self.user, self.target)
+        self.client.force_login(self.user)
+        self.rd1 = ReducedDatum.objects.create(
+            target=self.target,
+            data_type='photometry',
+            value={'magnitude': 18.5, 'error': .5, 'filter': 'V'}
+        )
+        self.rd2 = ReducedDatum.objects.create(
+            target=self.target,
+            data_type='photometry',
+            value={'magnitude': 19.5, 'error': .5, 'filter': 'B'}
+        )
+        self.rd3 = ReducedDatum.objects.create(
+            target=self.target,
+            data_type='photometry',
+            value={'magnitude': 17.5, 'error': .5, 'filter': 'R'}
+        )
+        self.rd4 = ReducedDatum.objects.create(
+            target=self.target2,
+            data_type='photometry',
+            value={'magnitude': 17.5, 'error': .5, 'filter': 'R'}
+        )
+
+    @responses.activate
+    def test_share_group_no_valid_responses(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"error": "not found"},
+            status=500
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+
+        response = self.client.post(
+            reverse('targets:share-group', kwargs={'pk': self.group.id}),
+            {
+                'submitter': ['test_submitter'],
+                'group': self.group.id,
+                'share_destination': [share_destination],
+            },
+            follow=True
+        )
+        self.assertContains(response, "not found")
+
+    @responses.activate
+    def test_share_group_valid_connection_selected_target_not_found(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"results": []},
+            status=200
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+        responses.add(
+            responses.POST,
+            destination_tom_base_url + 'api/targets/',
+            json={"message": "Target successfully uploaded."},
+            status=200,
+        )
+        response = self.client.post(
+            reverse('targets:share-group', kwargs={'pk': self.group.id}),
+            {
+                'submitter': ['test_submitter'],
+                'group': self.group.id,
+                'share_destination': [share_destination],
+                'selected-target': [self.target.id, self.target2.id]
+            },
+            follow=True
+        )
+
+        self.assertContains(response, 'Target successfully uploaded.')
+
+    @responses.activate
+    def test_share_reduceddatums_group_valid_responses(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"results": [{'id': 1}]},
+            status=200
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+        responses.add(
+            responses.POST,
+            destination_tom_base_url + 'api/reduceddatums/',
+            json={},
+            status=201,
+        )
+
+        response = self.client.post(
+            reverse('targets:share-group', kwargs={'pk': self.group.id}),
+            {
+                'submitter': ['test_submitter'],
+                'group': self.group.id,
+                'share_destination': [share_destination],
+                'dataSwitch': 'on',
+                'selected-target': [self.target.id, self.target2.id]
+            },
+            follow=True
+        )
+
+        self.assertContains(response, '1 of 1 datums successfully saved.')
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 3c358983a..008ec3ce3 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -631,9 +631,6 @@ def form_invalid(self, form):
 
     def form_valid(self, form):
         form_data = form.cleaned_data
-        print(form_data)
-        print(self.kwargs)
-        print(self.request.POST)
         share_destination = form_data['share_destination']
         selected_targets = self.request.POST.getlist('selected-target')
         data_switch = self.request.POST.get('dataSwitch', False)

From 38cbac0c619e2b10ac1855ffa70757da9d83647d Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 29 Aug 2023 19:44:41 -0700
Subject: [PATCH 27/37] refactor target_list from group and add API

---
 tom_targets/api_views.py                      | 19 ++++++++-
 tom_targets/forms.py                          |  4 +-
 tom_targets/serializers.py                    | 22 ++++++++--
 tom_targets/sharing.py                        | 12 +++---
 .../tom_targets/target_group_share.html       |  8 ++--
 tom_targets/tests/test_api.py                 | 12 +++++-
 tom_targets/tests/tests.py                    | 40 +++++++++++++++----
 tom_targets/urls.py                           |  3 +-
 tom_targets/views.py                          | 20 +++++-----
 9 files changed, 103 insertions(+), 37 deletions(-)

diff --git a/tom_targets/api_views.py b/tom_targets/api_views.py
index 12cf52079..dbcd5907b 100644
--- a/tom_targets/api_views.py
+++ b/tom_targets/api_views.py
@@ -6,8 +6,8 @@
 from rest_framework import status
 
 from tom_targets.filters import TargetFilter
-from tom_targets.models import TargetExtra, TargetName
-from tom_targets.serializers import TargetSerializer, TargetExtraSerializer, TargetNameSerializer
+from tom_targets.models import TargetExtra, TargetName, TargetList
+from tom_targets.serializers import TargetSerializer, TargetExtraSerializer, TargetNameSerializer, TargetListSerializer
 
 
 permissions_map = {  # TODO: Use the built-in DRF mapping or just switch to DRF entirely.
@@ -90,3 +90,18 @@ def get_queryset(self):
         return TargetExtra.objects.filter(
             target__in=get_objects_for_user(self.request.user, f'tom_targets.{permission_required}')
         )
+
+
+class TargetListViewSet(DestroyModelMixin, PermissionListMixin, RetrieveModelMixin, GenericViewSet):
+    """
+    Viewset for TargetList objects. Only ``GET`` and ``DELETE`` operations are permitted.
+
+    To view available query parameters, please use the OPTIONS endpoint, which can be accessed through the web UI.
+    """
+    serializer_class = TargetListSerializer
+
+    def get_queryset(self):
+        permission_required = permissions_map.get(self.request.method)
+        return TargetList.objects.filter(
+            target__in=get_objects_for_user(self.request.user, f'tom_targets.{permission_required}')
+        )
diff --git a/tom_targets/forms.py b/tom_targets/forms.py
index 1ad0a56e8..02f4f31c6 100644
--- a/tom_targets/forms.py
+++ b/tom_targets/forms.py
@@ -182,9 +182,9 @@ def __init__(self, *args, **kwargs):
         self.fields['share_destination'].choices = get_sharing_destination_options()
 
 
-class TargetGroupShareForm(forms.Form):
+class TargetListShareForm(forms.Form):
     share_destination = forms.ChoiceField(required=True, choices=[], label="Destination")
-    group = forms.ModelChoiceField(
+    target_list = forms.ModelChoiceField(
         TargetList.objects.all(),
         widget=forms.HiddenInput(),
         required=True)
diff --git a/tom_targets/serializers.py b/tom_targets/serializers.py
index ecd4458c9..8442b9011 100644
--- a/tom_targets/serializers.py
+++ b/tom_targets/serializers.py
@@ -3,7 +3,7 @@
 from rest_framework import serializers
 
 from tom_common.serializers import GroupSerializer
-from tom_targets.models import Target, TargetExtra, TargetName
+from tom_targets.models import Target, TargetExtra, TargetName, TargetList
 from tom_targets.validators import RequiredFieldsTogetherValidator
 
 
@@ -23,6 +23,15 @@ class Meta:
         fields = ('id', 'key', 'value')
 
 
+class TargetListSerializer(serializers.ModelSerializer):
+    id = serializers.IntegerField(required=False)
+    name = serializers.CharField(required=False)
+
+    class Meta:
+        model = TargetList
+        fields = ('id', 'name')
+
+
 class TargetSerializer(serializers.ModelSerializer):
     """Target serializer responsible for transforming models to/from
     json (or other representations). See
@@ -30,6 +39,7 @@ class TargetSerializer(serializers.ModelSerializer):
     """
     targetextra_set = TargetExtraSerializer(many=True, required=False)
     aliases = TargetNameSerializer(many=True, required=False)
+    target_lists = TargetListSerializer(many=True, required=False)
     groups = GroupSerializer(many=True, required=False)  # TODO: return groups in detail and list
 
     class Meta:
@@ -50,14 +60,14 @@ def create(self, validated_data):
         here we pop the alias/tag/group data and save it using their respective
         serializers
         """
-
         aliases = validated_data.pop('aliases', [])
         targetextras = validated_data.pop('targetextra_set', [])
         groups = validated_data.pop('groups', [])
+        target_lists = validated_data.pop('target_lists', [])
 
         target = Target.objects.create(**validated_data)
 
-        # Save groups for this target
+        # Save user groups for this target
         group_serializer = GroupSerializer(data=groups, many=True)
         if group_serializer.is_valid():
             for group in groups:
@@ -83,6 +93,12 @@ def create(self, validated_data):
         if tes.is_valid():
             tes.save(target=target)
 
+        tls = TargetListSerializer(data=target_lists, many=True)
+        if tls.is_valid():
+            for target_list in target_lists:
+                tl_instance, _ = TargetList.objects.get_or_create(name=target_list['name'])
+                tl_instance.targets.add(target)
+
         return target
 
     def to_representation(self, instance):
diff --git a/tom_targets/sharing.py b/tom_targets/sharing.py
index 04d2603c7..4e30ffdc6 100644
--- a/tom_targets/sharing.py
+++ b/tom_targets/sharing.py
@@ -7,7 +7,7 @@
 from tom_dataproducts.sharing import get_destination_target
 
 
-def share_target_with_tom(share_destination, form_data, group_list=()):
+def share_target_with_tom(share_destination, form_data, target_lists=()):
     """
 
     :param share_destination:
@@ -37,10 +37,12 @@ def share_target_with_tom(share_destination, form_data, group_list=()):
     if destination_target_id is None:
         # If target is not in Destination, serialize and create new target.
         serialized_target = TargetSerializer(form_data['target']).data
-        # Overwrite local Groups
-        serialized_target['groups'] = [{'name': f'Imported From {settings.TOM_NAME}'}]
-        for group in group_list:
-            serialized_target['groups'].append({'name': group.name})
+        # Remove local User Groups
+        serialized_target['groups'] = []
+        # Add target lists
+        serialized_target['target_lists'] = [{'name': f'Imported From {settings.TOM_NAME}'}]
+        for target_list in target_lists:
+            serialized_target['target_lists'].append({'name': target_list.name})
         target_create_response = requests.post(targets_url, json=serialized_target, headers=headers, auth=auth)
 
     return target_create_response
diff --git a/tom_targets/templates/tom_targets/target_group_share.html b/tom_targets/templates/tom_targets/target_group_share.html
index 10c92a4fc..cb6476a35 100644
--- a/tom_targets/templates/tom_targets/target_group_share.html
+++ b/tom_targets/templates/tom_targets/target_group_share.html
@@ -1,12 +1,12 @@
 {% extends 'tom_common/base.html' %}
 {% load bootstrap4 static targets_extras %}
-{% block title %}Share {{ group.name }} Group{% endblock %}
+{% block title %}Share {{ target_list.name }} Target List{% endblock %}
 {% block additional_css %}
 <link rel="stylesheet" href="{% static 'tom_common/css/main.css' %}">
 <link rel="stylesheet" href="{% static 'tom_targets/css/main.css' %}">
 {% endblock %}
 {% block content %}
-<h3> Share <a href="{% url 'targets:list' %}?targetlist__name={{ group.id }}" title="View Group">{{ group.name }}</a> Group </h3>
+<h3> Share <a href="{% url 'targets:list' %}?targetlist__name={{ target_list.id }}" title="View Target Lists">{{ target_list.name }}</a> Target List </h3>
 <form method="post" class="form">
     <div class="form-row" style="padding-inline:1rem">
         <div class="col-sm-4">
@@ -14,7 +14,7 @@ <h3> Share <a href="{% url 'targets:list' %}?targetlist__name={{ group.id }}" ti
             {% bootstrap_form form %}
         </div>
         <div class="col-sm-2">
-            <input type="submit" class="btn btn-primary" formaction="{% url 'targets:share-group' pk=group.id %}" id="submit_targetlist" value="Submit" name="share_targetlist_form" style="position:absolute; bottom:1rem">
+            <input type="submit" class="btn btn-primary" formaction="{% url 'targets:share-group' pk=target_list.id %}" id="submit_targetlist" value="Submit" name="share_targetlist_form" style="position:absolute; bottom:1rem">
         </div>
     </div>
 
@@ -30,7 +30,7 @@ <h3> Share <a href="{% url 'targets:list' %}?targetlist__name={{ group.id }}" ti
             <input type="hidden" value="{{ query_string }}" name="query_string">
             <input type="hidden" value="False" id="isSelectAll" name="isSelectAll">
         </div>
-      {% target_table group.targets.all True %}
+      {% target_table target_list.targets.all True %}
     </div>
 </form>
 
diff --git a/tom_targets/tests/test_api.py b/tom_targets/tests/test_api.py
index da50c40bc..8b1bf29a7 100644
--- a/tom_targets/tests/test_api.py
+++ b/tom_targets/tests/test_api.py
@@ -8,7 +8,7 @@
 
 from tom_targets.tests.factories import SiderealTargetFactory, NonSiderealTargetFactory
 from tom_targets.tests.factories import TargetExtraFactory, TargetNameFactory
-from tom_targets.models import Target, TargetExtra, TargetName
+from tom_targets.models import Target, TargetExtra, TargetName, TargetList
 
 
 class TestTargetViewset(APITestCase):
@@ -57,9 +57,10 @@ def test_target_create(self):
         group = Group.objects.create(name='bourgeoisie')
         group.user_set.add(self.user)
         group.user_set.add(collaborator)
+        target_list = TargetList.objects.create(name="Test TargetList")
 
         target_data = {
-            'name': 'test_target_name_wtf',
+            'name': 'test_target_name',
             'type': Target.SIDEREAL,
             'ra': 123.456,
             'dec': -32.1,
@@ -71,6 +72,10 @@ def test_target_create(self):
             ],
             'aliases': [
                 {'name': 'alternative name'}
+            ],
+            'target_lists': [
+                {'name': target_list.name},  # Add to existing Target List
+                {'name': 'newer_tlist'}  # Create new Target List
             ]
         }
         response = self.client.post(reverse('api:targets-list'), data=target_data)
@@ -79,6 +84,9 @@ def test_target_create(self):
         self.assertEqual(response.json()['aliases'][0]['name'], target_data['aliases'][0]['name'])
         self.assertEqual(get_objects_for_user(collaborator, 'tom_targets.view_target').first().name,
                          target_data['name'])  # Test that group permissions are respected
+        target_list2 = TargetList.objects.get(name='newer_tlist')
+        self.assertEqual(target_list.targets.all().count(), 1)
+        self.assertEqual(target_list2.targets.all().count(), 1)
 
         # TODO: For whatever reason, in django-guardian, authenticated users have permission to create objects,
         # regardless of their row-level permissions. This should be addressed eventually--however, we don't provide a
diff --git a/tom_targets/tests/tests.py b/tom_targets/tests/tests.py
index 6fc650943..4e69ef5b7 100644
--- a/tom_targets/tests/tests.py
+++ b/tom_targets/tests/tests.py
@@ -1433,10 +1433,10 @@ def setUp(self):
             facility=FakeRoboticFacility.name,
             parameters={}
         )
-        self.group = TargetList.objects.create(
+        self.target_list = TargetList.objects.create(
             name="test_group",
         )
-        self.group.targets.set(Target.objects.all())
+        self.target_list.targets.set(Target.objects.all())
         self.user = User.objects.create_user(username='test', email='test@example.com')
         assign_perm('tom_targets.view_target', self.user, self.target)
         self.client.force_login(self.user)
@@ -1481,10 +1481,10 @@ def test_share_group_no_valid_responses(self):
         )
 
         response = self.client.post(
-            reverse('targets:share-group', kwargs={'pk': self.group.id}),
+            reverse('targets:share-group', kwargs={'pk': self.target_list.id}),
             {
                 'submitter': ['test_submitter'],
-                'group': self.group.id,
+                'target_list': self.target_list.id,
                 'share_destination': [share_destination],
             },
             follow=True
@@ -1516,10 +1516,10 @@ def test_share_group_valid_connection_selected_target_not_found(self):
             status=200,
         )
         response = self.client.post(
-            reverse('targets:share-group', kwargs={'pk': self.group.id}),
+            reverse('targets:share-group', kwargs={'pk': self.target_list.id}),
             {
                 'submitter': ['test_submitter'],
-                'group': self.group.id,
+                'target_list': self.target_list.id,
                 'share_destination': [share_destination],
                 'selected-target': [self.target.id, self.target2.id]
             },
@@ -1554,10 +1554,10 @@ def test_share_reduceddatums_group_valid_responses(self):
         )
 
         response = self.client.post(
-            reverse('targets:share-group', kwargs={'pk': self.group.id}),
+            reverse('targets:share-group', kwargs={'pk': self.target_list.id}),
             {
                 'submitter': ['test_submitter'],
-                'group': self.group.id,
+                'target_list': self.target_list.id,
                 'share_destination': [share_destination],
                 'dataSwitch': 'on',
                 'selected-target': [self.target.id, self.target2.id]
@@ -1566,3 +1566,27 @@ def test_share_reduceddatums_group_valid_responses(self):
         )
 
         self.assertContains(response, '1 of 1 datums successfully saved.')
+
+    @responses.activate
+    def test_share_empty_group(self):
+        share_destination = 'local_host'
+
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+
+        response = self.client.post(
+            reverse('targets:share-group', kwargs={'pk': self.target_list.id}),
+            {
+                'submitter': ['test_submitter'],
+                'target_list': self.target_list.id,
+                'share_destination': [share_destination],
+                'dataSwitch': 'on',
+                'selected-target': []
+            },
+            follow=True
+        )
+        self.assertContains(response, 'No targets shared.')
diff --git a/tom_targets/urls.py b/tom_targets/urls.py
index 3d6822dad..0293d6e09 100644
--- a/tom_targets/urls.py
+++ b/tom_targets/urls.py
@@ -5,13 +5,14 @@
 from .views import TargetGroupingView, TargetGroupingDeleteView, TargetGroupingCreateView, TargetAddRemoveGroupingView
 from .views import TargetGroupingShareView
 
-from .api_views import TargetViewSet, TargetExtraViewSet, TargetNameViewSet
+from .api_views import TargetViewSet, TargetExtraViewSet, TargetNameViewSet, TargetListViewSet
 from tom_common.api_router import SharedAPIRootRouter
 
 router = SharedAPIRootRouter()
 router.register(r'targets', TargetViewSet, 'targets')
 router.register(r'targetextra', TargetExtraViewSet, 'targetextra')
 router.register(r'targetname', TargetNameViewSet, 'targetname')
+router.register(r'targetlist', TargetNameViewSet, 'targetlist')
 
 app_name = 'tom_targets'
 
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 008ec3ce3..96de6133f 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -33,7 +33,7 @@
 from tom_observations.models import ObservationTemplate
 from tom_targets.filters import TargetFilter
 from tom_targets.forms import SiderealTargetCreateForm, NonSiderealTargetCreateForm, TargetExtraFormset
-from tom_targets.forms import TargetNamesFormset, TargetShareForm, TargetGroupShareForm
+from tom_targets.forms import TargetNamesFormset, TargetShareForm, TargetListShareForm
 from tom_targets.sharing import share_target_with_tom
 from tom_dataproducts.sharing import share_data_with_hermes, share_data_with_tom
 
@@ -599,7 +599,7 @@ class TargetGroupingShareView(FormView):
     """
     template_name = 'tom_targets/target_group_share.html'
     # permission_required = 'tom_targets.share_target'
-    form_class = TargetGroupShareForm
+    form_class = TargetListShareForm
 
     def get_context_data(self, *args, **kwargs):
         """
@@ -608,13 +608,13 @@ def get_context_data(self, *args, **kwargs):
         :rtype: dict
         """
         context = super().get_context_data(*args, **kwargs)
-        group_id = self.kwargs.get('pk', None)
-        group = TargetList.objects.get(id=group_id)
-        context['group'] = group
+        target_list_id = self.kwargs.get('pk', None)
+        target_list = TargetList.objects.get(id=target_list_id)
+        context['target_list'] = target_list
         initial = {'submitter': self.request.user,
-                   'group': group,
-                   'share_title': f"Updated targets for group {group.name}."}
-        form = TargetGroupShareForm(initial=initial)
+                   'target_list': target_list,
+                   'share_title': f"Updated targets for group {target_list.name}."}
+        form = TargetListShareForm(initial=initial)
         context['form'] = form
         return context
 
@@ -626,7 +626,7 @@ def form_invalid(self, form):
         Adds errors to Django messaging framework in the case of an invalid form and redirects to the previous page.
         """
         # TODO: Format error messages in a more human-readable way
-        messages.error(self.request, 'There was a problem sharing your Group: {}'.format(form.errors.as_json()))
+        messages.error(self.request, 'There was a problem sharing your Target List: {}'.format(form.errors.as_json()))
         return redirect(self.get_success_url())
 
     def form_valid(self, form):
@@ -641,7 +641,7 @@ def form_valid(self, form):
         else:
             for target in selected_targets:
                 form_data['target'] = Target.objects.get(id=target)
-                response = share_target_with_tom(share_destination, form_data, group_list=[form_data['group']])
+                response = share_target_with_tom(share_destination, form_data, target_lists=[form_data['target_list']])
                 if data_switch:
                     response = share_data_with_tom(share_destination, form_data, target_id=target)
             if not selected_targets:

From c5eb0f95929eec09d30efbc4ae8c000ebeb1b2b7 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 29 Aug 2023 19:56:38 -0700
Subject: [PATCH 28/37] lint fixes

---
 tom_targets/forms.py | 2 +-
 tom_targets/urls.py  | 2 +-
 tom_targets/views.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tom_targets/forms.py b/tom_targets/forms.py
index 02f4f31c6..f22520750 100644
--- a/tom_targets/forms.py
+++ b/tom_targets/forms.py
@@ -192,4 +192,4 @@ class TargetListShareForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['share_destination'].choices = get_sharing_destination_options()
\ No newline at end of file
+        self.fields['share_destination'].choices = get_sharing_destination_options()
diff --git a/tom_targets/urls.py b/tom_targets/urls.py
index 0293d6e09..136bc0066 100644
--- a/tom_targets/urls.py
+++ b/tom_targets/urls.py
@@ -12,7 +12,7 @@
 router.register(r'targets', TargetViewSet, 'targets')
 router.register(r'targetextra', TargetExtraViewSet, 'targetextra')
 router.register(r'targetname', TargetNameViewSet, 'targetname')
-router.register(r'targetlist', TargetNameViewSet, 'targetlist')
+router.register(r'targetlist', TargetListViewSet, 'targetlist')
 
 app_name = 'tom_targets'
 
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 96de6133f..3033e620c 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -645,7 +645,7 @@ def form_valid(self, form):
                 if data_switch:
                     response = share_data_with_tom(share_destination, form_data, target_id=target)
             if not selected_targets:
-                messages.error(self.request, 'No targets shared.'.format(form.errors.as_json()))
+                messages.error(self.request, f'No targets shared. {form.errors.as_json()}')
                 return redirect(self.get_success_url())
         try:
             if 'message' in response.json():

From 850a18149f8c8efb495e9bfe6aa9adf6d3cc7aa7 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 5 Sep 2023 15:57:16 -0700
Subject: [PATCH 29/37] add empty feedback handler

---
 tom_dataproducts/sharing.py | 4 ++++
 tom_targets/views.py        | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index 61d0ebfd9..1f78211c5 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -214,3 +214,7 @@ def get_sharing_destination_options():
     except AttributeError:
         pass
     return tuple(choices)
+
+
+def sharing_feedback_handler(response, request):
+    return
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 3033e620c..9411e0da8 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -365,9 +365,6 @@ def form_invalid(self, form):
 
     def form_valid(self, form):
         form_data = form.cleaned_data
-        print(form_data)
-        print(self.kwargs)
-        print(self.request.POST)
         share_destination = form_data['share_destination']
         target_id = self.kwargs.get('pk', None)
         selected_data = self.request.POST.getlist("share-box")

From d94a86c77dd8daa55569a7afe37b493ad0b33c99 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 12 Sep 2023 16:09:50 -0700
Subject: [PATCH 30/37] add better error handling

---
 tom_dataproducts/sharing.py   | 16 ++++++++++++++++
 tom_dataproducts/views.py     | 14 +-------------
 tom_targets/api_views.py      |  7 +++++++
 tom_targets/serializers.py    |  7 +++++++
 tom_targets/sharing.py        | 18 +++++++++++-------
 tom_targets/tests/test_api.py | 34 +++++++++++++++++++++++++++++++++-
 tom_targets/tests/tests.py    |  9 ++++++++-
 tom_targets/views.py          | 17 +++--------------
 8 files changed, 86 insertions(+), 36 deletions(-)

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index 1f78211c5..543a7579d 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -3,6 +3,7 @@
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
+from django.contrib import messages
 
 from tom_targets.models import Target
 from tom_dataproducts.models import DataProduct, ReducedDatum
@@ -122,6 +123,8 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
             target_dict = {target.name:  destination_target_id}
         response_codes = []
         reduced_datums = check_for_share_safe_datums(share_destination, reduced_datums)
+        if not reduced_datums:
+            return {'message': 'ERROR: No valid data to share.'}
         for datum in reduced_datums:
             if target_dict[datum.target.name]:
                 serialized_data = ReducedDatumSerializer(datum).data
@@ -217,4 +220,17 @@ def get_sharing_destination_options():
 
 
 def sharing_feedback_handler(response, request):
+    try:
+        if 'message' in response.json():
+            publish_feedback = response.json()['message']
+        else:
+            publish_feedback = f"ERROR: {response.text}"
+    except AttributeError:
+        publish_feedback = response['message']
+    except ValueError:
+        publish_feedback = f"ERROR: Returned Response code {response.status_code}"
+    if "ERROR" in publish_feedback.upper():
+        messages.error(request, publish_feedback)
+    else:
+        messages.success(request, publish_feedback)
     return
diff --git a/tom_dataproducts/views.py b/tom_dataproducts/views.py
index 314519b07..21fdaece5 100644
--- a/tom_dataproducts/views.py
+++ b/tom_dataproducts/views.py
@@ -323,19 +323,7 @@ def post(self, request, *args, **kwargs):
                 response = share_data_with_hermes(share_destination, form_data, product_id, target_id, selected_data)
             else:
                 response = share_data_with_tom(share_destination, form_data, product_id, target_id, selected_data)
-            try:
-                if 'message' in response.json():
-                    publish_feedback = response.json()['message']
-                else:
-                    publish_feedback = f"ERROR: {response.text}"
-            except AttributeError:
-                publish_feedback = response['message']
-            except ValueError:
-                publish_feedback = f"ERROR: Returned Response code {response.status_code}"
-            if "ERROR" in publish_feedback.upper():
-                messages.error(self.request, publish_feedback)
-            else:
-                messages.success(self.request, publish_feedback)
+            sharing_feedback_handler(response, self.request)
         return redirect(reverse('tom_targets:detail', kwargs={'pk': request.POST.get('target')}))
 
 
diff --git a/tom_targets/api_views.py b/tom_targets/api_views.py
index dbcd5907b..41d831515 100644
--- a/tom_targets/api_views.py
+++ b/tom_targets/api_views.py
@@ -61,6 +61,13 @@ def create(self, request, *args, **kwargs):
             response.data['message'] = 'Target successfully uploaded.'
         return response
 
+    def update(self, request, *args, **kwargs):
+        response = super().update(request, *args, **kwargs)
+
+        if response.status_code == status.HTTP_200_OK:
+            response.data['message'] = 'Target successfully updated.'
+        return response
+
 
 class TargetNameViewSet(DestroyModelMixin, PermissionListMixin, RetrieveModelMixin, GenericViewSet):
     """
diff --git a/tom_targets/serializers.py b/tom_targets/serializers.py
index 8442b9011..2d2b9f00d 100644
--- a/tom_targets/serializers.py
+++ b/tom_targets/serializers.py
@@ -117,6 +117,7 @@ def update(self, instance, validated_data):
         aliases = validated_data.pop('aliases', [])
         targetextras = validated_data.pop('targetextra_set', [])
         groups = validated_data.pop('groups', [])
+        target_lists = validated_data.pop('target_lists', [])
 
         # Save groups for this target
         group_serializer = GroupSerializer(data=groups, many=True)
@@ -156,6 +157,12 @@ def update(self, instance, validated_data):
             if tes.is_valid():
                 tes.save(target=instance)
 
+        tls = TargetListSerializer(data=target_lists, many=True)
+        if tls.is_valid():
+            for target_list in target_lists:
+                tl_instance, _ = TargetList.objects.get_or_create(name=target_list['name'])
+                tl_instance.targets.add(instance)
+
         fields_to_validate = ['name', 'type', 'ra', 'dec', 'epoch', 'parallax', 'pm_ra', 'pm_dec', 'galactic_lng',
                               'galactic_lat', 'distance', 'distance_err', 'scheme', 'epoch_of_elements',
                               'mean_anomaly', 'arg_of_perihelion', 'eccentricity', 'lng_asc_node', 'inclination',
diff --git a/tom_targets/sharing.py b/tom_targets/sharing.py
index 4e30ffdc6..13ec10568 100644
--- a/tom_targets/sharing.py
+++ b/tom_targets/sharing.py
@@ -9,10 +9,9 @@
 
 def share_target_with_tom(share_destination, form_data, target_lists=()):
     """
-
     :param share_destination:
     :param form_data:
-    :param group_list:
+    :param target_lists:
     :return:
     """
     # Try to get destination tom authentication/URL information
@@ -31,18 +30,23 @@ def share_target_with_tom(share_destination, form_data, target_lists=()):
     # Check if target already exists in destination DB
     destination_target_id, target_search_response = get_destination_target(form_data['target'], targets_url, headers,
                                                                            auth)
-    target_create_response = []
     if target_search_response.status_code != 200:
         return target_search_response
+
+    target_dict_list = [{'name': f'Imported From {settings.TOM_NAME}'}]
+    for target_list in target_lists:
+        target_dict_list.append({'name': target_list.name})
+
     if destination_target_id is None:
         # If target is not in Destination, serialize and create new target.
         serialized_target = TargetSerializer(form_data['target']).data
         # Remove local User Groups
         serialized_target['groups'] = []
         # Add target lists
-        serialized_target['target_lists'] = [{'name': f'Imported From {settings.TOM_NAME}'}]
-        for target_list in target_lists:
-            serialized_target['target_lists'].append({'name': target_list.name})
+        serialized_target['target_lists'] = target_dict_list
         target_create_response = requests.post(targets_url, json=serialized_target, headers=headers, auth=auth)
-
+    else:
+        update_target_data = {'target_lists': target_dict_list}
+        update_target_url = targets_url + f'{destination_target_id}/'
+        target_create_response = requests.patch(update_target_url, json=update_target_data, headers=headers, auth=auth)
     return target_create_response
diff --git a/tom_targets/tests/test_api.py b/tom_targets/tests/test_api.py
index 8b1bf29a7..d0d975063 100644
--- a/tom_targets/tests/test_api.py
+++ b/tom_targets/tests/test_api.py
@@ -7,7 +7,7 @@
 from rest_framework.test import APITestCase
 
 from tom_targets.tests.factories import SiderealTargetFactory, NonSiderealTargetFactory
-from tom_targets.tests.factories import TargetExtraFactory, TargetNameFactory
+from tom_targets.tests.factories import TargetExtraFactory, TargetNameFactory, TargetGroupingFactory
 from tom_targets.models import Target, TargetExtra, TargetName, TargetList
 
 
@@ -202,6 +202,38 @@ def test_targetname_update(self):
                             f'Alias \'{self.st.name}\' conflicts with Target name \'{self.st.name}\'',
                             status_code=status.HTTP_400_BAD_REQUEST)
 
+    def test_targetlist_update(self):
+        # Test both create new alias and update alias
+        target_list = TargetGroupingFactory.create(name='tl')
+        target_list.targets.add(self.st)
+        updates = {
+            'target_lists': [
+                {'id': target_list.id, 'name': 'update tl'},
+                {'name': 'create tl'}
+            ]
+        }
+        response = self.client.patch(reverse('api:targets-detail', args=(self.st.id,)), data=updates)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.st.refresh_from_db()
+        target_list.refresh_from_db()
+        # Target list added by name, not ID, so new name = new TargetList
+        self.assertEqual(TargetList.objects.filter(targets=self.st).count(), 3)
+        self.assertEqual(target_list.name, 'tl')
+
+        # Ensure proper handling when adding target to existing targetlist
+        target_list_s2 = TargetGroupingFactory.create(name='tl_s2')
+        target_list_s2.targets.add(self.st2)
+        updates = {
+            'target_lists': [
+                {'name': target_list_s2.name}
+            ]
+        }
+        response = self.client.patch(reverse('api:targets-detail', args=(self.st.id,)), data=updates)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.st.refresh_from_db()
+        target_list_s2.refresh_from_db()
+        self.assertEqual(target_list_s2.targets.count(), 2)
+
     def test_target_delete(self):
         response = self.client.delete(reverse('api:targets-detail', args=(self.st.id,)))
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
diff --git a/tom_targets/tests/tests.py b/tom_targets/tests/tests.py
index 4e69ef5b7..5df820df0 100644
--- a/tom_targets/tests/tests.py
+++ b/tom_targets/tests/tests.py
@@ -1428,6 +1428,7 @@ class TestShareTargetList(TestCase):
     def setUp(self):
         self.target = SiderealTargetFactory.create()
         self.target2 = SiderealTargetFactory.create()
+        self.target3 = SiderealTargetFactory.create()
         self.observation_record = ObservingRecordFactory.create(
             target_id=self.target.id,
             facility=FakeRoboticFacility.name,
@@ -1536,7 +1537,7 @@ def test_share_reduceddatums_group_valid_responses(self):
         rsp1 = responses.Response(
             method="GET",
             url=destination_tom_base_url + 'api/targets/',
-            json={"results": [{'id': 1}]},
+            json={"results": [{'id': 1}, {'id': 2}]},
             status=200
         )
         responses.add(rsp1)
@@ -1552,6 +1553,12 @@ def test_share_reduceddatums_group_valid_responses(self):
             json={},
             status=201,
         )
+        responses.add(
+            responses.PATCH,
+            destination_tom_base_url + 'api/targets/1/',
+            json={"message": "Target successfully uploaded."},
+            status=200,
+        )
 
         response = self.client.post(
             reverse('targets:share-group', kwargs={'pk': self.target_list.id}),
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 9411e0da8..641b40afd 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -35,7 +35,7 @@
 from tom_targets.forms import SiderealTargetCreateForm, NonSiderealTargetCreateForm, TargetExtraFormset
 from tom_targets.forms import TargetNamesFormset, TargetShareForm, TargetListShareForm
 from tom_targets.sharing import share_target_with_tom
-from tom_dataproducts.sharing import share_data_with_hermes, share_data_with_tom
+from tom_dataproducts.sharing import share_data_with_hermes, share_data_with_tom, sharing_feedback_handler
 
 from tom_targets.groups import (
     add_all_to_grouping, add_selected_to_grouping, remove_all_from_grouping, remove_selected_from_grouping,
@@ -639,22 +639,11 @@ def form_valid(self, form):
             for target in selected_targets:
                 form_data['target'] = Target.objects.get(id=target)
                 response = share_target_with_tom(share_destination, form_data, target_lists=[form_data['target_list']])
+                sharing_feedback_handler(response, self.request)
                 if data_switch:
                     response = share_data_with_tom(share_destination, form_data, target_id=target)
+                    sharing_feedback_handler(response, self.request)
             if not selected_targets:
                 messages.error(self.request, f'No targets shared. {form.errors.as_json()}')
                 return redirect(self.get_success_url())
-        try:
-            if 'message' in response.json():
-                publish_feedback = response.json()['message']
-            else:
-                publish_feedback = f"ERROR: {response.text}"
-        except AttributeError:
-            publish_feedback = response['message']
-        except ValueError:
-            publish_feedback = f"ERROR: Returned Response code {response.status_code}"
-        if "ERROR" in publish_feedback.upper():
-            messages.error(self.request, publish_feedback)
-        else:
-            messages.success(self.request, publish_feedback)
         return redirect(self.get_success_url())

From 9e6f27c66221c5578d525dea409f7e4f124b2e29 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 12 Sep 2023 16:40:14 -0700
Subject: [PATCH 31/37] fix undefined reference.

---
 tom_dataproducts/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tom_dataproducts/views.py b/tom_dataproducts/views.py
index 21fdaece5..e4a49fd91 100644
--- a/tom_dataproducts/views.py
+++ b/tom_dataproducts/views.py
@@ -30,7 +30,7 @@
 from tom_dataproducts.data_processor import run_data_processor
 from tom_observations.models import ObservationRecord
 from tom_observations.facility import get_service_class
-from tom_dataproducts.sharing import share_data_with_hermes, share_data_with_tom
+from tom_dataproducts.sharing import share_data_with_hermes, share_data_with_tom, sharing_feedback_handler
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)

From 6807f66d451d6bb4b31710fd1ce0d4437e426123 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Tue, 12 Sep 2023 17:10:02 -0700
Subject: [PATCH 32/37] fix tests to include updates to targetlists

---
 tom_targets/tests/tests.py | 6 ++++++
 tom_targets/views.py       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tom_targets/tests/tests.py b/tom_targets/tests/tests.py
index 5df820df0..059ed5806 100644
--- a/tom_targets/tests/tests.py
+++ b/tom_targets/tests/tests.py
@@ -1404,6 +1404,12 @@ def test_share_reduceddatums_target_valid_responses(self):
             json={},
             status=201,
         )
+        responses.add(
+            responses.PATCH,
+            destination_tom_base_url + 'api/targets/1/',
+            json={},
+            status=200,
+        )
 
         response = self.client.post(
             reverse('targets:share', kwargs={'pk': self.target.id}),
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 641b40afd..26274a348 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -371,7 +371,7 @@ def form_valid(self, form):
         if 'HERMES' in share_destination.upper():
             response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
         else:
-            response = share_target_with_tom(share_destination, form_data, selected_data)
+            response = share_target_with_tom(share_destination, form_data)
             if selected_data:
                 response = share_data_with_tom(share_destination, form_data, selected_data=selected_data)
         try:

From 319f315d66486888f5c97bafa54c0ea2e52d53d0 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Wed, 11 Oct 2023 13:13:45 -0700
Subject: [PATCH 33/37] add fuzzy, multi-target filters

---
 tom_dataproducts/sharing.py | 11 ++++++++++-
 tom_targets/filters.py      | 26 ++++++++++++++++++++++++--
 tom_targets/sharing.py      |  2 ++
 tom_targets/tests/tests.py  | 33 ++++++++++++++++++++++++++++++++-
 4 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index 543a7579d..656069d14 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -92,6 +92,8 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
         destination_target_id, target_search_response = get_destination_target(target, targets_url, headers, auth)
         if destination_target_id is None:
             return {'message': 'ERROR: No matching target found.'}
+        elif isinstance(destination_target_id, list) and len(destination_target_id) > 1:
+            return {'message': 'ERROR: Multiple targets with matching name found in destination TOM.'}
         serialized_data['target'] = destination_target_id
         # TODO: this should be updated when tom_dataproducts is updated to use django.core.storage
         dataproduct_filename = os.path.join(settings.MEDIA_ROOT, product.data.name)
@@ -111,6 +113,8 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
                                                                                        targets_url,
                                                                                        headers,
                                                                                        auth)
+                if isinstance(destination_target_id, list) and len(destination_target_id) > 1:
+                    return {'message': 'ERROR: Multiple targets with matching name found in destination TOM.'}
                 target_dict[target.name] = destination_target_id
             if all(value is None for value in target_dict.values()):
                 return {'message': 'ERROR: No matching targets found.'}
@@ -120,6 +124,8 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
             destination_target_id, target_search_response = get_destination_target(target, targets_url, headers, auth)
             if destination_target_id is None:
                 return {'message': 'ERROR: No matching target found.'}
+            elif isinstance(destination_target_id, list) and len(destination_target_id) > 1:
+                return {'message': 'ERROR: Multiple targets with matching name found in destination TOM.'}
             target_dict = {target.name:  destination_target_id}
         response_codes = []
         reduced_datums = check_for_share_safe_datums(share_destination, reduced_datums)
@@ -156,10 +162,13 @@ def get_destination_target(target, targets_url, headers, auth):
     :param auth:
     :return:
     """
-    target_response = requests.get(f'{targets_url}?name={target.name}', headers=headers, auth=auth)
+    target_names = ','.join(map(str, target.names))
+    target_response = requests.get(f'{targets_url}?name_fuzzy={target_names}', headers=headers, auth=auth)
     target_response_json = target_response.json()
     try:
         if target_response_json['results']:
+            if len(target_response_json['results']) > 1:
+                return target_response_json['results'], target_response
             destination_target_id = target_response_json['results'][0]['id']
             return destination_target_id, target_response
         else:
diff --git a/tom_targets/filters.py b/tom_targets/filters.py
index dafc564b3..c47e7bd47 100644
--- a/tom_targets/filters.py
+++ b/tom_targets/filters.py
@@ -2,7 +2,7 @@
 from django.db.models import Q
 import django_filters
 
-from tom_targets.models import Target, TargetList
+from tom_targets.models import Target, TargetList, TargetMatchManager
 from tom_targets.utils import cone_search_filter
 
 
@@ -55,7 +55,29 @@ def __init__(self, *args, **kwargs):
     name = django_filters.CharFilter(method='filter_name', label='Name')
 
     def filter_name(self, queryset, name, value):
-        return queryset.filter(Q(name__icontains=value) | Q(aliases__name__icontains=value)).distinct()
+        """
+        Return a queryset for targets with names or aliases containing the given coma-separated list of terms.
+        """
+        q_set = Q()
+        for term in value.split(','):
+            q_set |= Q(name__icontains=term) | Q(aliases__name__icontains=term)
+        return queryset.filter(q_set).distinct()
+
+    name_fuzzy = django_filters.CharFilter(method='filter_name_fuzzy', label='Name (Fuzzy)')
+
+    def filter_name_fuzzy(self, queryset, name, value):
+        """
+        Return a queryset for targets with names or aliases fuzzy matching the given coma-separated list of terms.
+        A fuzzy match is determined by the `make_simple_name` method of the `TargetMatchManager` class.
+        """
+        matching_names = []
+        for term in value.split(','):
+            simple_name = TargetMatchManager.make_simple_name(self, term)
+            for target in Target.objects.all().prefetch_related('aliases'):
+                for alias in target.names:
+                    if TargetMatchManager.make_simple_name(self, alias) == simple_name:
+                        matching_names.append(target.name)
+        return queryset.filter(name__in=matching_names).distinct()
 
     cone_search = django_filters.CharFilter(method='filter_cone_search', label='Cone Search',
                                             help_text='RA, Dec, Search Radius (degrees)')
diff --git a/tom_targets/sharing.py b/tom_targets/sharing.py
index 13ec10568..977b27f28 100644
--- a/tom_targets/sharing.py
+++ b/tom_targets/sharing.py
@@ -32,6 +32,8 @@ def share_target_with_tom(share_destination, form_data, target_lists=()):
                                                                            auth)
     if target_search_response.status_code != 200:
         return target_search_response
+    elif isinstance(destination_target_id, list) and len(destination_target_id) > 1:
+        return {'message': 'ERROR: Multiple targets with matching name found in destination TOM.'}
 
     target_dict_list = [{'name': f'Imported From {settings.TOM_NAME}'}]
     for target_list in target_lists:
diff --git a/tom_targets/tests/tests.py b/tom_targets/tests/tests.py
index 059ed5806..a335694aa 100644
--- a/tom_targets/tests/tests.py
+++ b/tom_targets/tests/tests.py
@@ -1380,6 +1380,37 @@ def test_share_target_valid_connection_no_target_found(self):
 
         self.assertContains(response, 'Target successfully uploaded.')
 
+    @responses.activate
+    def test_share_target_valid_connection_multiple_target_found(self):
+        share_destination = 'local_host'
+        destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
+
+        rsp1 = responses.Response(
+            method="GET",
+            url=destination_tom_base_url + 'api/targets/',
+            json={"results": [{'id': 1}, {'id': 2}]},
+            status=200
+        )
+        responses.add(rsp1)
+        responses.add(
+            responses.GET,
+            "http://hermes-dev.lco.global/api/v0/profile/",
+            json={"error": "not found"},
+            status=404,
+        )
+
+        response = self.client.post(
+            reverse('targets:share', kwargs={'pk': self.target.id}),
+            {
+                'submitter': ['test_submitter'],
+                'target': self.target.id,
+                'share_destination': [share_destination],
+            },
+            follow=True
+        )
+
+        self.assertContains(response, 'ERROR: Multiple targets with matching name found in destination TOM.')
+
     @responses.activate
     def test_share_reduceddatums_target_valid_responses(self):
         share_destination = 'local_host'
@@ -1543,7 +1574,7 @@ def test_share_reduceddatums_group_valid_responses(self):
         rsp1 = responses.Response(
             method="GET",
             url=destination_tom_base_url + 'api/targets/',
-            json={"results": [{'id': 1}, {'id': 2}]},
+            json={"results": [{'id': 1}]},
             status=200
         )
         responses.add(rsp1)

From 19cf5ca98ccfebc0565496fccb26cd706b3b630f Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Thu, 12 Oct 2023 12:55:10 -0700
Subject: [PATCH 34/37] add comments

---
 tom_dataproducts/sharing.py                   | 41 +++++++++++-------
 tom_targets/api_views.py                      |  2 +
 tom_targets/forms.py                          |  6 +++
 tom_targets/serializers.py                    |  5 +++
 tom_targets/sharing.py                        | 13 ++++--
 .../tom_targets/partials/target_buttons.html  |  2 +-
 .../templates/tom_targets/target_share.html   |  2 +-
 tom_targets/tests/test_api.py                 |  5 ++-
 tom_targets/tests/tests.py                    |  4 ++
 tom_targets/views.py                          | 42 ++++++++++---------
 10 files changed, 81 insertions(+), 41 deletions(-)

diff --git a/tom_dataproducts/sharing.py b/tom_dataproducts/sharing.py
index 656069d14..d85c3524c 100644
--- a/tom_dataproducts/sharing.py
+++ b/tom_dataproducts/sharing.py
@@ -13,12 +13,12 @@
 
 def share_data_with_hermes(share_destination, form_data, product_id=None, target_id=None, selected_data=None):
     """
-
-    :param share_destination:
-    :param form_data:
-    :param product_id:
-    :param target_id:
-    :param selected_data:
+    Serialize and share data with Hermes (hermes.lco.global)
+    :param share_destination: Topic to share data to. (e.g. 'hermes.test')
+    :param form_data: Sharing Form data
+    :param product_id: DataProduct ID (if provided)
+    :param target_id: Target ID (if provided)
+    :param selected_data: List of ReducedDatum IDs (if provided)
     :return:
     """
     # Query relevant Reduced Datums Queryset
@@ -63,14 +63,15 @@ def share_data_with_hermes(share_destination, form_data, product_id=None, target
 
 def share_data_with_tom(share_destination, form_data, product_id=None, target_id=None, selected_data=None):
     """
-
-    :param share_destination:
-    :param form_data:
-    :param product_id:
-    :param target_id:
-    :param selected_data:
+    Serialize and share data with another TOM
+    :param share_destination: TOM to share data to as described in settings.DATA_SHARING. (e.g. 'mytom')
+    :param form_data: Sharing Form data
+    :param product_id: DataProduct ID (if provided)
+    :param target_id: Target ID (if provided)
+    :param selected_data: List of ReducedDatum IDs (if provided)
     :return:
     """
+    # Build destination TOM headers and URL information
     try:
         destination_tom_base_url = settings.DATA_SHARING[share_destination]['BASE_URL']
         username = settings.DATA_SHARING[share_destination]['USERNAME']
@@ -85,10 +86,12 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
     reduced_datums_url = destination_tom_base_url + 'api/reduceddatums/'
     reduced_datums = ReducedDatum.objects.none()
 
+    # If a DataProduct is provided, share that DataProduct
     if product_id:
         product = DataProduct.objects.get(pk=product_id)
         target = product.target
         serialized_data = DataProductSerializer(product).data
+        # Find matching target in destination TOM
         destination_target_id, target_search_response = get_destination_target(target, targets_url, headers, auth)
         if destination_target_id is None:
             return {'message': 'ERROR: No matching target found.'}
@@ -103,6 +106,7 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
             headers = {'Media-Type': 'multipart/form-data'}
             response = requests.post(dataproducts_url, data=serialized_data, files=files, headers=headers, auth=auth)
     elif selected_data or target_id:
+        # If ReducedDatums are provided, share those ReducedDatums
         if selected_data:
             reduced_datums = ReducedDatum.objects.filter(pk__in=selected_data)
             targets = set(reduced_datum.target for reduced_datum in reduced_datums)
@@ -119,6 +123,8 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
             if all(value is None for value in target_dict.values()):
                 return {'message': 'ERROR: No matching targets found.'}
         else:
+            # If Target is provided, share all ReducedDatums for that Target
+            # (Will not create New Target in Destination TOM)
             target = Target.objects.get(pk=target_id)
             reduced_datums = ReducedDatum.objects.filter(target=target)
             destination_target_id, target_search_response = get_destination_target(target, targets_url, headers, auth)
@@ -155,13 +161,14 @@ def share_data_with_tom(share_destination, form_data, product_id=None, target_id
 
 def get_destination_target(target, targets_url, headers, auth):
     """
-    Retrieve the target ID from a destination TOM
+    Retrieve the target ID from a destination TOM that is a fuzzy match the given target name and aliases
     :param target: Target Model
     :param targets_url: Destination API URL for TOM Target List
-    :param headers:
-    :param auth:
+    :param headers: TOM API headers
+    :param auth: TOM API authorization
     :return:
     """
+    # Create coma separated list of target names plus aliases that can be recognized and parsed by the TOM API Filter
     target_names = ','.join(map(str, target.names))
     target_response = requests.get(f'{targets_url}?name_fuzzy={target_names}', headers=headers, auth=auth)
     target_response_json = target_response.json()
@@ -229,6 +236,10 @@ def get_sharing_destination_options():
 
 
 def sharing_feedback_handler(response, request):
+    """
+    Handle the response from a sharing request and prepare a message to the user
+    :return:
+    """
     try:
         if 'message' in response.json():
             publish_feedback = response.json()['message']
diff --git a/tom_targets/api_views.py b/tom_targets/api_views.py
index 41d831515..861640595 100644
--- a/tom_targets/api_views.py
+++ b/tom_targets/api_views.py
@@ -57,6 +57,7 @@ def get_queryset(self):
     def create(self, request, *args, **kwargs):
         response = super().create(request, *args, **kwargs)
 
+        # Custom message for successful target creation
         if response.status_code == status.HTTP_201_CREATED:
             response.data['message'] = 'Target successfully uploaded.'
         return response
@@ -64,6 +65,7 @@ def create(self, request, *args, **kwargs):
     def update(self, request, *args, **kwargs):
         response = super().update(request, *args, **kwargs)
 
+        # Custom message for successful target update
         if response.status_code == status.HTTP_200_OK:
             response.data['message'] = 'Target successfully updated.'
         return response
diff --git a/tom_targets/forms.py b/tom_targets/forms.py
index f22520750..be549285e 100644
--- a/tom_targets/forms.py
+++ b/tom_targets/forms.py
@@ -170,6 +170,9 @@ def clean(self):
 
 
 class TargetShareForm(forms.Form):
+    """
+    Form for sharing a target with an outside destination such as another TOM Toolkit or Hermes
+    """
     share_destination = forms.ChoiceField(required=True, choices=[], label="Destination")
     target = forms.ModelChoiceField(
         Target.objects.all(),
@@ -183,6 +186,9 @@ def __init__(self, *args, **kwargs):
 
 
 class TargetListShareForm(forms.Form):
+    """
+    Form for sharing a target list with an outside destination such as another TOM Toolkit or Hermes
+    """
     share_destination = forms.ChoiceField(required=True, choices=[], label="Destination")
     target_list = forms.ModelChoiceField(
         TargetList.objects.all(),
diff --git a/tom_targets/serializers.py b/tom_targets/serializers.py
index 2d2b9f00d..2c1e46eca 100644
--- a/tom_targets/serializers.py
+++ b/tom_targets/serializers.py
@@ -24,6 +24,9 @@ class Meta:
 
 
 class TargetListSerializer(serializers.ModelSerializer):
+    """
+    TargetList serializer responsible for transforming models to/from
+    """
     id = serializers.IntegerField(required=False)
     name = serializers.CharField(required=False)
 
@@ -93,6 +96,7 @@ def create(self, validated_data):
         if tes.is_valid():
             tes.save(target=target)
 
+        # Save target lists for this target
         tls = TargetListSerializer(data=target_lists, many=True)
         if tls.is_valid():
             for target_list in target_lists:
@@ -157,6 +161,7 @@ def update(self, instance, validated_data):
             if tes.is_valid():
                 tes.save(target=instance)
 
+        # Update target lists for this target
         tls = TargetListSerializer(data=target_lists, many=True)
         if tls.is_valid():
             for target_list in target_lists:
diff --git a/tom_targets/sharing.py b/tom_targets/sharing.py
index 977b27f28..62b1b813b 100644
--- a/tom_targets/sharing.py
+++ b/tom_targets/sharing.py
@@ -9,10 +9,11 @@
 
 def share_target_with_tom(share_destination, form_data, target_lists=()):
     """
-    :param share_destination:
-    :param form_data:
-    :param target_lists:
-    :return:
+    Share a target with a remote TOM.
+    :param share_destination: The name of the destination TOM as defined in settings.DATA_SHARING
+    :param form_data: The form data from the target form
+    :param target_lists: The target lists to add the target to in the destination TOM
+    :return: The response from the destination TOM
     """
     # Try to get destination tom authentication/URL information
     try:
@@ -30,15 +31,18 @@ def share_target_with_tom(share_destination, form_data, target_lists=()):
     # Check if target already exists in destination DB
     destination_target_id, target_search_response = get_destination_target(form_data['target'], targets_url, headers,
                                                                            auth)
+    # Handle errors or multiple targets found
     if target_search_response.status_code != 200:
         return target_search_response
     elif isinstance(destination_target_id, list) and len(destination_target_id) > 1:
         return {'message': 'ERROR: Multiple targets with matching name found in destination TOM.'}
 
+    # Build list of targetlists to add target to in destination TOM
     target_dict_list = [{'name': f'Imported From {settings.TOM_NAME}'}]
     for target_list in target_lists:
         target_dict_list.append({'name': target_list.name})
 
+    # Create or update target in destination TOM
     if destination_target_id is None:
         # If target is not in Destination, serialize and create new target.
         serialized_target = TargetSerializer(form_data['target']).data
@@ -48,6 +52,7 @@ def share_target_with_tom(share_destination, form_data, target_lists=()):
         serialized_target['target_lists'] = target_dict_list
         target_create_response = requests.post(targets_url, json=serialized_target, headers=headers, auth=auth)
     else:
+        # Add target to target lists if it already exists in destination TOM
         update_target_data = {'target_lists': target_dict_list}
         update_target_url = targets_url + f'{destination_target_id}/'
         target_create_response = requests.patch(update_target_url, json=update_target_data, headers=headers, auth=auth)
diff --git a/tom_targets/templates/tom_targets/partials/target_buttons.html b/tom_targets/templates/tom_targets/partials/target_buttons.html
index 76af2cfed..a22408d10 100644
--- a/tom_targets/templates/tom_targets/partials/target_buttons.html
+++ b/tom_targets/templates/tom_targets/partials/target_buttons.html
@@ -1,3 +1,3 @@
 <a href="{% url 'tom_targets:update' pk=target.id %}" title="Update target" class="btn  btn-primary">Update</a>
 <a href="{% url 'tom_targets:share' pk=target.id %}" title="Share target" class="btn  btn-info">Share</a>
-<a href="{% url 'tom_targets:delete' pk=target.id %}" title="Delete target" class="btn  btn-warning">Delete</a>
\ No newline at end of file
+<a href="{% url 'tom_targets:delete' pk=target.id %}" title="Delete target" class="btn  btn-warning">Delete</a>
diff --git a/tom_targets/templates/tom_targets/target_share.html b/tom_targets/templates/tom_targets/target_share.html
index e1222c13a..1e504b843 100644
--- a/tom_targets/templates/tom_targets/target_share.html
+++ b/tom_targets/templates/tom_targets/target_share.html
@@ -24,4 +24,4 @@ <h4> Include Data </h4>
         <a href="{% url 'targets:detail' pk=target.id %}" class="btn btn-primary" title="Back">Back</a>
     {% endbuttons %}
 </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/tom_targets/tests/test_api.py b/tom_targets/tests/test_api.py
index d0d975063..a05cfa6e9 100644
--- a/tom_targets/tests/test_api.py
+++ b/tom_targets/tests/test_api.py
@@ -53,6 +53,9 @@ def test_target_detail(self):
         self.assertEqual(response.json()['detail'], 'Not found.')
 
     def test_target_create(self):
+        """
+        Test that a target can be created with all valid parameters through the API
+        """
         collaborator = User.objects.create(username='test collaborator')
         group = Group.objects.create(name='bourgeoisie')
         group.user_set.add(self.user)
@@ -203,7 +206,7 @@ def test_targetname_update(self):
                             status_code=status.HTTP_400_BAD_REQUEST)
 
     def test_targetlist_update(self):
-        # Test both create new alias and update alias
+        # Test Add existing target to new target list
         target_list = TargetGroupingFactory.create(name='tl')
         target_list.targets.add(self.st)
         updates = {
diff --git a/tom_targets/tests/tests.py b/tom_targets/tests/tests.py
index a335694aa..3792ae11a 100644
--- a/tom_targets/tests/tests.py
+++ b/tom_targets/tests/tests.py
@@ -1288,6 +1288,10 @@ def test_persist_filter_empty(self):
                                                 'USERNAME': 'fake_user',
                                                 'PASSWORD': 'password'}})
 class TestShareTargets(TestCase):
+    """
+    Tests for the share_targets view.
+    Tests the behavior of the SENDING TOM and Mocks responses from receiving TOM.
+    """
     def setUp(self):
         self.target = SiderealTargetFactory.create()
         self.observation_record = ObservingRecordFactory.create(
diff --git a/tom_targets/views.py b/tom_targets/views.py
index 26274a348..d7689b02f 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -334,15 +334,15 @@ class TargetDeleteView(Raise403PermissionRequiredMixin, DeleteView):
 
 class TargetShareView(FormView):
     """
-    View for deleting a target. Requires authorization.
+    View for sharing a target. Requires authorization.
     """
     template_name = 'tom_targets/target_share.html'
-    # permission_required = 'tom_targets.share_target'
+    permission_required = 'tom_targets.share_target'
     form_class = TargetShareForm
 
     def get_context_data(self, *args, **kwargs):
         """
-        Adds the ``DataProductUploadForm`` to the context and prepopulates the hidden fields.
+        Adds the target information to the context.
         :returns: context object
         :rtype: dict
         """
@@ -353,6 +353,9 @@ def get_context_data(self, *args, **kwargs):
         return context
 
     def get_success_url(self):
+        """
+        Redirect to target detail page for shared target
+        """
         return reverse_lazy('targets:detail', kwargs={'pk': self.kwargs.get('pk', None)})
 
     def form_invalid(self, form):
@@ -364,29 +367,24 @@ def form_invalid(self, form):
         return redirect(self.get_success_url())
 
     def form_valid(self, form):
+        """
+        Shares the target with the selected destination(s) and redirects to the target detail page.
+        """
         form_data = form.cleaned_data
         share_destination = form_data['share_destination']
         target_id = self.kwargs.get('pk', None)
         selected_data = self.request.POST.getlist("share-box")
         if 'HERMES' in share_destination.upper():
             response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
+            sharing_feedback_handler(response, self.request)
         else:
+            # Share Target with Destination TOM
             response = share_target_with_tom(share_destination, form_data)
+            sharing_feedback_handler(response, self.request)
             if selected_data:
+                # Share Data with Destination TOM
                 response = share_data_with_tom(share_destination, form_data, selected_data=selected_data)
-        try:
-            if 'message' in response.json():
-                publish_feedback = response.json()['message']
-            else:
-                publish_feedback = f"ERROR: {response.text}"
-        except AttributeError:
-            publish_feedback = response['message']
-        except ValueError:
-            publish_feedback = f"ERROR: Returned Response code {response.status_code}"
-        if "ERROR" in publish_feedback.upper():
-            messages.error(self.request, publish_feedback)
-        else:
-            messages.success(self.request, publish_feedback)
+                sharing_feedback_handler(response, self.request)
         return redirect(self.get_success_url())
 
 
@@ -592,15 +590,15 @@ def form_valid(self, form):
 
 class TargetGroupingShareView(FormView):
     """
-    View for deleting a target. Requires authorization.
+    View for sharing a TargetList. Requires authorization.
     """
     template_name = 'tom_targets/target_group_share.html'
-    # permission_required = 'tom_targets.share_target'
+    permission_required = 'tom_targets.share_target'
     form_class = TargetListShareForm
 
     def get_context_data(self, *args, **kwargs):
         """
-        Adds the ``DataProductUploadForm`` to the context and prepopulates the hidden fields.
+        Adds the ``TargetListShareForm`` to the context and prepopulates the hidden fields.
         :returns: context object
         :rtype: dict
         """
@@ -616,6 +614,9 @@ def get_context_data(self, *args, **kwargs):
         return context
 
     def get_success_url(self):
+        """
+        Redirects to the target list page with the target list name as a query parameter.
+        """
         return reverse_lazy('targets:list')+f'?targetlist__name={self.kwargs.get("pk", None)}'
 
     def form_invalid(self, form):
@@ -632,15 +633,18 @@ def form_valid(self, form):
         selected_targets = self.request.POST.getlist('selected-target')
         data_switch = self.request.POST.get('dataSwitch', False)
         if 'HERMES' in share_destination.upper():
+            # TODO: Implement Hermes sharing
             # response = share_data_with_hermes(share_destination, form_data, None, target_id, selected_data)
             messages.error(self.request, "Publishing Groups to Hermes is not yet supported.")
             return redirect(self.get_success_url())
         else:
             for target in selected_targets:
+                # Share each target individually
                 form_data['target'] = Target.objects.get(id=target)
                 response = share_target_with_tom(share_destination, form_data, target_lists=[form_data['target_list']])
                 sharing_feedback_handler(response, self.request)
                 if data_switch:
+                    # If Data sharing request, share all data associated with the target
                     response = share_data_with_tom(share_destination, form_data, target_id=target)
                     sharing_feedback_handler(response, self.request)
             if not selected_targets:

From 9750f2a44b5977728f1b28b7d95b3d97bfc7e0e5 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Fri, 13 Oct 2023 14:19:22 -0700
Subject: [PATCH 35/37] hide sharing options when unconfigured.

---
 tom_base/settings.py                          | 48 +++++++++----------
 .../tom_targets/partials/target_buttons.html  |  4 +-
 .../tom_targets/target_grouping.html          |  8 +++-
 tom_targets/templatetags/targets_extras.py    |  3 +-
 tom_targets/views.py                          | 10 ++++
 5 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/tom_base/settings.py b/tom_base/settings.py
index fe8754ce3..8eef5e1fb 100644
--- a/tom_base/settings.py
+++ b/tom_base/settings.py
@@ -237,30 +237,30 @@
 }
 
 # Configuration for the TOM/Kafka Stream receiving data from this TOM
-DATA_SHARING = {
-    'hermes': {
-        'DISPLAY_NAME': os.getenv('HERMES_DISPLAY_NAME', 'Hermes'),
-        'BASE_URL': os.getenv('HERMES_BASE_URL', 'https://hermes.lco.global/'),
-        'CREDENTIAL_USERNAME': os.getenv('SCIMMA_CREDENTIAL_USERNAME',
-                                         'set SCIMMA_CREDENTIAL_USERNAME value in environment'),
-        'CREDENTIAL_PASSWORD': os.getenv('SCIMMA_CREDENTIAL_PASSWORD',
-                                         'set SCIMMA_CREDENTIAL_PASSWORD value in environment'),
-        'USER_TOPICS': ['hermes.test', 'tomtoolkit.test']
-    },
-    'tom-demo-dev': {
-        'DISPLAY_NAME': os.getenv('TOM_DEMO_DISPLAY_NAME', 'TOM Demo Dev'),
-        'BASE_URL': os.getenv('TOM_DEMO_BASE_URL', 'http://tom-demo-dev.lco.gtn/'),
-        'USERNAME': os.getenv('TOM_DEMO_USERNAME', 'set TOM_DEMO_USERNAME value in environment'),
-        'PASSWORD': os.getenv('TOM_DEMO_PASSWORD', 'set TOM_DEMO_PASSWORD value in environment'),
-    },
-    'localhost-tom': {
-        # for testing; share with yourself
-        'DISPLAY_NAME': os.getenv('LOCALHOST_TOM_DISPLAY_NAME', 'Local'),
-        'BASE_URL': os.getenv('LOCALHOST_TOM_BASE_URL', 'http://127.0.0.1:8000/'),
-        'USERNAME': os.getenv('LOCALHOST_TOM_USERNAME', 'set LOCALHOST_TOM_USERNAME value in environment'),
-        'PASSWORD': os.getenv('LOCALHOST_TOM_PASSWORD', 'set LOCALHOST_TOM_PASSWORD value in environment'),
-    }
-}
+# DATA_SHARING = {
+#     'hermes': {
+#         'DISPLAY_NAME': os.getenv('HERMES_DISPLAY_NAME', 'Hermes'),
+#         'BASE_URL': os.getenv('HERMES_BASE_URL', 'https://hermes.lco.global/'),
+#         'CREDENTIAL_USERNAME': os.getenv('SCIMMA_CREDENTIAL_USERNAME',
+#                                          'set SCIMMA_CREDENTIAL_USERNAME value in environment'),
+#         'CREDENTIAL_PASSWORD': os.getenv('SCIMMA_CREDENTIAL_PASSWORD',
+#                                          'set SCIMMA_CREDENTIAL_PASSWORD value in environment'),
+#         'USER_TOPICS': ['hermes.test', 'tomtoolkit.test']
+#     },
+#     'tom-demo-dev': {
+#         'DISPLAY_NAME': os.getenv('TOM_DEMO_DISPLAY_NAME', 'TOM Demo Dev'),
+#         'BASE_URL': os.getenv('TOM_DEMO_BASE_URL', 'http://tom-demo-dev.lco.gtn/'),
+#         'USERNAME': os.getenv('TOM_DEMO_USERNAME', 'set TOM_DEMO_USERNAME value in environment'),
+#         'PASSWORD': os.getenv('TOM_DEMO_PASSWORD', 'set TOM_DEMO_PASSWORD value in environment'),
+#     },
+#     'localhost-tom': {
+#         # for testing; share with yourself
+#         'DISPLAY_NAME': os.getenv('LOCALHOST_TOM_DISPLAY_NAME', 'Local'),
+#         'BASE_URL': os.getenv('LOCALHOST_TOM_BASE_URL', 'http://127.0.0.1:8000/'),
+#         'USERNAME': os.getenv('LOCALHOST_TOM_USERNAME', 'set LOCALHOST_TOM_USERNAME value in environment'),
+#         'PASSWORD': os.getenv('LOCALHOST_TOM_PASSWORD', 'set LOCALHOST_TOM_PASSWORD value in environment'),
+#     }
+# }
 
 TOM_CADENCE_STRATEGIES = [
     'tom_observations.cadences.retry_failed_observations.RetryFailedObservationsStrategy',
diff --git a/tom_targets/templates/tom_targets/partials/target_buttons.html b/tom_targets/templates/tom_targets/partials/target_buttons.html
index a22408d10..321bca67d 100644
--- a/tom_targets/templates/tom_targets/partials/target_buttons.html
+++ b/tom_targets/templates/tom_targets/partials/target_buttons.html
@@ -1,3 +1,5 @@
 <a href="{% url 'tom_targets:update' pk=target.id %}" title="Update target" class="btn  btn-primary">Update</a>
-<a href="{% url 'tom_targets:share' pk=target.id %}" title="Share target" class="btn  btn-info">Share</a>
+{% if sharing %}
+    <a href="{% url 'tom_targets:share' pk=target.id %}" title="Share target" class="btn  btn-info">Share</a>
+{% endif %}
 <a href="{% url 'tom_targets:delete' pk=target.id %}" title="Delete target" class="btn  btn-warning">Delete</a>
diff --git a/tom_targets/templates/tom_targets/target_grouping.html b/tom_targets/templates/tom_targets/target_grouping.html
index 647d0db44..b6d2ba9e5 100644
--- a/tom_targets/templates/tom_targets/target_grouping.html
+++ b/tom_targets/templates/tom_targets/target_grouping.html
@@ -17,7 +17,9 @@ <h1>Target Groupings</h1>
       <tr>
         <th>Group</th>
         <th>Total Targets</th>
-        <th>Share</th>
+        {% if sharing %}
+          <th>Share</th>
+        {% endif %}
         <th>Delete</th>
       </tr>
     </thead>
@@ -26,7 +28,9 @@ <h1>Target Groupings</h1>
       <tr>
         <td><button type="submit" class="btn btn-link" name="targetlist__name" value="{{group.id}}" title="View Group">{{ group.name }}</button></td>
         <td valign="middle">{{ group.targets.count }}</td>
-        <td><a href="{% url 'targets:share-group' group.id%}" title="Share Group" class="btn btn-info">Share</a></td>
+        {% if sharing %}
+          <td><a href="{% url 'targets:share-group' group.id%}" title="Share Group" class="btn btn-info">Share</a></td>
+        {% endif %}
         <td><a href="{% url 'targets:delete-group' group.id%}" title="Delete Group" class="btn btn-danger">Delete</a></td>
       </tr>
       {% empty %}
diff --git a/tom_targets/templatetags/targets_extras.py b/tom_targets/templatetags/targets_extras.py
index 140abe19c..2fe5b6d0a 100644
--- a/tom_targets/templatetags/targets_extras.py
+++ b/tom_targets/templatetags/targets_extras.py
@@ -50,7 +50,8 @@ def target_buttons(target):
     """
     Displays the Update and Delete buttons for a target.
     """
-    return {'target': target}
+    return {'target': target,
+            'sharing': getattr(settings, "DATA_SHARING", None)}
 
 
 @register.inclusion_tag('tom_targets/partials/target_data.html')
diff --git a/tom_targets/views.py b/tom_targets/views.py
index d7689b02f..ac7d39bfb 100644
--- a/tom_targets/views.py
+++ b/tom_targets/views.py
@@ -555,6 +555,16 @@ class TargetGroupingView(PermissionListMixin, ListView):
     model = TargetList
     paginate_by = 25
 
+    def get_context_data(self, *args, **kwargs):
+        """
+        Adds ``settings.DATA_SHARING`` to the context to see if sharing has been configured.
+        :returns: context object
+        :rtype: dict
+        """
+        context = super().get_context_data(*args, **kwargs)
+        context['sharing'] = getattr(settings, "DATA_SHARING", None)
+        return context
+
 
 class TargetGroupingDeleteView(Raise403PermissionRequiredMixin, DeleteView):
     """

From 9d873921c72a760ef0c7ebbd6e7ad889d6ae9119 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Mon, 16 Oct 2023 14:51:18 -0700
Subject: [PATCH 36/37] update readthedocs

---
 docs/managing_data/tom_direct_sharing.rst | 100 +++++++++++++++-------
 1 file changed, 71 insertions(+), 29 deletions(-)

diff --git a/docs/managing_data/tom_direct_sharing.rst b/docs/managing_data/tom_direct_sharing.rst
index ee04cb73e..bc0edb2ca 100644
--- a/docs/managing_data/tom_direct_sharing.rst
+++ b/docs/managing_data/tom_direct_sharing.rst
@@ -1,32 +1,74 @@
 Sharing Data with Other TOMs
 ############################
 
-TOM Toolkit does not yet support direct sharing between TOMs, however we hope to add this functionality soon.
-
-
-..  Configuring your TOM to submit data to another TOM:
-..  ***************************************************
-..  
-..  You will need to add a ``DATA_SHARING`` configuration dictionary to your ``settings.py`` that gives the credentials
-..  for the various TOMs with which you wish to share data.
-..  
-..  .. code:: python
-..  
-..     # Define the valid data sharing destinations for your TOM.
-..     DATA_SHARING = {
-..          'tom-demo-dev': {
-..              'DISPLAY_NAME': os.getenv('TOM_DEMO_DISPLAY_NAME', 'TOM Demo Dev'),
-..              'BASE_URL': os.getenv('TOM_DEMO_BASE_URL', 'http://tom-demo-dev.lco.gtn/'),
-..              'USERNAME': os.getenv('TOM_DEMO_USERNAME', 'set TOM_DEMO_USERNAME value in environment'),
-..              'PASSWORD': os.getenv('TOM_DEMO_PASSWORD', 'set TOM_DEMO_PASSWORD value in environment'),
-..          },
-..          'localhost-tom': {
-..              # for testing; share with yourself
-..              'DISPLAY_NAME': os.getenv('LOCALHOST_TOM_DISPLAY_NAME', 'Local'),
-..              'BASE_URL': os.getenv('LOCALHOST_TOM_BASE_URL', 'http://127.0.0.1:8000/'),
-..              'USERNAME': os.getenv('LOCALHOST_TOM_USERNAME', 'set LOCALHOST_TOM_USERNAME value in environment'),
-..              'PASSWORD': os.getenv('LOCALHOST_TOM_PASSWORD', 'set LOCALHOST_TOM_PASSWORD value in environment'),
-..          }
-..  
-..     }
-..  
\ No newline at end of file
+TOM Toolkit supports direct data sharing between TOMs.
+
+
+Permissions:
+************
+To save data to a destination TOM your TOM will need to have access to a user account on that TOM with the correct
+permissions. This is handled by your TOM's administrator as described below.
+
+.. warning:: Any user who has permission to access the relevant target or data in your TOM will have permission to
+            submit that data to the destination TOM once DATA_SHARING is configured.
+
+
+Configuring your TOM to submit data to another TOM:
+***************************************************
+
+You will need to add a ``DATA_SHARING`` configuration dictionary to your ``settings.py`` that gives the credentials
+for the various TOMs with which you wish to share data. This should be the same ``DATA_SHARING`` dictionary that is used
+to :doc:`/managing_data/stream_pub_sub` such as `Hermes <https://hermes.lco.global>`_.
+
+.. code:: python
+
+    # Define the valid data sharing destinations for your TOM.
+    DATA_SHARING = {
+        'not-my-tom': {
+            # For sharing data with another TOM
+            'DISPLAY_NAME': os.getenv('NOT_MY_TOM_DISPLAY_NAME', 'Not My Tom'),
+            'BASE_URL': os.getenv('NOT_MY_TOM_BASE_URL', 'http://notmytom.com/'),
+            'USERNAME': os.getenv('NOT_MY_TOM_USERNAME', 'set NOT_MY_TOM_USERNAME value in environment'),
+            'PASSWORD': os.getenv('NOT_MY_TOM_PASSWORD', 'set NOT_MY_TOM_PASSWORD value in environment'),
+        },
+        'localhost-tom': {
+            # for testing; share with yourself
+            'DISPLAY_NAME': os.getenv('LOCALHOST_TOM_DISPLAY_NAME', 'Local'),
+            'BASE_URL': os.getenv('LOCALHOST_TOM_BASE_URL', 'http://127.0.0.1:8000/'),
+            'USERNAME': os.getenv('LOCALHOST_TOM_USERNAME', 'set LOCALHOST_TOM_USERNAME value in environment'),
+            'PASSWORD': os.getenv('LOCALHOST_TOM_PASSWORD', 'set LOCALHOST_TOM_PASSWORD value in environment'),
+        }
+    }
+
+Receiving Shared Data:
+**********************
+
+Reduced Datums:
+---------------
+When your TOM receives a new ``ReducedDatum`` from another TOM it will be saved to your TOM's database with its source
+set to the name of the TOM that submitted it. Currently, only Photometry data can be directly shared between
+TOMS and a ``Target`` with a matching name or alias must exist in both TOMS for sharing to take place.
+
+Data Products:
+--------------
+When your TOM receives a new ``DataProduct`` from another TOM it will be saved to your TOM's database / storage and run
+through the appropriate :doc:`data_processor </managing_data/customizing_data_processing>` pipeline. Only data products
+associated with a ``Target`` with a name or alias that matches that of a target in the destination TOM will be shared.
+
+Targets:
+--------
+When your TOM receives a new ``Target`` from another TOM it will be saved to your TOM's database. If the target's name
+or alias doesn't match that of a target that already exists in the database, a new target will be created and added to a
+new ``TargetList`` called "Imported from <TOM Name>".
+
+Target Lists:
+-------------
+When your TOM receives a new ``TargetList`` from another TOM it will be saved to your TOM's database. If the targets in
+the ``TargetList`` are also shared, but already exist in the destination TOM, they will be added to the new
+``TargetList``.
+
+
+
+
+
+

From af9284ef7cd07ae79713a7b246c5f1bed1b16af9 Mon Sep 17 00:00:00 2001
From: Joseph Chatelain <jchatelain@lco.global>
Date: Mon, 16 Oct 2023 16:57:01 -0700
Subject: [PATCH 37/37] some lint issues

---
 tom_dataproducts/views.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tom_dataproducts/views.py b/tom_dataproducts/views.py
index d8b38bc61..b4d7f7776 100644
--- a/tom_dataproducts/views.py
+++ b/tom_dataproducts/views.py
@@ -31,10 +31,8 @@
 from tom_observations.models import ObservationRecord
 from tom_observations.facility import get_service_class
 from tom_dataproducts.sharing import share_data_with_hermes, share_data_with_tom, sharing_feedback_handler
-from tom_dataproducts.serializers import DataProductSerializer
 import tom_dataproducts.forced_photometry.forced_photometry_service as fps
-
-import requests
+from tom_targets.models import Target
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)