refactor: move ResolvedMaterial to blobdb app

ietf/blobdb/admin.py

@@ -3,7 +3,7 @@
 from django.db.models.functions import Length
 from rangefilter.filters import DateRangeQuickSelectListFilterBuilder
 
-from .models import Blob
+from .models import Blob, ResolvedMaterial
 
 
 @admin.register(Blob)
@@ -29,3 +29,12 @@ def get_queryset(self, request):
     def object_size(self, instance):
         """Get the size of the object"""
         return instance.object_size  # annotation added in get_queryset()
+
+
+@admin.register(ResolvedMaterial)
+class ResolvedMaterialAdmin(admin.ModelAdmin):
+    model = ResolvedMaterial
+    list_display = ["name", "meeting_number", "bucket", "blob"]
+    list_filter = ["meeting_number", "bucket"]
+    search_fields = ["name", "blob"]
+    ordering = ["name"]

ietf/meeting/migrations/0017_resolvedmaterial_and_more.py → ietf/blobdb/migrations/0002_resolvedmaterial.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("meeting", "0016_alter_meeting_country_alter_meeting_time_zone"),
+        ("blobdb", "0001_initial"),
     ]
 
     operations = [

ietf/blobdb/models.py

@@ -96,3 +96,23 @@ def _emit_blob_change_event(self, using=None):
             ),
             using=using,
         )
+
+
+class ResolvedMaterial(models.Model):
+    # A Document name can be 255 characters; allow this name to be a bit longer
+    name = models.CharField(max_length=300, help_text="Name to resolve")
+    meeting_number = models.CharField(
+        max_length=64, help_text="Meeting material is related to"
+    )
+    bucket = models.CharField(max_length=255, help_text="Resolved bucket name")
+    blob = models.CharField(max_length=300, help_text="Resolved blob name")
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["name", "meeting_number"], name="unique_name_per_meeting"
+            )
+        ]
+
+    def __str__(self):
+        return f"{self.name}@{self.meeting_number} -> {self.bucket}:{self.blob}"

ietf/meeting/admin.py

@@ -9,7 +9,7 @@
     SchedTimeSessAssignment, ResourceAssociation, FloorPlan, UrlResource,
     SessionPresentation, ImportantDate, SlideSubmission, SchedulingEvent, BusinessConstraint,
     ProceedingsMaterial, MeetingHost, Registration, RegistrationTicket,
-    AttendanceTypeName, ResolvedMaterial)
+    AttendanceTypeName)
 
 
 class UrlResourceAdmin(admin.ModelAdmin):
@@ -288,13 +288,3 @@ def display_meeting(self, instance):
     display_meeting.short_description = "Meeting"  # type: ignore # https://github.com/python/mypy/issues/2087
 
 admin.site.register(RegistrationTicket, RegistrationTicketAdmin)
-
-
-class ResolvedMaterialAdmin(admin.ModelAdmin):
-    model = ResolvedMaterial
-    list_display = ["name", "meeting_number", "bucket", "blob"]
-    list_filter = ["meeting_number", "bucket"]
-    search_fields = ["name", "blob"]
-    ordering = ["name"]
-
-admin.site.register(ResolvedMaterial, ResolvedMaterialAdmin)

ietf/meeting/models.py

@@ -957,26 +957,6 @@ def __str__(self):
         return u"%s -> %s-%s" % (self.session, self.document.name, self.rev)
 
 
-class ResolvedMaterial(models.Model):
-    # A Document name can be 255 characters; allow this name to be a bit longer
-    name = models.CharField(max_length=300, help_text="Name to resolve")
-    meeting_number = models.CharField(
-        max_length=64, help_text="Meeting material is related to"
-    )
-    bucket = models.CharField(max_length=255, help_text="Resolved bucket name")
-    blob = models.CharField(max_length=300, help_text="Resolved blob name")
-
-    class Meta:
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "meeting_number"], name="unique_name_per_meeting"
-            )
-        ]
-
-    def __str__(self):
-        return f"{self.name}@{self.meeting_number} -> {self.bucket}:{self.blob}"
-
-
 constraint_cache_uses = 0
 constraint_cache_initials = 0
 

ietf/meeting/resources.py

@@ -19,7 +19,7 @@
                                  SchedulingEvent,
                                  BusinessConstraint, ProceedingsMaterial, MeetingHost,
                                  Attended,
-                                 Registration, RegistrationTicket, ResolvedMaterial)
+                                 Registration, RegistrationTicket)
 
 from ietf.name.resources import MeetingTypeNameResource
 class MeetingResource(ModelResource):
@@ -476,20 +476,3 @@ class Meta:
             "registration": ALL_WITH_RELATIONS,
         }
 api.meeting.register(RegistrationTicketResource())
-
-
-class ResolvedMaterialResource(ModelResource):
-    class Meta:
-        queryset = ResolvedMaterial.objects.all()
-        serializer = api.Serializer()
-        cache = SimpleCache()
-        #resource_name = 'resolvedmaterial'
-        ordering = ['id', ]
-        filtering = { 
-            "id": ALL,
-            "name": ALL,
-            "meeting_number": ALL,
-            "bucket": ALL,
-            "blob": ALL,
-        }
-api.meeting.register(ResolvedMaterialResource())

ietf/meeting/utils.py

@@ -41,8 +41,8 @@
     Registration,
     Meeting,
     RegistrationTicket,
-    ResolvedMaterial,
 )
+from ietf.blobdb.models import ResolvedMaterial
 from ietf.doc.models import (
     Document,
     State,

ietf/meeting/views.py

@@ -71,7 +71,8 @@
 from ietf.ietfauth.utils import role_required, has_role, user_is_person
 from ietf.mailtrigger.utils import gather_address_lists
 from ietf.meeting.models import Meeting, Session, Schedule, FloorPlan, \
-    SessionPresentation, TimeSlot, SlideSubmission, Attended, ResolvedMaterial
+    SessionPresentation, TimeSlot, SlideSubmission, Attended
+from ..blobdb.models import ResolvedMaterial
 from ietf.meeting.models import ImportantDate, SessionStatusName, SchedulingEvent, SchedTimeSessAssignment, Room, TimeSlotTypeName
 from ietf.meeting.models import Registration
 from ietf.meeting.forms import ( CustomDurationField, SwapDaysForm, SwapTimeslotsForm, ImportMinutesForm,