From 0a8f3c5f4341f8b581c074faded56e570f250e5b Mon Sep 17 00:00:00 2001
From: Fatima Gomez <fatima.gomez@datamade.us>
Date: Tue, 1 Jun 2021 14:18:22 -0500
Subject: [PATCH 01/11] make Date facet singular

---
 lametro/management/commands/refresh_guid.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lametro/management/commands/refresh_guid.py b/lametro/management/commands/refresh_guid.py
index 1c73632d8..82ad17e96 100644
--- a/lametro/management/commands/refresh_guid.py
+++ b/lametro/management/commands/refresh_guid.py
@@ -68,7 +68,7 @@ class ClassificationMixin:
             'Subregion',
         ),
         'significant_date_exact': (
-            'Dates',
+            'Date',
         ),
         'motion_by_exact': (
             'Board Member',

From b3a8222a138fcdc4fbd211322d7aa0bd79e2ee4f Mon Sep 17 00:00:00 2001
From: Fatima Gomez <fatima.gomez@datamade.us>
Date: Tue, 1 Jun 2021 17:32:37 -0500
Subject: [PATCH 02/11] add new fiscal_year facet based on plan_program_policy
 facet

---
 lametro/management/commands/refresh_guid.py | 3 +++
 lametro/models.py                           | 3 ++-
 lametro/search_indexes.py                   | 4 ++++
 lametro/views.py                            | 1 +
 solr_configs/conf/schema.xml                | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lametro/management/commands/refresh_guid.py b/lametro/management/commands/refresh_guid.py
index 82ad17e96..4371115fe 100644
--- a/lametro/management/commands/refresh_guid.py
+++ b/lametro/management/commands/refresh_guid.py
@@ -78,6 +78,9 @@ class ClassificationMixin:
             'Program',
             'Policy'
         ),
+        'fiscal_year_exact': (
+            ''
+        )
     }
 
     @property
diff --git a/lametro/models.py b/lametro/models.py
index 662c4edb5..2362faa78 100644
--- a/lametro/models.py
+++ b/lametro/models.py
@@ -911,7 +911,8 @@ class LAMetroSubject(models.Model):
         ('significant_date_exact', 'Significant Date'),
         ('motion_by_exact', 'Motion By'),
         ('topics_exact', 'Subject'),
-        ('plan_program_policy_exact', 'Plan, Program, or Policy')
+        ('plan_program_policy_exact', 'Plan, Program, or Policy'),
+        ('fiscal_year_exact', 'Fiscal Year')
     ]
 
     class Meta:
diff --git a/lametro/search_indexes.py b/lametro/search_indexes.py
index 99a2ae763..257b86a23 100644
--- a/lametro/search_indexes.py
+++ b/lametro/search_indexes.py
@@ -21,6 +21,7 @@ class LAMetroBillIndex(BillIndex, indexes.Indexable):
     significant_date = indexes.MultiValueField(faceted=True)
     motion_by = indexes.MultiValueField(faceted=True)
     plan_program_policy = indexes.MultiValueField(faceted=True)
+    fiscal_year = indexes.MultiValueField(faceted=True)
 
     def get_model(self):
         return LAMetroBill
@@ -88,6 +89,9 @@ def prepare_motion_by(self, obj):
     def prepare_plan_program_policy(self, obj):
         return self._topics_from_classification(obj, 'plan_program_policy_exact')
 
