Refactor of MailToken to keep the lists of To and CC tokens with one object

 - Legacy-Id: 10036

Author: rjsparks

ietf/mailtoken/admin.py

@@ -12,6 +12,6 @@ def has_code(self, obj):
 
 class MailTokenAdmin(admin.ModelAdmin):
     list_display = [ 'slug', 'desc',  ]
-    filter_horizontal = [ 'recipients' ]
+    filter_horizontal = [ 'to', 'cc',  ]
 admin.site.register(MailToken, MailTokenAdmin)
 

ietf/mailtoken/migrations/0001_initial.py

@@ -35,8 +35,14 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='mailtoken',
-            name='recipients',
-            field=models.ManyToManyField(to='mailtoken.Recipient', null=True, blank=True),
+            name='cc',
+            field=models.ManyToManyField(related_name='used_in_cc', null=True, to='mailtoken.Recipient', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='mailtoken',
+            name='to',
+            field=models.ManyToManyField(related_name='used_in_to', null=True, to='mailtoken.Recipient', blank=True),
             preserve_default=True,
         ),
     ]

ietf/mailtoken/migrations/0002_auto_20150809_1314.py

@@ -8,7 +8,8 @@
 class MailToken(models.Model):
     slug = models.CharField(max_length=32, primary_key=True)
     desc = models.TextField(blank=True)
-    recipients = models.ManyToManyField('Recipient', null=True, blank=True)
+    to   = models.ManyToManyField('Recipient', null=True, blank=True, related_name='used_in_to')
+    cc   = models.ManyToManyField('Recipient', null=True, blank=True, related_name='used_in_cc')
 
     class Meta:
         ordering = ["slug"]

ietf/mailtoken/models.py

@@ -20,14 +20,16 @@ class Meta:
 api.mailtoken.register(RecipientResource())
 
 class MailTokenResource(ModelResource):
-    recipients      = ToManyField(RecipientResource, 'recipients', null=True)
+    to      = ToManyField(RecipientResource, 'to', null=True)
+    cc      = ToManyField(RecipientResource, 'cc', null=True)
     class Meta:
         queryset = MailToken.objects.all()
         #resource_name = 'mailtoken'
         filtering = { 
             "slug": ALL,
             "desc": ALL,
-            "recipients": ALL_WITH_RELATIONS,
+            "to": ALL_WITH_RELATIONS,
+            "cc": ALL_WITH_RELATIONS,
         }
 api.mailtoken.register(MailTokenResource())
 

ietf/mailtoken/resources.py

@@ -13,12 +13,12 @@ def test_show_tokens(self):
         url = urlreverse('ietf.mailtoken.views.show_tokens')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('ballot_saved_cc' in r.content)
+        self.assertTrue('ballot_saved' in r.content)
 
-        url = urlreverse('ietf.mailtoken.views.show_tokens',kwargs=dict(mailtoken_slug='ballot_saved_cc'))
+        url = urlreverse('ietf.mailtoken.views.show_tokens',kwargs=dict(mailtoken_slug='ballot_saved'))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('ballot_saved_cc' in r.content)
+        self.assertTrue('ballot_saved' in r.content)
 
     def test_show_recipients(self):
 

ietf/mailtoken/tests.py

@@ -1,20 +1,17 @@
-from django.core.exceptions import ObjectDoesNotExist
-
 from ietf.mailtoken.models import MailToken, Recipient
 
 def gather_address_list(slug,**kwargs):
 
     addrs = []
 
-    try:
-       mailtoken = MailToken.objects.get(slug=slug)
-    except ObjectDoesNotExist:
-       # TODO remove the raise here, or find a better way to detect runtime misconfiguration
-       raise
-       return addrs
-
-    for recipient in mailtoken.recipients.all():
-        addrs.extend(recipient.gather(**kwargs))
+    if slug.endswith('_cc'):
+        mailtoken = MailToken.objects.get(slug=slug[:-3])
+        for recipient in mailtoken.cc.all():
+            addrs.extend(recipient.gather(**kwargs))
+    else:
+        mailtoken = MailToken.objects.get(slug=slug)
+        for recipient in mailtoken.to.all():
+            addrs.extend(recipient.gather(**kwargs))
 
     return list(set([addr for addr in addrs if addr]))
 

ietf/mailtoken/utils.py

@@ -2,19 +2,21 @@
 
 from inspect import getsourcelines
 
-from django.shortcuts import render
+from django.shortcuts import render, get_object_or_404
 
 from ietf.mailtoken.models import MailToken, Recipient
 
 def show_tokens(request, mailtoken_slug=None):
     mailtokens = MailToken.objects.all()
     if mailtoken_slug:
-        mailtokens = mailtokens.filter(slug=mailtoken_slug) # TODO better 404 behavior here and below
+        get_object_or_404(MailToken,slug=mailtoken_slug)
+        mailtokens = mailtokens.filter(slug=mailtoken_slug) 
     return render(request,'mailtoken/token.html',{'mailtoken_slug':mailtoken_slug,
                                                   'mailtokens':mailtokens})
 def show_recipients(request, recipient_slug=None):
     recipients = Recipient.objects.all()
     if recipient_slug:
+        get_object_or_404(Recipient,slug=recipient_slug)
         recipients = recipients.filter(slug=recipient_slug)
     for recipient in recipients:
         fname = 'gather_%s'%recipient.slug