Import remaining RfcIndex attributes, import IDAuthor, bug fixes

 - Legacy-Id: 2738

Author: OleLaursen

ietf/idrfc/idrfc_wrapper.py

@@ -87,7 +87,7 @@ class IdWrapper:
 
     def __init__(self, draft):
         self.id = self
-        if isinstance(draft, IDInternal):
+        if isinstance(draft, IDInternal) and not settings.USE_DB_REDESIGN_PROXY_CLASSES:
             self._idinternal = draft
             self._draft = self._idinternal.draft
         else:
@@ -261,10 +261,16 @@ def __init__(self, rfcindex, rfc=None, idinternal=None):
         self.rfc = self
 
         if not self._idinternal:
-            try:
-                self._idinternal = IDInternal.objects.get(rfc_flag=1, draft=self._rfcindex.rfc_number)
-            except IDInternal.DoesNotExist:
-                pass
+            if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+                pub = rfcindex.latest_event(type="published_rfc")
+                started = rfcindex.latest_event(type="started_iesg_process")
+                if pub and started and pub.time < started.time:
+                    self._idinternal = rfcindex
+            else:
+                try:
+                    self._idinternal = IDInternal.objects.get(rfc_flag=1, draft=self._rfcindex.rfc_number)
+                except IDInternal.DoesNotExist:
+                    pass
 
         if self._idinternal:
             self.ietf_process = IetfProcessData(self._idinternal)
@@ -275,7 +281,10 @@ def __init__(self, rfcindex, rfc=None, idinternal=None):
         self.maturity_level = self._rfcindex.current_status
         if not self.maturity_level:
             self.maturity_level = "Unknown"
-            
+
+        if settings.USE_DB_REDESIGN_PROXY_CLASSES and rfcindex.filename.startswith('rfc'):
+            return # we've already done the lookup while importing so skip the rest
+
         ids = InternetDraft.objects.filter(rfc_number=self.rfc_number)
         if len(ids) >= 1:
             self.draft_name = ids[0].filename
@@ -658,7 +667,6 @@ def _init(self):
                              position="No Record",
                              )
                     positions.append(d)
-                
         self._positions = positions
 
     def old_init(self):

ietf/idrfc/views_doc.py

@@ -199,7 +199,7 @@ def _get_history(doc, versions):
                 results.insert(0, v)    
     if doc.is_id_wrapper and doc.draft_status == "Expired" and doc._draft.expiration_date:
         results.append({'is_text':True, 'date':doc._draft.expiration_date, 'text':'Draft expired'})
-    if doc.is_rfc_wrapper:
+    if not settings.USE_DB_REDESIGN_PROXY_CLASSES and doc.is_rfc_wrapper:
         if doc.draft_name:
             text = 'RFC Published (see <a href="/doc/%s/">%s</a> for earlier history)' % (doc.draft_name,doc.draft_name)
         else:

ietf/idtracker/admin.py

@@ -8,7 +8,6 @@ class AcronymAdmin(admin.ModelAdmin):
         list_display=('acronym', 'name')
     admin.site.register(Acronym, AcronymAdmin)
 
-if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
     class AreaAdmin(admin.ModelAdmin):
         list_display=('area_acronym', 'status')
     admin.site.register(Area, AreaAdmin)
@@ -25,9 +24,10 @@ class AreaWGURLAdmin(admin.ModelAdmin):
     pass
 admin.site.register(AreaWGURL, AreaWGURLAdmin)
 
-class BallotInfoAdmin(admin.ModelAdmin):
-    pass
-admin.site.register(BallotInfo, BallotInfoAdmin)
+if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    class BallotInfoAdmin(admin.ModelAdmin):
+        pass
+    admin.site.register(BallotInfo, BallotInfoAdmin)
 
 class ChairsHistoryAdmin(admin.ModelAdmin):
     list_display=('person', 'chair_type', 'start_year', 'end_year')