+    def prepare_fiscal_year(self, obj):
+        return self._topics_from_classification(obj, 'fiscal_year_exact')
+
     def _topics_from_classification(self, obj, classification):
         '''
         Retrieve a list of topics with the given classification.
diff --git a/lametro/views.py b/lametro/views.py
index 4d70acbea..8e101d1af 100644
--- a/lametro/views.py
+++ b/lametro/views.py
@@ -734,6 +734,7 @@ def build_form(self, form_kwargs={}):
          .facet('motion_by')\
          .facet('significant_date')\
          .facet('plan_program_policy')\
+         .facet('fiscal_year')\
          .highlight(**{'hl.fl': 'text,attachment_text'})
 
         data = None
diff --git a/solr_configs/conf/schema.xml b/solr_configs/conf/schema.xml
index e0285a8db..3e8607ef2 100644
--- a/solr_configs/conf/schema.xml
+++ b/solr_configs/conf/schema.xml
@@ -170,6 +170,8 @@
     <field name="motion_by_exact" type="string" indexed="true" stored="true" multiValued="true" />
     <field name="plan_program_policy" type="text_en" indexed="true" stored="true" multiValued="true" />
     <field name="plan_program_policy_exact" type="string" indexed="true" stored="true" multiValued="true" />
+    <field name="fiscal_year" type="text_en" indexed="true" stored="true" multiValued="true" />
+    <field name="fiscal_year_exact" type="string" indexed="true" stored="true" multiValued="true" />
 
     <!-- Dynamic field definitions allow using convention over configuration
     for fields via the specification of patterns to match field names. 

From 9bd516c9d944722b7d6267dcd62f871fc0b3c8c9 Mon Sep 17 00:00:00 2001
From: Fatima Gomez <fatima.gomez@datamade.us>
Date: Wed, 2 Jun 2021 09:16:52 -0500
Subject: [PATCH 03/11] add migration for fiscal_date facet

---
 lametro/migrations/0007_auto_20210602_0706.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 lametro/migrations/0007_auto_20210602_0706.py

diff --git a/lametro/migrations/0007_auto_20210602_0706.py b/lametro/migrations/0007_auto_20210602_0706.py
new file mode 100644
index 000000000..1af77ceb0
--- /dev/null
+++ b/lametro/migrations/0007_auto_20210602_0706.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.23 on 2021-06-02 14:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lametro', '0006_add_plan_program_policy'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lametrosubject',
+            name='classification',
+            field=models.CharField(choices=[('bill_type_exact', 'Board Report Type'), ('lines_and_ways_exact', 'Lines / Ways'), ('phase_exact', 'Phase'), ('project_exact', 'Project'), ('metro_location_exact', 'Metro Location'), ('geo_admin_location_exact', 'Geographic / Administrative Location'), ('significant_date_exact', 'Significant Date'), ('motion_by_exact', 'Motion By'), ('topics_exact', 'Subject'), ('plan_program_policy_exact', 'Plan, Program, or Policy'), ('fiscal_year_exact', 'Fiscal Year')], default='topics_exact', max_length=256),
+        ),
+    ]

From f95a613a90ee4da3af4ab84d3a19d0ff87f78de6 Mon Sep 17 00:00:00 2001
From: Fatima Gomez <fatima.gomez@datamade.us>
Date: Tue, 8 Jun 2021 14:42:54 -0500
Subject: [PATCH 04/11] debug missing facets & failing event scrape

---
 .gitignore                                    |  4 +++-
 docker-compose.yml                            |  2 ++
 lametro/management/commands/refresh_guid.py   |  3 ---
 lametro/migrations/0007_auto_20210602_0706.py | 18 ------------------
 lametro/models.py                             |  1 -
 lametro/search_indexes.py                     |  4 ----
 lametro/views.py                              |  1 -
 solr_configs/conf/schema.xml                  |  2 --
 8 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 lametro/migrations/0007_auto_20210602_0706.py

diff --git a/.gitignore b/.gitignore
index afba5e2da..1aa7af988 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,6 @@ debug.log
 /configs/settings_deployment.staging.py
 
 *.csv
-.gnupg/
\ No newline at end of file
+.gnupg/
+
+lametro/secrets.py
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 625089b9a..5cd86651e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,6 +61,8 @@ services:
       DATABASE_URL: 'postgis://postgres:@postgres/lametro'
       SHARED_DB: "True"
     command: sh -c 'pupa update --rpm=600 lametro people && pupa update --rpm=600 lametro bills window=30 && pupa update --rpm=600 lametro events'
+    volumes:
+      - ./lametro/secrets.py:/app/lametro/secrets.py
 
 volumes:
   lametro-solr-data:
diff --git a/lametro/management/commands/refresh_guid.py b/lametro/management/commands/refresh_guid.py
index 4371115fe..554d35afe 100644
--- a/lametro/management/commands/refresh_guid.py
+++ b/lametro/management/commands/refresh_guid.py
@@ -77,9 +77,6 @@ class ClassificationMixin:
             'Plan',
             'Program',
             'Policy'
-        ),
-        'fiscal_year_exact': (
-            ''
         )
     }
 
diff --git a/lametro/migrations/0007_auto_20210602_0706.py b/lametro/migrations/0007_auto_20210602_0706.py
deleted file mode 100644
index 1af77ceb0..000000000
--- a/lametro/migrations/0007_auto_20210602_0706.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.23 on 2021-06-02 14:06
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lametro', '0006_add_plan_program_policy'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='lametrosubject',
-            name='classification',
-            field=models.CharField(choices=[('bill_type_exact', 'Board Report Type'), ('lines_and_ways_exact', 'Lines / Ways'), ('phase_exact', 'Phase'), ('project_exact', 'Project'), ('metro_location_exact', 'Metro Location'), ('geo_admin_location_exact', 'Geographic / Administrative Location'), ('significant_date_exact', 'Significant Date'), ('motion_by_exact', 'Motion By'), ('topics_exact', 'Subject'), ('plan_program_policy_exact', 'Plan, Program, or Policy'), ('fiscal_year_exact', 'Fiscal Year')], default='topics_exact', max_length=256),
-        ),
-    ]
diff --git a/lametro/models.py b/lametro/models.py
index 2362faa78..a87bb2587 100644
--- a/lametro/models.py
+++ b/lametro/models.py
@@ -912,7 +912,6 @@ class LAMetroSubject(models.Model):
         ('motion_by_exact', 'Motion By'),
         ('topics_exact', 'Subject'),
         ('plan_program_policy_exact', 'Plan, Program, or Policy'),
-        ('fiscal_year_exact', 'Fiscal Year')
     ]
 
     class Meta:
diff --git a/lametro/search_indexes.py b/lametro/search_indexes.py
index 257b86a23..99a2ae763 100644
--- a/lametro/search_indexes.py
+++ b/lametro/search_indexes.py
@@ -21,7 +21,6 @@ class LAMetroBillIndex(BillIndex, indexes.Indexable):
     significant_date = indexes.MultiValueField(faceted=True)
     motion_by = indexes.MultiValueField(faceted=True)
     plan_program_policy = indexes.MultiValueField(faceted=True)
-    fiscal_year = indexes.MultiValueField(faceted=True)
 
     def get_model(self):
         return LAMetroBill
@@ -89,9 +88,6 @@ def prepare_motion_by(self, obj):
     def prepare_plan_program_policy(self, obj):
         return self._topics_from_classification(obj, 'plan_program_policy_exact')
 
-    def prepare_fiscal_year(self, obj):
-        return self._topics_from_classification(obj, 'fiscal_year_exact')
-
     def _topics_from_classification(self, obj, classification):
         '''
         Retrieve a list of topics with the given classification.
