Port WG Delegate deletion with new test

 - Legacy-Id: 3383

Author: OleLaursen

ietf/utils/test_data.py

@@ -92,7 +92,23 @@ def make_test_data():
         group=group,
         email=wgchair,
         )
-    
+
+    # group delegate
+    u = User.objects.create(username="wgdelegate")
+    p = Person.objects.create(
+        name="WG Delegate",
+        ascii="WG Delegate",
+        user=u
+        )
+    email = Email.objects.create(
+        address="wgdelegate@ietf.org",
+        person=p)
+    Role.objects.create(
+        name_id="delegate",
+        group=group,
+        email=email,
+        )
+
     # secretary
     u = User.objects.create(username="secretary")
     p = Person.objects.create(

ietf/wgchairs/models.py

@@ -1,6 +1,7 @@
 import datetime
 
 from django.db import models
+from django.conf import settings
 
 from ietf.idtracker.models import (IETFWG, PersonOrOrgInfo,
                                    InternetDraft)
@@ -11,15 +12,14 @@ class WGDelegate(models.Model):
         PersonOrOrgInfo,
         )
 
-    wg = models.ForeignKey(IETFWG)
+    wg = models.ForeignKey(IETFWG, related_name="old_wgdelegate_set" if settings.USE_DB_REDESIGN_PROXY_CLASSES else None)
 
     def __unicode__(self):
         return "%s" % self.person
 
     class Meta:
         verbose_name = "WG Delegate"
 
-
 class ProtoWriteUp(models.Model):
     person = models.ForeignKey(
         PersonOrOrgInfo,
@@ -43,3 +43,35 @@ class ProtoWriteUp(models.Model):
         blank=False,
         null=False,
         )
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    from redesign.group.models import Role
+    class WGDelegateProxy(Role):
+        #person = models.ForeignKey(PersonOrOrgInfo)
+        @property
+        def person(self):
+            return self.email.person
+        #wg = models.ForeignKey(IETFWG)
+        @property
+        def wg(self):
+            return self.group
+
+        def __unicode__(self):
+            return u"%s" % self.person
+
+        class Meta:
+            proxy = True
+
+    from redesign.doc.models import DocEvent
+    class ProtoWriteUpProxy(DocEvent):
+        #person = models.ForeignKey(PersonOrOrgInfo, blank=False, null=False)
+        #draft = models.ForeignKey(InternetDraft, blank=False, null=False)
+        #date = models.DateTimeField(default=datetime.datetime.now(), blank=False, null=False)
+        #writeup = models.TextField(blank=False, null=False)
+        class Meta:
+            proxy = True
+
+    #WGDelegateOld = WGDelegate
+    WGDelegate = WGDelegateProxy
+    ProtoWriteUpOld = ProtoWriteUp
+    ProtoWriteUp = ProtoWriteUpProxy

ietf/wgchairs/tests.py

@@ -0,0 +1,51 @@
+import datetime, os, shutil
+
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse as urlreverse
+import django.test
+from StringIO import StringIO
+from pyquery import PyQuery
+
+from ietf.utils.test_utils import login_testing_unauthorized
+from ietf.utils.test_runner import mail_outbox
+from ietf.utils.test_data import make_test_data
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    from redesign.person.models import Person, Email
+    from redesign.group.models import Group, Role
+        
+class ManageDelegatesTestCase(django.test.TestCase):
+    fixtures = ['names']
+
+    def test_delete_delegate(self):
+        make_test_data()
+
+        url = urlreverse('manage_delegates', kwargs=dict(acronym="mars"))
+        login_testing_unauthorized(self, "secretary", url)
+        
+        delegates = Role.objects.filter(name="delegate", group__acronym="mars")
+        self.assertTrue(len(delegates) > 0)
+        
+        # get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEquals(len(q('form input[name=delete]')), len(delegates))
+
+        # delete
+        r = self.client.post(url,
+                             dict(remove="1",
+                                  delete=[d.pk for d in delegates]))
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEquals(len(q('form input[name=delete]')), 0)
+        self.assertEquals(Role.objects.filter(name="delegate", group__acronym="mars").count(), 0)
+        
+        
+        
+        
+        
+if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    # the above tests only work with the new schema
+    del ManageDelegatesTestCase 

redesign/group/proxy.py

@@ -209,6 +209,10 @@ class Dummy: pass
         d = Dummy()
         d.all = self.chairs()
         return d
+    @property
+    def wgdelegate_set(self):
+        from ietf.wgchairs.models import WGDelegate
+        return WGDelegate.objects.filter(group=self, name="delegate")
 
     class Meta:
         proxy = True