@@ -52,12 +52,13 @@ class IDIntendedStatusAdmin(admin.ModelAdmin):
     pass
 admin.site.register(IDIntendedStatus, IDIntendedStatusAdmin)
 
-class IDInternalAdmin(admin.ModelAdmin):
-    ordering=['draft']
-    list_display=['draft', 'token_email', 'note']
-    search_fields=['draft__filename']
-    raw_id_fields=['draft','ballot']
-admin.site.register(IDInternal, IDInternalAdmin)
+if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    class IDInternalAdmin(admin.ModelAdmin):
+        ordering=['draft']
+        list_display=['draft', 'token_email', 'note']
+        search_fields=['draft__filename']
+        raw_id_fields=['draft','ballot']
+    admin.site.register(IDInternal, IDInternalAdmin)
 
 class IDNextStateAdmin(admin.ModelAdmin):
     pass

ietf/idtracker/models.py

@@ -264,19 +264,12 @@ def __unicode__(self):
 	if self.first_name == '' and self.last_name == '':
 	    return u"(Person #%s)" % self.person_or_org_tag
         return u"%s %s" % ( self.first_name or u"<nofirst>", self.last_name or u"<nolast>")
-    def email(self, priority=1, type=None):
-	name = str(self)
+    def email(self, priority=1):
+	name = unicode(self)
         email = ''
-        types = type and [ type ] or [ "INET", "Prim", None ]
-        for type in types:
-            try:
-                if type:
-                    email = self.emailaddress_set.get(priority=priority, type=type).address
-                else:
-                    email = self.emailaddress_set.get(priority=priority).address
-                break
-            except (EmailAddress.DoesNotExist, AssertionError):
-                pass
+        addresses = self.emailaddress_set.filter(address__contains="@").order_by('priority')[:1]
+        if addresses:
+            email = addresses[0].address.replace('<', '').replace('>', '')
 	return (name, email)
     # Added by Sunny Lee to display person's affiliation - 5/26/2007
     def affiliation(self, priority=1):
@@ -1088,7 +1081,12 @@ def __init__(self, document):
 	self.document = document
 
 if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-    from redesign.doc.proxy import InternetDraft
+    InternetDraftOld = InternetDraft
+    IDInternalOld = IDInternal
+    BallotInfoOld = BallotInfo
+    AreaOld = Area
+    AcronymOld = Acronym
+    from redesign.doc.proxy import InternetDraft, IDInternal, BallotInfo
     from redesign.group.proxy import Area
     from redesign.group.proxy import Acronym
 

redesign/doc/models.py

@@ -27,9 +27,8 @@ class DocumentInfo(models.Model):
     abstract = models.TextField()
     rev = models.CharField(max_length=16)
     pages = models.IntegerField(blank=True, null=True)
-    intended_std_level = models.ForeignKey(IntendedStatusName, blank=True, null=True)
-    std_level = models.ForeignKey(StdStatusName, blank=True, null=True)
-    authors = models.ManyToManyField(Email, blank=True, null=True)
+    intended_std_level = models.ForeignKey(IntendedStdLevelName, blank=True, null=True)
+    std_level = models.ForeignKey(StdLevelName, blank=True, null=True)
     ad = models.ForeignKey(Email, related_name='ad_%(class)s_set', blank=True, null=True)
     shepherd = models.ForeignKey(Email, related_name='shepherd_%(class)s_set', blank=True, null=True)
     notify = models.CharField(max_length=255, blank=True)
@@ -42,9 +41,10 @@ class Meta:
     def author_list(self):
         return ", ".join(email.address for email in self.authors.all())
     def latest_event(self, *args, **filter_args):
