Fix some import/proxy bugs that have turned up after a comparison test between non-proxied and proxied JSON generation, mostly relating to ballots registered by the Secretariat

 - Legacy-Id: 2740

Author: OleLaursen

ietf/idrfc/idrfc_wrapper.py

@@ -406,7 +406,7 @@ def iesg_ballot(self):
     # don't call this unless has_[active_]iesg_ballot returns True
     def iesg_ballot_needed( self ):
 	standardsTrack = 'Standard' in self.intended_maturity_level() or \
-			self.intended_maturity_level() == "BCP"
+			self.intended_maturity_level() in ("BCP", "Best Current Practice")
 	return self.iesg_ballot().ballot.needed( standardsTrack )
 
     def ad_name(self):
@@ -424,6 +424,17 @@ def iesg_note(self):
 
     def state_date(self):
         try:
+            if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+                return self._idinternal.event_set.filter(
+                    Q(desc__istartswith="Draft Added by ")|
+                    Q(desc__istartswith="Draft Added in state ")|
+                    Q(desc__istartswith="Draft added in state ")|
+                    Q(desc__istartswith="State changed to ")|
+                    Q(desc__istartswith="State Changes to ")|
+                    Q(desc__istartswith="Sub state has been changed to ")|
+                    Q(desc__istartswith="State has been changed to ")|
+                    Q(desc__istartswith="IESG has approved and state has been changed to")).order_by('-time')[0].time.date()
+                 
             return self._idinternal.comments().filter(
                 Q(comment_text__istartswith="Draft Added by ")|
                 Q(comment_text__istartswith="Draft Added in state ")|
@@ -625,8 +636,8 @@ def _init(self):
         positions = []
         seen = {}
 
-	for pos in self.ballot.event_set.filter(type="changed_ballot_position").select_related('pos', 'ad').order_by("-time", '-id'):
-            pos = pos.ballotposition
+        from doc.models import BallotPosition
+	for pos in BallotPosition.objects.filter(doc=self.ballot, type="changed_ballot_position").select_related('ad').order_by("-time", '-id'):
             if pos.ad not in seen:
                 p = dict(ad_name=pos.ad.get_name(),
                          ad_username="", # FIXME: don't seem to have username at the moment

ietf/idrfc/models.py

@@ -100,4 +100,5 @@ class Meta:
 
 from django.conf import settings
 if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    RfcIndexOld = RfcIndex
     from redesign.doc.proxy import RfcIndex

ietf/idrfc/views_doc.py

@@ -150,7 +150,7 @@ def _get_history(doc, versions):
     if settings.USE_DB_REDESIGN_PROXY_CLASSES:
         versions = [] # clear versions
         event_holder = doc._draft if hasattr(doc, "_draft") else doc._rfcindex
-        for e in event_holder.event_set.all().select_related('by').order_by('-time'):
+        for e in event_holder.event_set.all().select_related('by').order_by('-time', '-id'):
             info = {}
             if e.type == "new_revision":
                 filename = u"%s-%s" % (e.doc.name, e.newrevision.rev)
@@ -166,6 +166,9 @@ def _get_history(doc, versions):
             results.append({'comment':e, 'info':info, 'date':e.time, 'is_com':True})
 
         prev_rev = "00"
+        # actually, we're already sorted and this ruins the sort from
+        # the ids which is sometimes needed, so the function should be
+        # rewritten to not rely on a resort
         results.sort(key=lambda x: x['date'])
         for o in results:
             e = o["comment"]
@@ -236,6 +239,19 @@ def _get_versions(draft, include_replaced=True):
 def get_ballot(name):
     r = re.compile("^rfc([1-9][0-9]*)$")
     m = r.match(name)
+
+    if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+        from doc.models import DocAlias
+        alias = get_object_or_404(DocAlias, name=name)
+        d = get_object_or_404(InternetDraft, name=alias.document.name)
+        try:
+            if not d.ballot.ballot_issued:
+                raise Http404
+        except BallotInfo.DoesNotExist:
+            raise Http404
+        
+        return (BallotWrapper(d), RfcWrapper(d) if m else IdWrapper(d))
+        
     if m:
         rfc_number = int(m.group(1))
         rfci = get_object_or_404(RfcIndex, rfc_number=rfc_number)

redesign/doc/models.py

@@ -46,7 +46,7 @@ def latest_event(self, *args, **filter_args):
         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]
+        e = model.objects.filter(doc=self).filter(**filter_args).order_by('-time', '-id')[:1]
         return e[0] if e else None
 
 class RelatedDocument(models.Model):

redesign/doc/proxy.py

@@ -10,8 +10,10 @@
 class InternetDraft(Document):
     objects = TranslatingManager(dict(filename="name",
                                       id_document_tag="id",
-                                      status="state",
-                                      rfc_number=lambda v: ("docalias__name", "rfc%s" % v)))
+                                      status=lambda v: ("state", { 1: 'active', 2: 'expired', 3: 'rfc', 4: 'auth-rm', 5: 'repl', 6: 'ietf-rm'}),
+                                      job_owner="ad",
+                                      rfc_number=lambda v: ("docalias__name", "rfc%s" % v),
+                                      ))
 
     DAYS_TO_EXPIRE=185
 
@@ -94,7 +96,7 @@ def intended_status(self):
     @property
     def lc_sent_date(self):
         e = self.latest_event(type="sent_last_call")
-        return e.time if e else None
+        return e.time.date() if e else None
 
     #lc_changes = models.CharField(max_length=3) # used in DB, unused in Django code?
 
