Show state of a previous submission. Fixes ietf-tools#590

 - Legacy-Id: 2836

Author: emiliosanchez

ietf/submit/forms.py

@@ -6,8 +6,9 @@
 from django.conf import settings
 from django.template.loader import render_to_string
 
+from ietf.idtracker.models import InternetDraft
 from ietf.proceedings.models import Meeting
-from ietf.submit.models import IdSubmissionDetail
+from ietf.submit.models import IdSubmissionDetail, TempIdAuthors
 from ietf.submit.parsers.pdf_parser import PDFParser
 from ietf.submit.parsers.plain_parser import PlainParser
 from ietf.submit.parsers.ps_parser import PSParser
@@ -36,6 +37,7 @@ def __init__(self, *args, **kwargs):
         self.idnits_message = None
         self.shutdown = False
         self.draft = None
+        self.filesize = None
         self.read_dates()
 
     def read_dates(self):
@@ -85,6 +87,7 @@ def clean_txt(self):
         parsed_info = PlainParser(txt_file).critical_parse()
         if parsed_info.errors:
             raise forms.ValidationError(parsed_info.errors)
+        self.filesize=txt_file.size
         return txt_file
 
     def clean_pdf(self):
@@ -168,13 +171,57 @@ def check_idnits(self):
         self.idnits_message = p.stdout.read()
 
     def save_draft_info(self, draft):
+        document_id = 0
+        existing_draft = InternetDraft.objects.filter(filename=draft.filename)
+        if existing_draft:
+            document_id = existing_draft[0].id_document_tag
         detail = IdSubmissionDetail.objects.create(
             id_document_name=draft.get_title(),
             filename=draft.filename,
             revision=draft.revision,
             txt_page_count=draft.get_pagecount(),
+            filesize=self.filesize,
             creation_date=draft.get_creation_date(),
+            submission_date=datetime.date.today(),
             idnits_message=self.idnits_message,
+            temp_id_document_tag=document_id,
+            first_two_pages=''.join(draft.pages[:2]),
             status_id=1,  # Status 1 - upload
             )
+        order = 0
+        for author in draft.get_authors():
+            name, email = author.rsplit(' ', 1)
+            first_name, last_name = name.split(' ', 1)
+            email = email.replace('<', '').replace('>', '')
+            order += 1
+            TempIdAuthors.objects.create(
+                id_document_tag=document_id,
+                first_name=first_name,
+                last_name=last_name,
+                email_address=email,
+                author_order=order,
+                submission=detail)
         return detail
+
+
+class AutoPostForm(forms.Form):
+
+    first_name = forms.CharField(label=u'Given name', required=True)
+    last_name = forms.CharField(label=u'Last name', required=True)
+    email = forms.EmailField(label=u'Email address', required=True)
+
+    def __init__(self, *args, **kwargs):
+        self.draft = kwargs.pop('draft', None)
+        self.validation = kwargs.pop('validation', None)
+        super(AutoPostForm, self).__init__(*args, **kwargs)
+
+    def get_author_buttons(self):
+        button_template = '<input type="button" onclick="jQuery(\'#id_first_name\').val(\'%(first_name)s\');jQuery(\'#id_last_name\').val(\'%(last_name)s\');jQuery(\'#id_email\').val(\'%(email)s\');" value="%(full_name)s" />'
+        buttons = []
+        for i in self.validation.authors:
+            full_name = '%s. %s' % (i.first_name[0], i.last_name)
+            buttons.append(button_template % {'first_name': i.first_name,
+                                              'last_name': i.last_name,
+                                              'email': i.email()[1],
+                                              'full_name': full_name})
+        return ''.join(buttons)

ietf/submit/models.py

@@ -40,3 +40,20 @@ class IdSubmissionDetail(models.Model):
 
     class Meta:
         db_table = 'id_submission_detail'
+
+class TempIdAuthors(models.Model):
+    id = models.AutoField(primary_key=True)
+    id_document_tag = models.IntegerField()
+    first_name = models.CharField(blank=True, max_length=255)
+    last_name = models.CharField(blank=True, max_length=255)
+    email_address = models.CharField(blank=True, max_length=255)
+    last_modified_date = models.DateField(null=True, blank=True)
+    last_modified_time = models.CharField(blank=True, max_length=100)
+    author_order = models.IntegerField(null=True, blank=True)
+    submission = models.ForeignKey(IdSubmissionDetail)
+
+    class Meta:
+        db_table = 'temp_id_authors'
+
+    def email(self):
+        return ('%s %s' % (self.first_name, self.last_name), self.email_address)

ietf/submit/urls.py

@@ -5,6 +5,7 @@
     url(r'^$', 'submit_index', name='submit_index'),
     url(r'^status/$', 'submit_status', name='submit_status'),
     url(r'^status/(?P<submission_id>\d+)/$', 'draft_status', name='draft_status'),