-        """Get latest event with specific requirements, e.g.
-        d.latest_event(type="xyz") returns an Event while
-        d.latest_event(Status, type="xyz") returns a Status event."""
+        """Get latest event of optional Python type and with filter
+        arguments, e.g. d.latest_event(type="xyz") returns an Event
+        while d.latest_event(Status, type="xyz") returns a Status
+        event."""
         model = args[0] if args else Event
         e = model.objects.filter(doc=self).filter(**filter_args).order_by('-time')[:1]
         return e[0] if e else None
@@ -56,9 +56,21 @@ class RelatedDocument(models.Model):
     def __unicode__(self):
         return u"%s %s %s" % (self.document.name, self.relationship.name.lower(), self.doc_alias.name)
 
+class DocumentAuthor(models.Model):
+    document = models.ForeignKey('Document')
+    author = models.ForeignKey(Email)
+    order = models.IntegerField()
+
+    def __unicode__(self):
+        return u"%s %s (%s)" % (self.document.name, self.email.get_name(), self.order)
+
+    class Meta:
+        ordering = ["document", "order"]
+    
 class Document(DocumentInfo):
     name = models.CharField(max_length=255, primary_key=True)           # immutable
     related = models.ManyToManyField('DocAlias', through=RelatedDocument, blank=True, related_name="reversely_related_document_set")
+    authors = models.ManyToManyField(Email, through=DocumentAuthor, blank=True)
     def __unicode__(self):
         return self.name
     def values(self):
@@ -89,7 +101,7 @@ def save_with_history(self, force_insert=False, force_update=False):
             snap = DocHistory(**fields)
             snap.save()
             for m in many2many:
-                # FIXME: check that this works with related
+                # FIXME: check that this works with related/authors
                 #print "m2m:", m, many2many[m]
                 rel = getattr(snap, m)
                 for item in many2many[m]:
@@ -107,11 +119,23 @@ class RelatedDocHistory(models.Model):
     doc_alias = models.ForeignKey('DocAlias', related_name="reversely_related_document_history_set") # target
     relationship = models.ForeignKey(DocRelationshipName)
     def __unicode__(self):
-        return u"%s %s %s" % (self.document.name, self.relationship.name.lower(), self.doc_alias.name)
+        return u"%s %s %s" % (self.document.doc.name, self.relationship.name.lower(), self.doc_alias.name)
 
+class DocHistoryAuthor(models.Model):
+    document = models.ForeignKey('DocHistory')
+    author = models.ForeignKey(Email)
+    order = models.IntegerField()
+
+    def __unicode__(self):
+        return u"%s %s (%s)" % (self.document.doc.name, self.email.get_name(), self.order)
+
+    class Meta:
+        ordering = ["document", "order"]
+    
 class DocHistory(DocumentInfo):
     doc = models.ForeignKey(Document)   # ID of the Document this relates to
     related = models.ManyToManyField('DocAlias', through=RelatedDocHistory, blank=True)
+    authors = models.ManyToManyField(Email, through=DocHistoryAuthor, blank=True)
     def __unicode__(self):
         return unicode(self.doc.name)
 
@@ -169,6 +193,7 @@ class SendQueue(models.Model):
     ("published_rfc", "Published RFC"),
 
     # IESG events
+    ("started_iesg_process", "Started IESG process on document"),
     ("sent_ballot_announcement", "Sent ballot announcement"),
     ("changed_ballot_position", "Changed ballot position"),
     ("changed_ballot_approval_text", "Changed ballot approval text"),

redesign/doc/proxy.py

@@ -44,17 +44,19 @@ def revision(self):
     def revision_date(self):
         e = self.latest_event(type="new_revision")
         return e.time.date() if e else None
-    #file_type = models.CharField(max_length=20)
-    @property
-    def file_type(self):
-        matches = glob.glob(os.path.join(settings.INTERNET_DRAFT_PATH, self.name + "*.*"))
+    # helper function
+    def get_file_type_matches_from(self, glob_path):
         possible_types = [".txt", ".pdf", ".xml", ".ps"]
