Merge pull request #466 from TNRIS/lh/deprecation

Deprecate  Datahub Orders. Therefore change 'new orders' to just 'ord…

Author: L-Har

src/data_hub/contact/admin.py

@@ -12,7 +12,6 @@
     Campaign,
     CampaignSubscriber,
     DataHubContact,
-    DataHubOrder,
     OrderType,
     OrderDetailsType,
     DataHubOutsideEntityContact,
@@ -301,28 +300,6 @@ def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
     def response_change(self, request, obj):
         return redirect('/admin/contact/orderdetailstype/' + str(obj.id) + '/change/')
-@admin.register(DataHubOrder)
-class DataHubOrderAdmin(admin.ModelAdmin, ExportSelectedToCsvMixin):
-    model = DataHubOrder
-    actions = ["export_selected_to_csv"]
-    list_display = (
-        'name',
-        'email',
-        'phone',
-        'address',
-        'organization',
-        'industry',
-        'harddrive',
-        'delivery',
-        'payment',
-        'created'
-    )
-    ordering = ('-created',)
-
-    def get_readonly_fields(self, request, obj=None):
-        if obj:
-            self.readonly_fields = [field.name for field in obj.__class__._meta.fields]
-        return self.readonly_fields
 
 
 @admin.register(DataHubOutsideEntityContact)

src/data_hub/contact/migrations/0056_delete_datahuborder_alter_ordertype_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.15 on 2025-08-05 12:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contact', '0055_alter_emailtemplate_serializer_classname'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='DataHubOrder',
+        ),
+        migrations.AlterModelOptions(
+            name='ordertype',
+            options={'verbose_name': 'DataHub Order', 'verbose_name_plural': 'DataHub Orders'},
+        ),
+    ]

src/data_hub/contact/models.py

@@ -59,8 +59,8 @@ class OrderType(models.Model):
 
     class Meta:
         db_table = 'order_type'
-        verbose_name = 'DataHub New Order'
-        verbose_name_plural = 'DataHub New Orders'  
+        verbose_name = 'DataHub Order'
+        verbose_name_plural = 'DataHub Orders'  
         constraints = [
             models.CheckConstraint(
                 name="%(app_label)s_%(class)s_order_approved_constraint",
@@ -334,99 +334,6 @@ class Meta:
     def __str__(self):
         return self.name + " " + self.created.strftime('%Y-%m-%d %H:%M')
 
-class DataHubOrder(models.Model):
-    """
-    DataHub order cart form on data.tnris.org (Dataset Order)
-    https://data.tnris.org/cart/
-    """
-
-    class Meta:
-        db_table = 'contact_datahub_order'
-        verbose_name = 'DataHub Order'
-        verbose_name_plural = 'DataHub Orders'
-
-    datahub_order_id = models.UUIDField(
-        'DataHub Order ID',
-        primary_key=True,
-        default=uuid.uuid4,
-        editable=False
-    )
-    name = models.CharField(
-        'Name',
-        max_length=150,
-        null=True,
-        blank=True
-    )
-    email = models.CharField(
-        'Email',
-        max_length=150,
-        null=True,
-        blank=True
-    )
-    phone = models.CharField(
-        'Phone',
-        max_length=20,
-        null=True,
-        blank=True
-    )
-    address = models.CharField(
-        'Address',
-        max_length=250,
-        null=True,
-        blank=True
-    )
-    organization = models.CharField(
-        'Organization',
-        max_length=60,
-        null=True,
-        blank=True
-    )
-    industry = models.CharField(
-        'Industry',
-        max_length=50,
-        null=True,
-        blank=True
-    )
-    harddrive = models.CharField(
-        'Hard Drive',
-        max_length=50,
-        null=True,
-        blank=True
-    )
-    delivery = models.CharField(
-        'Delivery Method',
-        max_length=50,
-        null=True,
-        blank=True
-    )
-    payment = models.CharField(
-        'Payment',
-        max_length=50,
-        null=True,
-        blank=True
-    )
-    notes = models.TextField(
-        'Notes',
-        null=True,
-        blank=True
-    )
-    order = models.TextField(
-        'Order',
-        null=True,
-        blank=True
-    )
-    created = models.DateTimeField(
-        'Created',
-        auto_now_add=True
-    )
-    last_modified = models.DateTimeField(
-        'Last Modified',
-        auto_now=True
-    )
-
-    def __str__(self):
-        return self.name + " " + self.created.strftime('%Y-%m-%d %H:%M')
-
 class DataHubOutsideEntityContact(models.Model):
     """
     DataHub contact form on data.tnris.org outside entity cards (Outside Entity Data Inquiry)

src/data_hub/contact/serializers.py

@@ -4,7 +4,6 @@
     Campaign,
     CampaignSubscriber,
     DataHubContact,
-    DataHubOrder,
     DataHubOutsideEntityContact,
     EducationContact,
     ForumJobBoardSubmission,
@@ -27,12 +26,6 @@ class Meta:
         fields = ('__all__')
 
 
-class DataHubOrderSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = DataHubOrder
-        fields = ('__all__')
-
-
 class DataHubOutsideEntityContactSerializer(serializers.ModelSerializer):
     class Meta:
         model = DataHubOutsideEntityContact

src/data_hub/contact/viewsets.py

@@ -20,7 +20,6 @@
 from .models import CampaignSubscriber, SurveyTemplate
 from .serializers import (
     SurveyTemplateSerializer,
-    DataHubOrderSerializer,
     CampaignSubscriberSerializer)
 
 logger = logging.getLogger("errLog")
@@ -467,23 +466,10 @@ class DataHubOrdersViewSet(viewsets.ReadOnlyModelViewSet):
     Retrieve TxGIO DataHub Order submissions
     """
     permission_classes = (IsAuthenticated,)
-    serializer_class = DataHubOrderSerializer
     http_method_names = ['get']
 
-    def get_queryset(self):
-        args = {}
-        null_list = ['null', 'Null', 'none', 'None']
-        # create argument object of query clauses
-        for field in self.request.query_params.keys():
-            if field != 'limit' and field != 'offset':
-                value = self.request.query_params.get(field)
-                # convert null queries
-                if value in null_list:
-                    value = None
-                args[field] = value
-        # get records using query
-        queryset = DataHubOrder.objects.filter(**args)
-        return queryset
+    def get(self):
+        return Response("Endpoint deprecated", status=status.HTTP_410_GONE)
 
 # Campaigns rw endpoint
 class SubmitCampaignSubscriptionViewSet(viewsets.GenericViewSet, mixins.CreateModelMixin):