diff --git a/lametro/views.py b/lametro/views.py
index 8e101d1af..4d70acbea 100644
--- a/lametro/views.py
+++ b/lametro/views.py
@@ -734,7 +734,6 @@ def build_form(self, form_kwargs={}):
          .facet('motion_by')\
          .facet('significant_date')\
          .facet('plan_program_policy')\
-         .facet('fiscal_year')\
          .highlight(**{'hl.fl': 'text,attachment_text'})
 
         data = None
diff --git a/solr_configs/conf/schema.xml b/solr_configs/conf/schema.xml
index 3e8607ef2..e0285a8db 100644
--- a/solr_configs/conf/schema.xml
+++ b/solr_configs/conf/schema.xml
@@ -170,8 +170,6 @@
     <field name="motion_by_exact" type="string" indexed="true" stored="true" multiValued="true" />
     <field name="plan_program_policy" type="text_en" indexed="true" stored="true" multiValued="true" />
     <field name="plan_program_policy_exact" type="string" indexed="true" stored="true" multiValued="true" />
-    <field name="fiscal_year" type="text_en" indexed="true" stored="true" multiValued="true" />
-    <field name="fiscal_year_exact" type="string" indexed="true" stored="true" multiValued="true" />
 
     <!-- Dynamic field definitions allow using convention over configuration
     for fields via the specification of patterns to match field names. 

From c9f7b45fecbde71e470cee25555b54e52fe048e7 Mon Sep 17 00:00:00 2001
From: Fatima Gomez <fatima.gomez@datamade.us>
Date: Tue, 8 Jun 2021 16:52:37 -0500
Subject: [PATCH 05/11] ensure legislative_session in search_indexes

---
 lametro/management/commands/refresh_guid.py   |  3 +++
 lametro/migrations/0007_auto_20210608_1353.py | 18 ++++++++++++++++++
 lametro/models.py                             |  1 +
 lametro/search_indexes.py                     |  1 +
 4 files changed, 23 insertions(+)
 create mode 100644 lametro/migrations/0007_auto_20210608_1353.py

diff --git a/lametro/management/commands/refresh_guid.py b/lametro/management/commands/refresh_guid.py
index 554d35afe..b6c45193e 100644
--- a/lametro/management/commands/refresh_guid.py
+++ b/lametro/management/commands/refresh_guid.py
@@ -77,6 +77,9 @@ class ClassificationMixin:
             'Plan',
             'Program',
             'Policy'