-        res = set()
-        for m in matches:
+        res = []
+        for m in glob.glob(glob_path):
             for t in possible_types:
                 if m.endswith(t):
-                    res.add(t)
-        return ",".join(res) or ".txt"
+                    res.append(t)
+        return ",".join(res)
+    #file_type = models.CharField(max_length=20)
+    @property
+    def file_type(self):
+        return self.get_file_type_matches_from(os.path.join(settings.INTERNET_DRAFT_PATH, self.name + "-" + self.rev + ".*")) or ".txt"
     #txt_page_count = models.IntegerField()
     @property
     def txt_page_count(self):
@@ -160,8 +162,15 @@ def expired_tombstone(self):
     #idinternal = FKAsOneToOne('idinternal', reverse=True, query=models.Q(rfc_flag = 0))
     @property
     def idinternal(self):
+        print self.iesg_state
         return self if self.iesg_state else None
 
+    # reverse relationship
+    @property
+    def authors(self):
+        from person.models import Person
+        return IDAuthor.objects.filter(document=self)
+    
     # methods from InternetDraft
     def displayname(self):
         return self.name
@@ -554,7 +563,7 @@ def needed(self, standardsTrack=True):
 
     #rfc_number = models.IntegerField(primary_key=True) # already taken care of
     #title = models.CharField(max_length=250) # same name
-    #authors = models.CharField(max_length=250) FIXME
+    #authors = models.CharField(max_length=250) # exists already
     #rfc_published_date = models.DateField()
     @property
     def rfc_published_date(self):
@@ -564,7 +573,7 @@ def rfc_published_date(self):
     #current_status = models.CharField(max_length=50,null=True)
     @property
     def current_status(self):
-        return self.std_level
+        return self.std_level.name
 
     #updates = models.CharField(max_length=200,blank=True,null=True)
     @property
@@ -594,26 +603,54 @@ def also(self):
                                            models.Q(name__startswith="bcp"))
         return aliases[0].name.upper() if aliases else None
 
-    #draft = models.CharField(max_length=200,null=True)
-    @property
-    def draft(self):
-        if not self.name.startswith("rfc"):
-            return self.name
-        else:
-            return None
+    #draft = models.CharField(max_length=200,null=True) # have to ignore this, it's already implemented
 
-    #has_errata = models.BooleanField() FIXME
+    #has_errata = models.BooleanField()
+    @property
+    def has_errata(self):
+        return bool(self.tags.filter(slug="errata"))
+
     #stream = models.CharField(max_length=15,blank=True,null=True)
     @property
     def stream(self):
         return super(InternetDraft, self).stream.name
-    #wg = models.CharField(max_length=15,blank=True,null=True) FIXME
+
+    #wg = models.CharField(max_length=15,blank=True,null=True)
+    @property
+    def wg(self):
+        return self.group.acronym
+
     #file_formats = models.CharField(max_length=20,blank=True,null=True)
     @property
     def file_formats(self):
-        return self.file_type.replace(".", "").replace("txt", "ascii")
+        return self.get_file_type_matches_from(os.path.join(settings.RFC_PATH, "rfc" + str(self.rfc_number) + ".*")).replace(".", "").replace("txt", "ascii")
 
     class Meta:
         proxy = True
 
+IDInternal = InternetDraft
+BallotInfo = InternetDraft
 RfcIndex = InternetDraft
+
+
+class IDAuthor(DocumentAuthor):
+    #document = models.ForeignKey(InternetDraft, db_column='id_document_tag', related_name='authors') # same name
+    #person = models.ForeignKey(PersonOrOrgInfo, db_column='person_or_org_tag')
+    @property
+    def person(self):
+        return self.author.person
+    
+    #author_order = models.IntegerField()
+    @property
+    def author_order(self):
+        return self.order
+    
+    def email(self):
+        return self.author.address
+    
+    def final_author_order(self):
+        return self.order
+    
+    class Meta:
+        proxy = True
+