Port and proxy liaison views to new schema and add a bunch of tests

 - Legacy-Id: 3350

Author: OleLaursen

ietf/liaisons/accountsREDESIGN.py

@@ -1,14 +1,14 @@
 from redesign.person.models import Person
 from redesign.group.models import Role
-
+from ietf.liaisons.proxy import proxy_personify_role
 
 LIAISON_EDIT_GROUPS = ['Secretariat'] # this is not working anymore, refers to old auth model
 
 
 def get_ietf_chair():
     try:
-        return Person.objects.get(email__role__name="chair", email__role__group__acronym="ietf")
-    except Person.DoesNotExist:
+        return proxy_personify_role(Role.objects.get(name="chair", group__acronym="ietf"))
+    except Role.DoesNotExist:
         return None
 
 
@@ -18,14 +18,14 @@ def get_iesg_chair():
 
 def get_iab_chair():
     try:
-        return Person.objects.get(email__role__name="chair", email__role__group__acronym="iab")
-    except Person.DoesNotExist:
+        return proxy_personify_role(Role.objects.get(name="chair", group__acronym="iab"))
+    except Role.DoesNotExist:
         return None
 
 
 def get_iab_executive_director():
     try:
-        return Person.objects.get(email__role__name="execdir", email__role__group__acronym="iab")
+        return proxy_personify_role(Role.objects.get(name="execdir", group__acronym="iab"))
     except Person.DoesNotExist:
         return None
 

ietf/liaisons/feeds.py

@@ -1,5 +1,6 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
+from django.conf import settings
 from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed
 from django.db.models import Q
@@ -8,6 +9,9 @@
 from datetime import datetime, time
 import re
 
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    from ietf.liaisons.proxy import LiaisonDetailProxy as LiaisonDetail
+
 # A slightly funny feed class, the 'object' is really
 # just a dict with some parameters that items() uses
 # to construct a queryset.
@@ -24,6 +28,15 @@ def get_object(self, bits):
 	if bits[0] == 'from':
 	    if len(bits) != 2:
 		raise FeedDoesNotExist
+            if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+                from redesign.group.models import Group
+                try:
+                    group = Group.objects.get(acronym=bits[1])
+                    obj['filter'] = { 'from_group': group }
+                    obj['title'] = u'Liaison Statements from %s' % group.name
+                    return obj
+                except Group.DoesNotExist:
+                    raise FeedDoesNotExist
 	    try:
 		acronym = Acronym.objects.get(acronym=bits[1])
 		obj['filter'] = {'from_id': acronym.acronym_id}
@@ -49,16 +62,22 @@ def get_object(self, bits):
 	if bits[0] == 'to':
 	    if len(bits) != 2:
 		raise FeedDoesNotExist
-	    # The schema uses two different fields for the same
-	    # basic purpose, depending on whether it's a Secretariat-submitted
-	    # or Liaison-tool-submitted document.
-	    obj['q'] = [ (Q(by_secretariat=0) & Q(to_body__icontains=bits[1])) | (Q(by_secretariat=1) & Q(submitter_name__icontains=bits[1])) ]
+            if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+                obj['filter'] = dict(to_name__icontains=bits[1])
+            else:
+                # The schema uses two different fields for the same
+                # basic purpose, depending on whether it's a Secretariat-submitted
+                # or Liaison-tool-submitted document.
+                obj['q'] = [ (Q(by_secretariat=0) & Q(to_body__icontains=bits[1])) | (Q(by_secretariat=1) & Q(submitter_name__icontains=bits[1])) ]
 	    obj['title'] = 'Liaison Statements where to matches %s' % bits[1]
 	    return obj
 	if bits[0] == 'subject':
 	    if len(bits) != 2:
 		raise FeedDoesNotExist
-	    obj['q'] = [ Q(title__icontains=bits[1]) | Q(uploads__file_title__icontains=bits[1]) ]
+            if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+                obj['q'] = [ Q(title__icontains=bits[1]) | Q(attachments__title__icontains=bits[1]) ]
+            else:
+                obj['q'] = [ Q(title__icontains=bits[1]) | Q(uploads__file_title__icontains=bits[1]) ]
 	    obj['title'] = 'Liaison Statements where subject matches %s' % bits[1]
 	    return obj
 	raise FeedDoesNotExist