+        ),
+        'legislative_session': (
+            'Legislative Session'
         )
     }
 
diff --git a/lametro/migrations/0007_auto_20210608_1353.py b/lametro/migrations/0007_auto_20210608_1353.py
new file mode 100644
index 000000000..324d49c9d
--- /dev/null
+++ b/lametro/migrations/0007_auto_20210608_1353.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.23 on 2021-06-08 20:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lametro', '0006_add_plan_program_policy'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lametrosubject',
+            name='classification',
+            field=models.CharField(choices=[('bill_type_exact', 'Board Report Type'), ('lines_and_ways_exact', 'Lines / Ways'), ('phase_exact', 'Phase'), ('project_exact', 'Project'), ('metro_location_exact', 'Metro Location'), ('geo_admin_location_exact', 'Geographic / Administrative Location'), ('significant_date_exact', 'Significant Date'), ('motion_by_exact', 'Motion By'), ('topics_exact', 'Subject'), ('plan_program_policy_exact', 'Plan, Program, or Policy'), ('legislative_session', 'Legislative Session')], default='topics_exact', max_length=256),
+        ),
+    ]
diff --git a/lametro/models.py b/lametro/models.py
index a87bb2587..c272a58cf 100644
--- a/lametro/models.py
+++ b/lametro/models.py
@@ -912,6 +912,7 @@ class LAMetroSubject(models.Model):
         ('motion_by_exact', 'Motion By'),
         ('topics_exact', 'Subject'),
         ('plan_program_policy_exact', 'Plan, Program, or Policy'),
+        ('legislative_session', 'Legislative Session')
     ]
 
     class Meta:
diff --git a/lametro/search_indexes.py b/lametro/search_indexes.py
index 99a2ae763..5b297c831 100644
--- a/lametro/search_indexes.py
+++ b/lametro/search_indexes.py
@@ -21,6 +21,7 @@ class LAMetroBillIndex(BillIndex, indexes.Indexable):
     significant_date = indexes.MultiValueField(faceted=True)
     motion_by = indexes.MultiValueField(faceted=True)
     plan_program_policy = indexes.MultiValueField(faceted=True)
+    legislative_session = indexes.MultiValueField(faceted=True)
 
     def get_model(self):
         return LAMetroBill

From 2a45c6ed5211107319d3a559b4d261a9fb11cd37 Mon Sep 17 00:00:00 2001
From: Fatima Gomez <fatima.gomez@datamade.us>
Date: Thu, 10 Jun 2021 17:11:53 -0500
Subject: [PATCH 06/11] fix fiscal year facet logic

---
 lametro/search_indexes.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lametro/search_indexes.py b/lametro/search_indexes.py
index 5b297c831..5e0ddf4cc 100644
--- a/lametro/search_indexes.py
+++ b/lametro/search_indexes.py
@@ -51,8 +51,18 @@ def prepare_attachment_text(self, obj):
         )
 
     def prepare_legislative_session(self, obj):
-        start_year = obj.legislative_session.identifier
-        end_year = int(start_year) + 1
+        if len(obj.actions_and_agendas) > 0:
+            most_recent = sorted(obj.actions_and_agendas, key=lambda i: i['date'],reverse=True)[0]
+            action_date = most_recent['event'].start_time
+        else:
+            action_date = obj.get_last_action_date()
+
+        if action_date.month <= 6:
+            start_year = action_date.year - 1
+            end_year = action_date.year
+        else:
+            start_year = action_date.year
+            end_year = action_date.year + 1
 
         session = '7/1/{start_year} to 6/30/{end_year}'.format(start_year=start_year,
                                                                end_year=end_year)

From 11b7d9e65f55c38b57c54d7335cdf63799f673a7 Mon Sep 17 00:00:00 2001
From: Fatima Gomez <fatima.gomez@datamade.us>
Date: Tue, 15 Jun 2021 14:17:24 -0500
Subject: [PATCH 07/11] remove legislative_session where it is redundant or
 unnecessary

---
 lametro/management/commands/refresh_guid.py   |  3 ---
 lametro/migrations/0007_auto_20210608_1353.py | 18 ------------------
 lametro/models.py                             |  3 +--
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 lametro/migrations/0007_auto_20210608_1353.py

