Clean up search views and remove dead code, port them to the new DB

schema, hack related views in iesg/ and wginfo/ to use the new search
interfaces, avoid camelCase in search GET parameters (with
backwards-compat fallback), add some simple search unit tests, remove
caching from views_search.py index pages as they're now pretty fast to
generate, rewrite ballot popup JS, regularize some CSS classes to use
hyphen-notation rather than camelCase, move some of the search
templates to doc/.

idrfc/ now mostly contains some wrapper code still in use by other
subdirs, some ported code not yet moved, and dead code.
 - Legacy-Id: 5611

Author: OleLaursen

ietf/doc/models.py

@@ -36,6 +36,9 @@ def __unicode__(self):
     class Meta:
         ordering = ["type", "order"]
 
+IESG_BALLOT_ACTIVE_STATES = ("lc", "writeupw", "goaheadw", "iesg-eva", "defer")
+IESG_SUBSTATE_TAGS = ('point', 'ad-f-up', 'need-rev', 'extpty')
+
 class DocumentInfo(models.Model):
     """Any kind of document.  Draft, RFC, Charter, IPR Statement, Liaison Statement"""
     time = models.DateTimeField(default=datetime.datetime.now) # should probably have auto_now=True
@@ -186,9 +189,7 @@ def __unicode__(self):
     def get_absolute_url(self):
         name = self.name
         if self.type_id == "draft" and self.get_state_slug() == "rfc":
-            aliases = self.docalias_set.filter(name__startswith="rfc")
-            if aliases:
-                name = aliases[0].name
+            name = self.canonical_name()
         elif self.type_id in ('slides','agenda','minutes'):
             session = self.session_set.all()[0]
             meeting = session.meeting
@@ -248,11 +249,10 @@ def related_that_doc(self, relationship):
         """Return the doc aliases that are target of relationship originating from self."""
         return DocAlias.objects.filter(relateddocument__source=self, relateddocument__relationship=relationship)
 
-    #TODO can/should this be a function instead of a property? Currently a view uses it as a property
-    @property
-    def telechat_date(self):
-        e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
-        return e.telechat_date if e else None
+    def telechat_date(self, e=None):
+        if not e:
+            e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
+        return e.telechat_date if e and e.telechat_date and e.telechat_date >= datetime.date.today() else None
 
     def area_acronym(self):
         g = self.group
@@ -271,10 +271,6 @@ def group_acronym(self):
         else:
             return "none"
 
-    def on_upcoming_agenda(self):
-        e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
-        return bool(e and e.telechat_date and e.telechat_date >= datetime.date.today())
-
     def returning_item(self):
         e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
         return e.returning_item if e else None
@@ -299,56 +295,56 @@ def displayname_with_link(self):
         return '<a href="%s">%s-%s</a>' % (self.get_absolute_url(), self.name , self.rev)
 
     def rfc_number(self):
-        qs = self.docalias_set.filter(name__startswith='rfc')
-        return qs[0].name[3:] if qs else None
+        n = self.canonical_name()
+        return n[3:] if n.startswith("rfc") else None
 
     def friendly_state(self):
-        """ Return a concise text description of the document's current state """
-        if self.type_id=='draft':
-            # started_iesg_process is is how the redesigned database schema (as of May2012) captured what 
-            # used to be "has an IDInternal", aka *Wrapper.in_ietf_process()=True
-            in_iesg_process = self.latest_event(type='started_iesg_process')
-            iesg_state_summary=None
-            if in_iesg_process:
-                iesg_state = self.states.get(type='draft-iesg')
+        """ Return a concise text description of the document's current state."""
+        state = self.get_state()
+        if not state:
+            return "Unknown state"
+
+        if self.type_id == 'draft':
+            iesg_state = self.get_state("draft-iesg")
+            iesg_state_summary = None
+            if iesg_state:
                 # This knowledge about which tags are reportable IESG substate tags is duplicated in idrfc
-                IESG_SUBSTATE_TAGS = ('point', 'ad-f-up', 'need-rev', 'extpty')
                 iesg_substate = self.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
                 # There really shouldn't be more than one tag in iesg_substate, but this will do something sort-of-sensible if there is
                 iesg_state_summary = iesg_state.name
                 if iesg_substate:
                      iesg_state_summary = iesg_state_summary + "::"+"::".join(tag.name for tag in iesg_substate)
 
-            if self.get_state_slug() == "rfc":
-                n = self.rfc_number()
-                return "<a href=\"%s\">RFC %s</a>" % (urlreverse('doc_view', kwargs=dict(name='rfc%s' % n)), n)
-            elif self.get_state_slug() == "repl":
+            if state.slug == "rfc":
+                return "RFC %s (%s)" % (self.rfc_number(), self.std_level)
+            elif state.slug == "repl":
                 rs = self.related_that("replaces")
                 if rs:
-                    return mark_safe("Replaced by " + ", ".join("<a href=\"%s\">%s</a>" % (urlreverse('doc_view', args=[name]), name) for name in rs))
+                    return mark_safe("Replaced by " + ", ".join("<a href=\"%s\">%s</a>" % (urlreverse('doc_view', kwargs=dict(name=name)), name) for name in rs))
                 else:
                     return "Replaced"
-            elif self.get_state_slug() == "active":
-                if in_iesg_process:
+            elif state.slug == "active":
+                if iesg_state:
                     if iesg_state.slug == "dead":
                         # Many drafts in the draft-iesg "Dead" state are not dead
                         # in other state machines; they're just not currently under 
                         # IESG processing. Show them as "I-D Exists (IESG: Dead)" instead...