@@ -108,7 +110,7 @@ def lc_expiration_date(self):
     @property
     def b_sent_date(self):
         e = self.latest_event(type="sent_ballot_announcement")
-        return e.time if e else None
+        return e.time.date() if e else None
 
     #b_discussion_date = models.DateField(null=True, blank=True) # unused
 
@@ -142,7 +144,7 @@ def replaced_by(self):
     #replaces = FKAsOneToOne('replaces', reverse=True)
     @property
     def replaces(self):
-        r = self.replaces_set()
+        r = self.replaces_set
         return r[0] if r else None
 
     @property
@@ -242,7 +244,12 @@ def rfc_flag(self):
     #ballot = models.ForeignKey(BallotInfo, related_name='drafts', db_column="ballot_id")
     @property
     def ballot(self):
-        return self # FIXME: raise BallotInfo.DoesNotExist?
+        if not self.idinternal:
+            raise BallotInfo.DoesNotExist()
+        return self
+    @property
+    def ballot_id(self):
+        return self.ballot.name
 
     #primary_flag = models.IntegerField(blank=True, null=True)
     @property
@@ -402,7 +409,7 @@ def document(self):
         return self
 
     def comments(self):
-        return self.event_set.all().order_by('-time')
+        return DocumentComment.objects.filter(doc=self).order_by('-time')
 
     def ballot_set(self):
         return [self]
@@ -579,22 +586,22 @@ def current_status(self):
     #updates = models.CharField(max_length=200,blank=True,null=True)
     @property
     def updates(self):
-        return ",".join(sorted("RFC%s" % d.rfc_number for d in InternetDraft.objects.filter(docalias__relateddocument__document=self, docalias__relateddocument__relationship="updates")))
+        return ",".join("RFC%s" % n for n in sorted(d.rfc_number for d in InternetDraft.objects.filter(docalias__relateddocument__document=self, docalias__relateddocument__relationship="updates")))
 
     #updated_by = models.CharField(max_length=200,blank=True,null=True)
     @property
     def updated_by(self):
-        return ",".join(sorted("RFC%s" % d.rfc_number for d in InternetDraft.objects.filter(relateddocument__doc_alias__document=self, relateddocument__relationship="updates")))
+        return ",".join("RFC%s" % n for n in sorted(d.rfc_number for d in InternetDraft.objects.filter(relateddocument__doc_alias__document=self, relateddocument__relationship="updates")))
 
     #obsoletes = models.CharField(max_length=200,blank=True,null=True)
     @property
     def obsoletes(self):
-        return ",".join(sorted("RFC%s" % d.rfc_number for d in InternetDraft.objects.filter(docalias__relateddocument__document=self, docalias__relateddocument__relationship="obs")))
+        return ",".join("RFC%s" % n for n in sorted(d.rfc_number for d in InternetDraft.objects.filter(docalias__relateddocument__document=self, docalias__relateddocument__relationship="obs")))
 
     #obsoleted_by = models.CharField(max_length=200,blank=True,null=True)
     @property
     def obsoleted_by(self):
-        return ",".join(sorted("RFC%s" % d.rfc_number for d in InternetDraft.objects.filter(relateddocument__doc_alias__document=self, relateddocument__relationship="obs")))
+        return ",".join("RFC%s" % n for n in sorted(d.rfc_number for d in InternetDraft.objects.filter(relateddocument__doc_alias__document=self, relateddocument__relationship="obs")))
 
     #also = models.CharField(max_length=50,blank=True,null=True)
     @property
@@ -655,3 +662,44 @@ def final_author_order(self):
     class Meta:
         proxy = True
 
+class DocumentComment(Event):
+    objects = TranslatingManager(dict(comment_text="desc",
+                                      ))
+
+    BALLOT_DISCUSS = 1
+    BALLOT_COMMENT = 2
+    BALLOT_CHOICES = (
+	(BALLOT_DISCUSS, 'discuss'),
+	(BALLOT_COMMENT, 'comment'),
+    )
+    #document = models.ForeignKey(IDInternal)
+    @property
+    def document(self):
+        return self.doc
+    #rfc_flag = models.IntegerField(null=True, blank=True)
+    #public_flag = models.BooleanField() #unused
+    #date = models.DateField(db_column='comment_date', default=datetime.date.today)
+    @property
+    def date(self):
+        return self.time.date()
+    #time = models.CharField(db_column='comment_time', max_length=20, default=lambda: datetime.datetime.now().strftime("%H:%M:%S"))
+    #version = models.CharField(blank=True, max_length=3)
+    #comment_text = models.TextField(blank=True)
+    #created_by = BrokenForeignKey(IESGLogin, db_column='created_by', null=True, null_values=(0, 999))
+    #result_state = BrokenForeignKey(IDState, db_column='result_state', null=True, related_name="comments_leading_to_state", null_values=(0, 99))
+    #origin_state = models.ForeignKey(IDState, db_column='origin_state', null=True, related_name="comments_coming_from_state")
+    #ballot = models.IntegerField(null=True, choices=BALLOT_CHOICES)
+    def get_absolute_url(self):
+        return "/idtracker/%d/comment/%d/" % (self.doc.name, self.id)
+    def get_author(self):
+        return unicode(self.by)
+    def get_username(self):
+        return unicode(self.by)
+    def get_fullname(self):
+        return unicode(self.by)
+    def datetime(self):
+        return self.time
+    
+    class Meta:
+        proxy = True
+