diff --git a/lametro/management/commands/refresh_guid.py b/lametro/management/commands/refresh_guid.py
index b6c45193e..554d35afe 100644
--- a/lametro/management/commands/refresh_guid.py
+++ b/lametro/management/commands/refresh_guid.py
@@ -77,9 +77,6 @@ class ClassificationMixin:
             'Plan',
             'Program',
             'Policy'
-        ),
-        'legislative_session': (
-            'Legislative Session'
         )
     }
 
diff --git a/lametro/migrations/0007_auto_20210608_1353.py b/lametro/migrations/0007_auto_20210608_1353.py
deleted file mode 100644
index 324d49c9d..000000000
--- a/lametro/migrations/0007_auto_20210608_1353.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.23 on 2021-06-08 20:53
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('lametro', '0006_add_plan_program_policy'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='lametrosubject',
-            name='classification',
-            field=models.CharField(choices=[('bill_type_exact', 'Board Report Type'), ('lines_and_ways_exact', 'Lines / Ways'), ('phase_exact', 'Phase'), ('project_exact', 'Project'), ('metro_location_exact', 'Metro Location'), ('geo_admin_location_exact', 'Geographic / Administrative Location'), ('significant_date_exact', 'Significant Date'), ('motion_by_exact', 'Motion By'), ('topics_exact', 'Subject'), ('plan_program_policy_exact', 'Plan, Program, or Policy'), ('legislative_session', 'Legislative Session')], default='topics_exact', max_length=256),
-        ),
-    ]
diff --git a/lametro/models.py b/lametro/models.py
index c272a58cf..662c4edb5 100644
--- a/lametro/models.py
+++ b/lametro/models.py
@@ -911,8 +911,7 @@ class LAMetroSubject(models.Model):
         ('significant_date_exact', 'Significant Date'),
         ('motion_by_exact', 'Motion By'),
         ('topics_exact', 'Subject'),
-        ('plan_program_policy_exact', 'Plan, Program, or Policy'),
-        ('legislative_session', 'Legislative Session')
+        ('plan_program_policy_exact', 'Plan, Program, or Policy')
     ]
 
     class Meta:

From 1622456ab9cacb153ffc931a6d75b93ecfedd52b Mon Sep 17 00:00:00 2001
From: Fatima Gomez <fatima.gomez@datamade.us>
Date: Wed, 16 Jun 2021 15:21:51 -0500
Subject: [PATCH 08/11] refine logic for prepare_legislative_session

---
 lametro/search_indexes.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/lametro/search_indexes.py b/lametro/search_indexes.py
index 5e0ddf4cc..afb445ea5 100644
--- a/lametro/search_indexes.py
+++ b/lametro/search_indexes.py
@@ -21,7 +21,6 @@ class LAMetroBillIndex(BillIndex, indexes.Indexable):
     significant_date = indexes.MultiValueField(faceted=True)
     motion_by = indexes.MultiValueField(faceted=True)
     plan_program_policy = indexes.MultiValueField(faceted=True)
-    legislative_session = indexes.MultiValueField(faceted=True)
 
     def get_model(self):
         return LAMetroBill
@@ -51,23 +50,26 @@ def prepare_attachment_text(self, obj):
         )
 
     def prepare_legislative_session(self, obj):
-        if len(obj.actions_and_agendas) > 0:
-            most_recent = sorted(obj.actions_and_agendas, key=lambda i: i['date'],reverse=True)[0]
-            action_date = most_recent['event'].start_time
-        else:
-            action_date = obj.get_last_action_date()
-
-        if action_date.month <= 6:
-            start_year = action_date.year - 1
-            end_year = action_date.year
-        else:
-            start_year = action_date.year
-            end_year = action_date.year + 1
-
-        session = '7/1/{start_year} to 6/30/{end_year}'.format(start_year=start_year,
-                                                               end_year=end_year)
+        aa = sorted(obj.actions_and_agendas, key=lambda i: i['date'],reverse=True)
+        agendas = [a for a in aa if a['description'] == 'SCHEDULED']
+        if len(aa) > 1:
+            if agendas:
+                action_date = agendas[0]['date']
+            else:
+                action_date = aa[0]['date']
+
+            if action_date.month <= 6:
+                start_year = action_date.year - 1
+                end_year = action_date.year
+            else:
+                start_year = action_date.year
+                end_year = action_date.year + 1
+
+            session = '7/1/{start_year} to 6/30/{end_year}'.format(start_year=start_year,
+                                                                   end_year=end_year)
+            return session
+        return None
 