ietf/liaisons/formsREDESIGN.py

@@ -1,4 +1,4 @@
-import datetime
+import datetime, os
 from email.utils import parseaddr
 
 from django import forms
@@ -14,11 +14,14 @@
 from ietf.liaisons.widgets import (FromWidget, ReadOnlyWidget, ButtonWidget,
                                    ShowAttachmentsWidget, RelatedLiaisonWidget)
 from ietf.liaisons.models import LiaisonStatement, LiaisonStatementPurposeName
+from ietf.liaisons.proxy import LiaisonDetailProxy
 from redesign.group.models import Group
 from redesign.person.models import Person
+from redesign.doc.models import Document
 
 
 class LiaisonForm(forms.Form):
+    person = forms.ModelChoiceField(Person.objects.all())
     from_field = forms.ChoiceField(widget=FromWidget, label=u'From')
     replyto = forms.CharField(label=u'Reply to')
     organization = forms.ChoiceField()
@@ -64,15 +67,16 @@ def __init__(self, user, *args, **kwargs):
         self.fake_person = None
         self.person = get_person_for_user(user)
         if kwargs.get('data', None):
-            kwargs['data'].update({'person': self.person.pk})
             if is_secretariat(self.user) and 'from_fake_user' in kwargs['data'].keys():
                 self.fake_person = Person.objects.get(pk=kwargs['data']['from_fake_user'])
                 kwargs['data'].update({'person': self.fake_person.pk})
+            else:
+                kwargs['data'].update({'person': self.person.pk})
 
         self.instance = kwargs.pop("instance", None)
 
         super(LiaisonForm, self).__init__(*args, **kwargs)
-
+        
         # now copy in values from instance, like a ModelForm
         if self.instance:
             for name, field in self.fields.iteritems():
@@ -120,8 +124,7 @@ def set_from_field(self):
         assert NotImplemented
 
     def set_replyto_field(self):
-        email = self.person.email_address()
-        self.fields['replyto'].initial = email
+        self.fields['replyto'].initial = self.person.email()[1]
 
     def set_organization_field(self):
         assert NotImplemented
@@ -193,7 +196,7 @@ def get_to_entity(self):
         return self.hm.get_entity_by_key(organization_key)
 
     def get_poc(self, organization):
-        return ', '.join([i.email_address() for i in organization.get_poc()])
+        return ', '.join(u"%s <%s>" % i.email() for i in organization.get_poc())
 
     def clean_cc1(self):
         value = self.cleaned_data.get('cc1', '')
@@ -223,7 +226,7 @@ def get_cc(self, from_entity, to_entity):
     def save(self, *args, **kwargs):
         l = self.instance
         if not l:
-            l = LiaisonStatement()
+            l = LiaisonDetailProxy()
 
         l.title = self.cleaned_data["title"]
         l.purpose = LiaisonStatementPurposeName.objects.get(order=self.cleaned_data["purpose"])
@@ -238,35 +241,31 @@ def save(self, *args, **kwargs):
 
         l.modified = now
         l.submitted = datetime.datetime.combine(self.cleaned_data["submitted_date"], now.time())
-        if self.cleaned_data.get("approval"): # FIXME
-            if not l.approved:
-                l.approved = now
+        if not l.approved:
+            l.approved = now
 
         self.save_extra_fields(l)
+        
         l.save() # we have to save here to make sure we get an id for the attachments
         self.save_attachments(l)
 
         return l
 
     def save_extra_fields(self, liaison):
         from_entity = self.get_from_entity()
-        print from_entity, type(from_entity)
-        print self.cleaned_data.get("from_field")
-        liason.from_name = from_entity.name
-        print from_entity.obj # FIXME? c.get("from_field")
-        liason.from_group = from_entity.obj
-        liason.from_contact = self.person # FIXME?
+        liaison.from_name = from_entity.name
+        liaison.from_group = from_entity.obj
+        liaison.from_contact = self.cleaned_data["person"].email_address()
 
         organization = self.get_to_entity()
