Code review

CHANGES.rst

@@ -4,7 +4,7 @@ Changelog
 2.0a4 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
-- Remove o campo ``subjects`` dos tipos de conteúdo ``Agenda``, ``AgendaDiaria`` e ``Compromisso`` por ser considerado `desnecessário <https://listas.interlegis.gov.br/pipermail/plonegov-br/2018-June/004767.html>`_.
+- Remove o campo ``subjects`` do tipos de conteúdo ``Compromisso`` por ser considerado `desnecessário <https://listas.interlegis.gov.br/pipermail/plonegov-br/2018-June/004767.html>`_.
   [hvelarde]
 
 

src/brasil/gov/agenda/content/agenda.py

@@ -1,9 +1,19 @@
 # -*- coding: utf-8 -*-
 from brasil.gov.agenda.interfaces import IAgenda
 from plone.dexterity.content import Container
+from plone.dexterity.utils import safe_utf8
+from plone.indexer.decorator import indexer
 from zope.interface import implementer
 
 
 @implementer(IAgenda)
 class Agenda(Container):
     """Agenda de um membro do Governo Brasileiro"""
+
+
+@indexer(IAgenda)
+def tags(obj):
+    """Indexa tags de Agenda."""
+    if obj.subjects is None:
+        return ()
+    return tuple(safe_utf8(s) for s in obj.subjects)

src/brasil/gov/agenda/content/agendadiaria.py

@@ -8,6 +8,7 @@
 from DateTime import DateTime
 from plone import api
 from plone.dexterity.content import Container
+from plone.dexterity.utils import safe_utf8
 from plone.indexer.decorator import indexer
 from plone.supermodel.interfaces import IDefaultFactory
 from Products.CMFPlone.utils import safe_hasattr
@@ -85,6 +86,14 @@ def default_location(context):
     return getattr(context, 'location', u'')
 
 
+@provider(IContextAwareDefaultFactory)
+def default_subjects(context):
+    # XXX: deal with testing issues https://stackoverflow.com/q/35799092/644075
+    if not safe_hasattr(context, 'aq_parent'):
+        return ()
+    return getattr(context, 'subjects', ())
+
+
 @provider(IDefaultFactory)
 def default_date():
     """ Retorna um dia no futuro """
@@ -101,6 +110,14 @@ def validate(self, value):
             raise Invalid(_(u'Ja existe uma agenda para esta data'))
 
 
+@indexer(IAgendaDiaria)
+def tags(obj):
+    """Indexa tags de AgendaDiaria."""
+    if obj.subjects is None:
+        return ()
+    return tuple(safe_utf8(s) for s in obj.subjects)
+
+
 @indexer(IAgendaDiaria)
 def SearchableText_AgendaDiaria(obj):
     """ Indexa os dados dos compromissos dentro desta AgendaDiaria

src/brasil/gov/agenda/content/configure.zcml

@@ -1,5 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
+  <adapter name="Subject" factory=".agenda.tags" />
+
   <adapter name="start" factory=".compromisso.start_date" />
   <adapter name="end" factory=".compromisso.end_date" />
   <adapter name="exclude_from_nav" factory=".compromisso.exclude_from_nav" />
@@ -9,5 +11,6 @@
   <adapter name="EffectiveDate" factory=".agendadiaria.EffectiveDate" />
   <adapter name="exclude_from_nav" factory=".agendadiaria.exclude_from_nav" />
   <adapter name="SearchableText" factory=".agendadiaria.SearchableText_AgendaDiaria" />
+  <adapter name="Subject" factory=".agendadiaria.tags" />
 
 </configure>

src/brasil/gov/agenda/content/schema/Agenda.xml

@@ -23,5 +23,15 @@
       <required>False</required>
       <title i18n:translate="label_event_location">Event Location</title>
     </field>
+    <field name="subjects" type="zope.schema.Tuple" indexer:searchable="true">
+      <description i18n:translate="">Tags são utilizadas para organização de conteúdo</description>
+      <default_value>()</default_value>
+      <missing_value>()</missing_value>
+      <required>False</required>
+      <title>Tags</title>
+      <value_type type="zope.schema.TextLine">
+        <title>Tag</title>
+      </value_type>
+    </field>
   </schema>
 </model>

src/brasil/gov/agenda/content/schema/AgendaDiaria.xml

@@ -27,5 +27,16 @@
         <required>False</required>
         <title i18n:translate="">Atualizacao</title>
     </field>
+    <field name="subjects" type="zope.schema.Tuple" indexer:searchable="true">
+      <description i18n:translate="">Tags são utilizadas para organização de conteúdo</description>
+      <defaultFactory>brasil.gov.agenda.content.agendadiaria.default_subjects</defaultFactory>
+      <default_value>()</default_value>
+      <missing_value>()</missing_value>
+      <required>False</required>
+      <title>Tags</title>
+      <value_type type="zope.schema.TextLine">
+        <title>Tag</title>
+      </value_type>
+    </field>
   </schema>
 </model>

src/brasil/gov/agenda/tests/test_agenda.py

@@ -57,6 +57,16 @@ def test_exclude_from_nav_default(self):
         behavior = IExcludeFromNavigation(self.agenda)
         self.assertFalse(behavior.exclude_from_nav)
 
+    def test_subjects_catalog(self):
+        agenda = self.agenda
+        agenda.subjects = (u'Brasil', u'México')
+        agenda.reindexObject(idxs=['Subject'])
+        ct = self.portal.portal_catalog
+        results = ct.searchResults(portal_type='Agenda')
+        b = results[0]
+        self.assertIn('Brasil', b.Subject)
+        self.assertIn('México', b.Subject)
+
     def test_agendadiaria_ordering(self):
         # Create two AgendaDiaria objects
         api.content.create(container=self.agenda, type='AgendaDiaria', id='2013-10-17')

src/brasil/gov/agenda/tests/test_agendadiaria.py

@@ -75,6 +75,24 @@ def test_exclude_from_nav(self):
     def test_exclude_from_nav_behavior(self):
         self.assertFalse(IExcludeFromNavigation.providedBy(self.agendadiaria))
 
+    def test_subjects_catalog(self):
+        agendadiaria = self.agendadiaria
+        agendadiaria.subjects = (u'Brasil', u'México')
+        agendadiaria.reindexObject(idxs=['Subject'])
+        ct = self.portal.portal_catalog
+        results = ct.searchResults(portal_type='AgendaDiaria')
+        b = results[0]
+        self.assertIn('Brasil', b.Subject)
+        self.assertIn('México', b.Subject)
+
+    def test_default_subjects(self):
+        from brasil.gov.agenda.content.agendadiaria import default_subjects
+        agenda = self.agenda
+        agenda.subjects = (u'Brasil', u'México')
+        # default_factory é executado no container
+        self.assertIn(u'Brasil', default_subjects(agenda))
+        self.assertIn(u'México', default_subjects(agenda))
+
     def test_datevalidator(self):
         from brasil.gov.agenda.content.agendadiaria import DateValidator
         from zope.interface.exceptions import Invalid