-        return session
 
     def prepare_topics(self, obj):
         return self._topics_from_classification(obj, 'topics_exact')

From 689d07fdcc557da37b4c86f064ea3369c83bd2c3 Mon Sep 17 00:00:00 2001
From: Fatima Gomez <fatima.gomez@datamade.us>
Date: Wed, 16 Jun 2021 15:28:13 -0500
Subject: [PATCH 09/11] working through modifying test_legislative_session

---
 tests/test_solr_prep.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/test_solr_prep.py b/tests/test_solr_prep.py
index 719206be7..69fbca94c 100644
--- a/tests/test_solr_prep.py
+++ b/tests/test_solr_prep.py
@@ -13,6 +13,7 @@
     ('2018', '7/1/2018 to 6/30/2019'),
 ])
 def test_legislative_session(bill, 
+                             bill_action,
                              legislative_session,
                              session_identifier,
                              prepared_session):
@@ -24,13 +25,23 @@ def test_legislative_session(bill,
     which returns a dict of prepped data.
     https://github.com/django-haystack/django-haystack/blob/4910ccb01c31d12bf22dcb000894eece6c26f74b/haystack/indexes.py#L198
     '''
+    # test no actions or agendas
     legislative_session.identifier = session_identifier
     legislative_session.save()
     bill = bill.build(legislative_session=legislative_session)
 
+    assert indexed_data['legislative_session'] == None
+
+    # test actions, no agenda
+    some_action = bill_action.build(bill=some_bill)
+
+
     index = LAMetroBillIndex()
     indexed_data = index.prepare(bill)
 
+    # add actions_and_agendas
+    # test actions, no agenda; agenda, no actions
+
     assert indexed_data['legislative_session'] == prepared_session
 
 def test_sponsorships(bill, 

From a5d02a0b755012c3a26b0e729bdaed24ab62814f Mon Sep 17 00:00:00 2001
From: Fatima Gomez <fatima.gomez@datamade.us>
Date: Tue, 22 Jun 2021 14:49:25 -0500
Subject: [PATCH 10/11] continue fleshing out test_legislative_session

---
 requirements.txt        |  2 ++
 tests/test_solr_prep.py | 76 ++++++++++++++++++++++++++++-------------
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ec2f02485..660fbd5da 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 Django>=2.2,<2.3
+psycopg2-binary>=2.8,<2.9
 opencivicdata>=3.1.0
 django-councilmatic[convert_docs]==2.6.1
 django-debug-toolbar==1.9.1
@@ -13,3 +14,4 @@ lxml==4.1.1
 dj_database_url
 https://github.com/opencivicdata/python-legistar-scraper/zipball/master
 locustio==0.13.2
+django-recaptcha==2.0.6
diff --git a/tests/test_solr_prep.py b/tests/test_solr_prep.py
index 69fbca94c..441f5edc0 100644
--- a/tests/test_solr_prep.py
+++ b/tests/test_solr_prep.py
@@ -1,22 +1,18 @@
 import pytest
-from datetime import datetime
+from datetime import datetime, timedelta
 
 from opencivicdata.legislative.models import EventParticipant
 
 from lametro.search_indexes import LAMetroBillIndex
 
-@pytest.mark.parametrize('session_identifier,prepared_session', [
-    ('2014', '7/1/2014 to 6/30/2015'),
-    ('2015', '7/1/2015 to 6/30/2016'),
-    ('2016', '7/1/2016 to 6/30/2017'),
-    ('2017', '7/1/2017 to 6/30/2018'),
-    ('2018', '7/1/2018 to 6/30/2019'),
-])
-def test_legislative_session(bill, 
-                             bill_action,
-                             legislative_session,
-                             session_identifier,
-                             prepared_session):
+# @pytest.mark.parametrize('session_identifier,prepared_session', [
+#     ('2014', '7/1/2014 to 6/30/2015'),
+#     ('2015', '7/1/2015 to 6/30/2016'),
+#     ('2016', '7/1/2016 to 6/30/2017'),
+#     ('2017', '7/1/2017 to 6/30/2018'),
+#     ('2018', '7/1/2018 to 6/30/2019'),
+# ])
+def test_legislative_session(bill, metro_organization, event, mocker):
     '''
     This test instantiates LAMetroBillIndex – a subclass of SearchIndex from
     Haystack, used for building the Solr index.
@@ -25,24 +21,56 @@ def test_legislative_session(bill,
     which returns a dict of prepped data.
     https://github.com/django-haystack/django-haystack/blob/4910ccb01c31d12bf22dcb000894eece6c26f74b/haystack/indexes.py#L198
     '''
-    # test no actions or agendas
-    legislative_session.identifier = session_identifier
-    legislative_session.save()
-    bill = bill.build(legislative_session=legislative_session)
-
-    assert indexed_data['legislative_session'] == None
+    # mock actions & agendas
+    org1 = metro_organization.build()
+    event1 = event.build()
 
-    # test actions, no agenda
-    some_action = bill_action.build(bill=some_bill)
+    recent_action = {
+            'date': datetime.now(),
+            'description': 'org2 descripton',
+            'event': event1,
+            'organization': org1
+        }
+    older_action = {
+            'date': datetime.now() - timedelta(days=365*5),
+            'description': 'org2 descripton',
+            'event': event1,
+            'organization': org1
+        }
+    recent_agenda = {
+            'date': datetime.now() - timedelta(days=365),
+            'description': 'SCHEDULED',
+            'event': event1,
+            'organization': org1
+        }
+    older_agenda = {
+            'date': datetime.now() - timedelta(days=365*5),
+            'description': 'SCHEDULED',
+            'event': event1,
+            'organization': org1
+        }
+    test_cases = [[recent_action, older_action, recent_agenda, older_agenda], [recent_action, older_action], []]
+    mock_actions_and_agendas = mocker.patch('lametro.models.LAMetroBill.actions_and_agendas',\
+                                            new_callable=mocker.PropertyMock,\
+                                            return_value=[recent_action, older_action, recent_agenda, older_agenda])
 
+    bill = bill.build()
 
     index = LAMetroBillIndex()
     indexed_data = index.prepare(bill)
 
-    # add actions_and_agendas
-    # test actions, no agenda; agenda, no actions
+    assert str(recent_agenda['date'].year) in indexed_data['legislative_session']
+
+    mock_actions_and_agendas = mocker.patch('lametro.models.LAMetroBill.actions_and_agendas',\
+                                            new_callable=mocker.PropertyMock,\
+                                            return_value=[recent_action, older_action])
+    assert str(recent_action['date'].year) in indexed_data['legislative_session']
+
+    mock_actions_and_agendas = mocker.patch('lametro.models.LAMetroBill.actions_and_agendas',\
+                                            new_callable=mocker.PropertyMock,\
+                                            return_value=[])
+    assert not indexed_data['legislative_session']
 
-    assert indexed_data['legislative_session'] == prepared_session
 
 def test_sponsorships(bill, 
                       metro_organization,

From af7dbf960195aeae62fa81700d606b54219a3a05 Mon Sep 17 00:00:00 2001
From: hancush <hannah.cushman@gmail.com>
Date: Tue, 22 Jun 2021 15:28:17 -0500
Subject: [PATCH 11/11] Revise Solr prep test

Co-authored by Fatima Gomez <fatima.gomez@datamade.us>
---
 tests/test_solr_prep.py | 114 ++++++++++++++++++++++++----------------
 1 file changed, 68 insertions(+), 46 deletions(-)

diff --git a/tests/test_solr_prep.py b/tests/test_solr_prep.py
index 441f5edc0..11e6512b5 100644
--- a/tests/test_solr_prep.py
+++ b/tests/test_solr_prep.py
@@ -5,74 +5,96 @@
 
 from lametro.search_indexes import LAMetroBillIndex
 
-# @pytest.mark.parametrize('session_identifier,prepared_session', [
-#     ('2014', '7/1/2014 to 6/30/2015'),
-#     ('2015', '7/1/2015 to 6/30/2016'),
-#     ('2016', '7/1/2016 to 6/30/2017'),
-#     ('2017', '7/1/2017 to 6/30/2018'),
-#     ('2018', '7/1/2018 to 6/30/2019'),
-# ])
-def test_legislative_session(bill, metro_organization, event, mocker):
+@pytest.mark.parametrize('month', [6, 7])
+def test_legislative_session(bill, metro_organization, event, mocker, month):
     '''
     This test instantiates LAMetroBillIndex – a subclass of SearchIndex from
     Haystack, used for building the Solr index.
 
-    The test, then, calls the SearchIndex `prepare` function, 
+    The test, then, calls the SearchIndex `prepare` function,
     which returns a dict of prepped data.
     https://github.com/django-haystack/django-haystack/blob/4910ccb01c31d12bf22dcb000894eece6c26f74b/haystack/indexes.py#L198
     '''
-    # mock actions & agendas
-    org1 = metro_organization.build()
-    event1 = event.build()
+    org = metro_organization.build()
+    event = event.build()
+    bill = bill.build()
 
+    now = datetime.now()
+
+    # Create test actions and agendas
     recent_action = {
-            'date': datetime.now(),
-            'description': 'org2 descripton',
-            'event': event1,
-            'organization': org1
-        }
+        'date': datetime(now.year, month, now.day),
+        'description': 'org2 descripton',
+        'event': event,
+        'organization': org
+    }
     older_action = {
-            'date': datetime.now() - timedelta(days=365*5),
-            'description': 'org2 descripton',
-            'event': event1,
-            'organization': org1
-        }
+        'date': datetime(now.year, month, now.day) - timedelta(days=365*2),
+        'description': 'org2 descripton',
+        'event': event,
+        'organization': org
+    }
     recent_agenda = {
-            'date': datetime.now() - timedelta(days=365),
-            'description': 'SCHEDULED',
-            'event': event1,
-            'organization': org1
-        }
+        'date': datetime(now.year, month, now.day) - timedelta(days=365),
+        'description': 'SCHEDULED',
+        'event': event,
+        'organization': org
+    }
     older_agenda = {
-            'date': datetime.now() - timedelta(days=365*5),
-            'description': 'SCHEDULED',
-            'event': event1,
-            'organization': org1
-        }
-    test_cases = [[recent_action, older_action, recent_agenda, older_agenda], [recent_action, older_action], []]
-    mock_actions_and_agendas = mocker.patch('lametro.models.LAMetroBill.actions_and_agendas',\
-                                            new_callable=mocker.PropertyMock,\
-                                            return_value=[recent_action, older_action, recent_agenda, older_agenda])
+        'date': datetime(now.year, month, now.day) - timedelta(days=365*3),
+        'description': 'SCHEDULED',
+        'event': event,
+        'organization': org
+    }
 
-    bill = bill.build()
+    # Test indexed value when there are both actions and agendas
+    mock_actions_and_agendas = mocker.PropertyMock(
+        return_value=[recent_action, older_action, recent_agenda, older_agenda]
+    )
+
+    mocker.patch('lametro.models.LAMetroBill.actions_and_agendas', new_callable=mock_actions_and_agendas)
 
     index = LAMetroBillIndex()
+    expected_fmt = '7/1/{0} to 6/30/{1}'
+
     indexed_data = index.prepare(bill)
 
-    assert str(recent_agenda['date'].year) in indexed_data['legislative_session']
+    if month <= 6:
+        expected_value = expected_fmt.format(recent_agenda['date'].year - 1, recent_agenda['date'].year)
+    else:
+        expected_value = expected_fmt.format(recent_agenda['date'].year, recent_agenda['date'].year + 1)
 
-    mock_actions_and_agendas = mocker.patch('lametro.models.LAMetroBill.actions_and_agendas',\
-                                            new_callable=mocker.PropertyMock,\
-                                            return_value=[recent_action, older_action])
-    assert str(recent_action['date'].year) in indexed_data['legislative_session']
+    assert indexed_data['legislative_session'] == expected_value
+
+    # Test indexed value when there are just actions
+    mock_actions_and_agendas = mocker.PropertyMock(
+        return_value=[recent_action, older_action]
+    )
+
+    mocker.patch('lametro.models.LAMetroBill.actions_and_agendas', new_callable=mock_actions_and_agendas)
+
+    indexed_data = index.prepare(bill)
+
+    if month <= 6:
+        expected_value = expected_fmt.format(recent_action['date'].year - 1, recent_action['date'].year)
+    else:
+        expected_value = expected_fmt.format(recent_action['date'].year, recent_action['date'].year + 1)
+
+    assert indexed_data['legislative_session'] == expected_value
+
+    # Test indexed value when there are neither actions nor agendas
+    mock_actions_and_agendas = mocker.PropertyMock(
+        return_value=[]
+    )
+
+    mocker.patch('lametro.models.LAMetroBill.actions_and_agendas', new_callable=mock_actions_and_agendas)
+
+    indexed_data = index.prepare(bill)
 
-    mock_actions_and_agendas = mocker.patch('lametro.models.LAMetroBill.actions_and_agendas',\
-                                            new_callable=mocker.PropertyMock,\
-                                            return_value=[])
     assert not indexed_data['legislative_session']
 
 
-def test_sponsorships(bill, 
+def test_sponsorships(bill,
                       metro_organization,
                       event,
                       event_related_entity,