-                        return "I-D Exists (IESG: "+iesg_state_summary+")"
+                        return "I-D Exists (IESG: %s)" % iesg_state_summary
                     elif iesg_state.slug == "lc":
-                        expiration_date = str(self.latest_event(LastCallDocEvent,type="sent_last_call").expires.date())
-                        return iesg_state_summary + " (ends "+expiration_date+")"
-                    else:
-                        return iesg_state_summary
+                        e = self.latest_event(LastCallDocEvent, type="sent_last_call")
+                        if e:
+                            return iesg_state_summary + " (ends %s)" % e.expires.date().isoformat()
+
+                    return iesg_state_summary
                 else:
                     return "I-D Exists"
             else:
-                if in_iesg_process  and iesg_state.slug == "dead":
-                    return self.get_state().name +" (IESG: "+iesg_state_summary+")"
+                if iesg_state and iesg_state.slug == "dead":
+                    return state.name + " (IESG: %s)" % iesg_state_summary
                 # Expired/Withdrawn by Submitter/IETF
-                return self.get_state().name
+                return state.name
         else:
-           return self.get_state().name
+           return state.name
 
     def ipr(self):
         """Returns the IPR disclosures against this document (as a queryset over IprDocAlias)."""

ietf/doc/tests.py

@@ -21,6 +21,108 @@
 from ietf.doc.tests_conflict_review import *
 
 
+class SearchTestCase(django.test.TestCase):
+    fixtures = ['names']
+
+    def test_search(self):
+        draft = make_test_data()
+
+        base_url = urlreverse("doc_search")
+
+        # only show form, no search yet
+        r = self.client.get(base_url)
+        self.assertEqual(r.status_code, 200)
+
+        # no match
+        r = self.client.get(base_url + "?activedrafts=on&name=thisisnotadocumentname")
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue("no documents match" in r.content.lower())
+
+        r = self.client.get(base_url + "?rfcs=on&name=")
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue("no documents match" in r.content.lower())
+
+        r = self.client.get(base_url + "?olddrafts=on&name=")
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue("no documents match" in r.content.lower())
+
+        # find by rfc/active/inactive
+        draft.set_state(State.objects.get(type="draft", slug="rfc"))
+        r = self.client.get(base_url + "?rfcs=on&name=%s" % draft.name)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+
+        draft.set_state(State.objects.get(type="draft", slug="active"))
+        r = self.client.get(base_url + "?activedrafts=on&name=%s" % draft.name)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+
+        draft.set_state(State.objects.get(type="draft", slug="expired"))
+        r = self.client.get(base_url + "?olddrafts=on&name=%s" % draft.name)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+        
+        draft.set_state(State.objects.get(type="draft", slug="active"))
+
+        # find by title
+        r = self.client.get(base_url + "?activedrafts=on&name=%s" % draft.title.split()[0])
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+
+        # find by author
+        r = self.client.get(base_url + "?activedrafts=on&by=author&author=%s" % draft.authors.all()[0].person.name_parts()[1])
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+
+        # find by group
+        r = self.client.get(base_url + "?activedrafts=on&by=group&group=%s" % draft.group.acronym)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+
+        # find by area
+        r = self.client.get(base_url + "?activedrafts=on&by=area&area=%s" % draft.group.parent_id)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+
+        # find by area
+        r = self.client.get(base_url + "?activedrafts=on&by=area&area=%s" % draft.group.parent_id)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+
+        # find by AD
+        r = self.client.get(base_url + "?activedrafts=on&by=ad&ad=%s" % draft.ad_id)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+
+        # find by IESG state
+        r = self.client.get(base_url + "?activedrafts=on&by=state&state=%s&substate=" % draft.get_state("draft-iesg").pk)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+
+    def test_drafts_pages(self):
+        draft = make_test_data()
+
+        r = self.client.get(urlreverse("drafts_for_ad", kwargs=dict(name=draft.ad.full_name_as_key())))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+
+        draft.set_state(State.objects.get(type="draft-iesg", slug="lc"))
+        r = self.client.get(urlreverse("drafts_in_last_call"))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+        
+    def test_indexes(self):
+        draft = make_test_data()
+
+        r = self.client.get(urlreverse("index_all_drafts"))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.name in r.content)
+
+        r = self.client.get(urlreverse("index_active_drafts"))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(draft.title in r.content)
+        
+
 class DocTestCase(django.test.TestCase):
     fixtures = ['names']
 

ietf/idrfc/lastcall.py

@@ -8,7 +8,7 @@
 from ietf.idrfc.mails import *
 from ietf.idrfc.utils import *
 
-from ietf.doc.models import Document, DocEvent, LastCallDocEvent, WriteupDocEvent, save_document_in_history, State
+from ietf.doc.models import *
 from ietf.person.models import Person
 
 def request_last_call(request, doc):
@@ -83,7 +83,7 @@ def expire_last_callREDESIGN(doc):
     prev = doc.get_state("draft-iesg")
     doc.set_state(state)
 
-    prev_tag = doc.tags.filter(slug__in=('point', 'ad-f-up', 'need-rev', 'extpty'))
+    prev_tag = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
     prev_tag = prev_tag[0] if prev_tag else None
     if prev_tag:
         doc.tags.remove(prev_tag)