-        liason.to_name = organization.name
-        print organization.obj # FIXME? self.cleaned_data.get('organization')
-        liason.to_group = organization.obj
-        liason.to_contact = self.get_poc(organization)
-        
+        liaison.to_name = organization.name
+        liaison.to_group = organization.obj
+        liaison.to_contact = self.get_poc(organization)
+
         liaison.cc = self.get_cc(from_entity, organization)
 
     def save_attachments(self, instance):
-        return # FIXME
+        written = instance.attachments.all().count()
         for key in self.files.keys():
             title_key = key.replace('file', 'title')
             if not key.startswith('attach_file_') or not title_key in self.data.keys():
@@ -277,13 +276,16 @@ def save_attachments(self, instance):
                 extension = '.' + extension[1]
             else:
                 extension = ''
-            attach = Uploads.objects.create(
-                file_title = self.data.get(title_key),
-                person = self.person,
-                detail = instance,
-                file_extension = extension,
+            written += 1
+            name = instance.name() + ("-attachment-%s" % written)
+            attach = Document.objects.create(
+                title = self.data.get(title_key),
+                type_id = "liaison",
+                name = name,
+                external_url = name + extension, # strictly speaking not necessary, but just for the time being ...
                 )
-            attach_file = open('%sfile%s%s' % (settings.LIAISON_ATTACH_PATH, attach.pk, attach.file_extension), 'w')
+            instance.attachments.add(attach)
+            attach_file = open(os.path.join(settings.LIAISON_ATTACH_PATH, attach.name + extension), 'w')
             attach_file.write(attached_file.read())
             attach_file.close()
 
@@ -380,21 +382,13 @@ def get_poc(self, organization):
         return self.cleaned_data['to_poc']
 
     def save_extra_fields(self, liaison):
-        raise NotImplemented
         super(OutgoingLiaisonForm, self).save_extra_fields(liaison)
         from_entity = self.get_from_entity()
         needs_approval = from_entity.needs_approval(self.person)
         if not needs_approval or self.cleaned_data.get('approved', False):
-            approved = True
-            approval_date = datetime.datetime.now()
+            liaison.approved = datetime.datetime.now()
         else:
-            approved = False
-            approval_date = None
-        approval = OutgoingLiaisonApproval.objects.create(
-            approved = approved,
-            approval_date = approval_date)
-        liaison.approval = approval
-        liaison.save()
+            liaison.approved = None
 
     def clean_to_poc(self):
         value = self.cleaned_data.get('to_poc', None)

ietf/liaisons/mails.py

@@ -0,0 +1,59 @@
+from django.conf import settings
+from django.template.loader import render_to_string
+from django.core.urlresolvers import reverse as urlreverse
+
+from ietf.liaisons.mail import IETFEmailMessage
+
+def send_liaison_by_email(liaison, fake=False):
+    if not liaison.is_pending(): # this conditional should definitely be at the caller, not here
+        return notify_pending_by_email(liaison, fake)
+
+    subject = u'New Liaison Statement, "%s"' % (liaison.title)
+    from_email = settings.LIAISON_UNIVERSAL_FROM
+    to_email = liaison.to_poc.split(',')
+    cc = liaison.cc1.split(',')
+    if liaison.technical_contact:
+        cc += liaison.technical_contact.split(',')
+    if liaison.response_contact:
+        cc += liaison.response_contact.split(',')
+    bcc = ['statements@ietf.org']
+    body = render_to_string('liaisons/liaison_mail.txt',
+                            {'liaison': liaison,
+                             'url': settings.IDTRACKER_BASE_URL + urlreverse("liaison_detail", kwargs=dict(object_id=liaison.pk))
+                            })
+    mail = IETFEmailMessage(subject=subject,
+                            to=to_email,
+                            from_email=from_email,
+                            cc = cc,
+                            bcc = bcc,
+                            body = body)
+    # rather than this fake stuff, it's probably better to start a
+    # debug SMTP server as explained in the Django docs
+    if not fake:
+        mail.send()         
+    return mail                                                     
+
+def notify_pending_by_email(liaison, fake):
+    from ietf.liaisons.utils import IETFHM
+
+    from_entity = IETFHM.get_entity_by_key(liaison.from_raw_code)
+    if not from_entity:
+        return None
+    to_email = []
+    for person in from_entity.can_approve():
+        to_email.append('%s <%s>' % person.email())
+    subject = u'New Liaison Statement, "%s" needs your approval' % (liaison.title)
+    from_email = settings.LIAISON_UNIVERSAL_FROM
+    body = render_to_string('liaisons/pending_liaison_mail.txt',
+                            {'liaison': liaison,
+                             'url': settings.IDTRACKER_BASE_URL + urlreverse("liaison_detail", kwargs=dict(object_id=liaison.pk)),
+                             'approve_url': settings.IDTRACKER_BASE_URL + urlreverse("liaison_approval_detail", kwargs=dict(object_id=liaison.pk))
+                            })
+    mail = IETFEmailMessage(subject=subject,
+                            to=to_email,
+                            from_email=from_email,
+                            body = body)
+    if not fake:
+        mail.send()         
+    return mail                                                     
+

ietf/liaisons/models.py

@@ -5,6 +5,7 @@
 from django.db import models
 from django.template.loader import render_to_string
 from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse as urlreverse
 from ietf.idtracker.models import Acronym, PersonOrOrgInfo, Area, IESGLogin
 from ietf.liaisons.mail import IETFEmailMessage
 from ietf.ietfauth.models import LegacyLiaisonUser
@@ -143,6 +144,7 @@ def notify_pending_by_email(self, fake):
         from_email = settings.LIAISON_UNIVERSAL_FROM
         body = render_to_string('liaisons/pending_liaison_mail.txt',
                                 {'liaison': self,
+                                 'url': settings.IDTRACKER_BASE_URL + urlreverse("liaison_detail", kwargs=dict(object_id=liaison.pk))
                                 })
         mail = IETFEmailMessage(subject=subject,
                                 to=to_email,
@@ -166,6 +168,8 @@ def send_by_email(self, fake=False):
         bcc = ['statements@ietf.org']
         body = render_to_string('liaisons/liaison_mail.txt',
                                 {'liaison': self,
+                                 'url': settings.IDTRACKER_BASE_URL + urlreverse("liaison_detail", kwargs=dict(object_id=liaison.pk)),
+                                 'approve_url': settings.IDTRACKER_BASE_URL + urlreverse("liaison_approval_detail", kwargs=dict(object_id=liaison.pk))
                                 })
         mail = IETFEmailMessage(subject=subject,
                                 to=to_email,
@@ -289,6 +293,8 @@ class Uploads(models.Model):
     detail = models.ForeignKey(LiaisonDetail)
     def __str__(self):
 	return self.file_title
+    def filename(self):
+        return "file%s%s" % (self.file_id, self.file_extension)
     class Meta:
         db_table = 'uploads'
 
@@ -320,12 +326,12 @@ class LiaisonStatement(models.Model):
 
         related_to = models.ForeignKey('LiaisonStatement', blank=True, null=True)
 
-        from_group = models.ForeignKey(Group, related_name="liaisonstatement_from_set", null=True, blank=True, help_text="From body, if it exists")
+        from_group = models.ForeignKey(Group, related_name="liaisonstatement_from_set", null=True, blank=True, help_text="Sender group, if it exists")
         from_name = models.CharField(max_length=255, help_text="Name of the sender body")
         from_contact = models.ForeignKey(Email, blank=True, null=True)
-        to_group = models.ForeignKey(Group, related_name="liaisonstatement_to_set", null=True, blank=True, help_text="To body, if it exists")
+        to_group = models.ForeignKey(Group, related_name="liaisonstatement_to_set", null=True, blank=True, help_text="Recipient group, if it exists")
         to_name = models.CharField(max_length=255, help_text="Name of the recipient body")
-        to_contact = models.CharField(blank=True, max_length=255, help_text="Contacts at to body")
+        to_contact = models.CharField(blank=True, max_length=255, help_text="Contacts at recipient body")
 
         reply_to = models.CharField(blank=True, max_length=255)