+    url(r'^status/(?P<submission_id>\d+)/edit/$', 'draft_edit', name='draft_edit'),
 )
 
 urlpatterns += patterns('django.views.generic.simple',

ietf/submit/utils.py

@@ -1,7 +1,88 @@
 import re
 
-def check_idnits_success(idnits_message):
-    success_re = re.compile('\s+Summary:\s+0\s+|No nits found')
-    if success_re.search(idnits_message):
+from ietf.idtracker.models import InternetDraft, EmailAddress
+
+
+class DraftValidation(object):
+
+    def __init__(self, draft):
+        self.draft = draft
+        self.warnings = {}
+        self.passes_idnits = self.passes_idnits()
+        self.wg = self.get_working_group()
+        self.authors = self.get_authors()
+
+    def passes_idnits(self):
+        passes_idnits = self.check_idnits_success(self.draft.idnits_message)
+        return passes_idnits
+
+    def get_working_group(self):
+        filename = self.draft.filename
+        existing_draft = InternetDraft.objects.filter(filename=filename)
+        if existing_draft:
+            return existing_draft[0].group and existing_draft[0].group.ietfwg or None
+        else:
+            if filename.startswith('draft-ietf-'):
+                # Extra check for WG that contains dashes
+                for group in IETFWG.objects.filter(group_acronym__acronym__contains='-'):
+                    if filename.startswith('draft-ietf-%s-' % group.group_acronym.acronym):
+                        return group
+                group_acronym = filename.split('-')[2]
+                try:
+                    return IETFWG.objects.get(group_acronym__acronym=group_acronym)
+                except IETFWG.DoesNotExist:
+                    self.add_warning('group', 'Invalid WG ID: %s' % group_acronym)
+                    return None
+            else:
+                return None
+
+    def check_idnits_success(self, idnits_message):
+        success_re = re.compile('\s+Summary:\s+0\s+|No nits found')
+        if success_re.search(idnits_message):
+            return True
+        return False
+
+    def is_valid_attr(self, key):
+        if key in self.warnings.keys():
+            return False
         return True
-    return False
+
+    def is_valid(self):
+        self.validate_metadata()
+        return not bool(self.warnings.keys()) and self.passes_idnits
+
+    def validate_metadata(self):
+        self.validate_revision()
+        self.validate_authors()
+
+    def add_warning(self, key, value):
+        self.warnings.update({key: value})
+
+    def validate_revision(self):
+        revision = self.draft.revision
+        existing_revisions = [int(i.revision) for i in InternetDraft.objects.filter(filename=self.draft.filename)]
+        expected = 0
+        if existing_revisions:
+            expected = max(existing_revisions) + 1
+        if int(revision) != expected:
+            self.add_warning('revision', 'Invalid Version Number (Version %00d is expected)' % expected)
+
+    def validate_authors(self):
+        if not self.authors:
+            self.add_warning('authors', 'No authors found')
+
+    def get_authors(self):
+        tmpauthors = self.draft.tempidauthors_set.all().order_by('author_order')
+        authors = []
+        for i in tmpauthors:
+            person = None
+            for existing in EmailAddress.objects.filter(address=i.email_address):
+                try:
+                    person = existing.person_or_org
+                except PersonOrOrgInfo.DoesNotExist:
+                    pass
+            if not person:
+                authors.append(i)
+            else:
+                authors.append(person)
+        return authors

ietf/submit/views.py

@@ -6,8 +6,8 @@
 from django.template import RequestContext
 
 from ietf.submit.models import IdSubmissionDetail
-from ietf.submit.forms import UploadForm
-from ietf.submit.utils import check_idnits_success
+from ietf.submit.forms import UploadForm, AutoPostForm
+from ietf.submit.utils import DraftValidation
 
 
 def submit_index(request):
@@ -43,10 +43,24 @@ def submit_status(request):
 
 def draft_status(request, submission_id):
     detail = get_object_or_404(IdSubmissionDetail, submission_id=submission_id)
-    idnits_success = check_idnits_success(detail.idnits_message)
+    validation = DraftValidation(detail)
+    is_valid = validation.is_valid()
+    if request.method=='POST':
+        if request.POST.get('autopost', False):
+            auto_post_form = AutoPostForm(draft=detail, validation=validation, data=request.POST)
+        else:
+            return HttpResponseRedirect(reverse(draft_edit, None, kwargs={'submission_id': detail.submission_id}))
+    else:
+        auto_post_form = AutoPostForm(draft=detail, validation=validation)
     return render_to_response('submit/draft_status.html', 
                               {'selected': 'status',
                                'detail': detail,
-                               'idnits_success': idnits_success,
+                               'validation': validation,
+                               'auto_post_form': auto_post_form,
+                               'is_valid': is_valid,
                               },
                               context_instance=RequestContext(request))
+
+
+def draft_edit(request, submission_id):
+    pass