Added Dynamically Created buttons for filters on Map points

.gitignore

@@ -144,6 +144,7 @@ node_modules/
 /**/migrations/*.py
 !/**/migrations/__init__.py
 config/environment_variables.json
+config/environment_variables*.bak.json
 web_app/build/*
 
 # Heroku Related #

activity/controllers.py

@@ -621,6 +621,28 @@ def notice_friend_endorsements_send(
             # subject += " is getting ready to vote"
             activity_description += "is reviewing the ballot"
 
+        # "recipient_unsubscribe_url":    web_app_root_url_verified + "/settings/notifications/esk/" +
+        # recipient_email_subscription_secret_key,
+
+        # Unsubscribe link in email
+        recipient_unsubscribe_url = \
+            "{root_url}/unsubscribe/{email_secret_key}/friendopinionsall" \
+            "".format(
+                email_secret_key=recipient_email_subscription_secret_key,
+                root_url=web_app_root_url_verified,
+            )
+        # Instant unsubscribe link in email header
+        list_unsubscribe_url = \
+            "{root_url}/apis/v1/unsubscribeInstant/{email_secret_key}/friendopinionsall/" \
+            "".format(
+                email_secret_key=recipient_email_subscription_secret_key,
+                root_url=WE_VOTE_SERVER_ROOT_URL,
+            )
+        # Instant unsubscribe email address in email header
+        # from voter.models import NOTIFICATION_FRIEND_OPINIONS_OTHER_REGIONS_EMAIL
+        list_unsubscribe_mailto = "[email protected]?subject=unsubscribe%20{setting}" \
+                                  "".format(setting='friendopinionsall')
+
         # Variables used by templates/email_outbound/email_templates/notice_friend_endorsements.txt and .html
         template_variables_for_json = {
             "activity_description":         activity_description,
@@ -632,10 +654,8 @@ def notice_friend_endorsements_send(
             "sender_description":           speaker_voter_description,
             "sender_network_details":       speaker_voter_network_details,
             "recipient_name":               recipient_name,
+            "recipient_unsubscribe_url":    recipient_unsubscribe_url,
             "recipient_voter_email":        recipient_email,
-            "recipient_unsubscribe_url":    web_app_root_url_verified + "/settings/notifications/esk/" +
-            recipient_email_subscription_secret_key,
-            "email_open_url":               WE_VOTE_SERVER_ROOT_URL + "/apis/v1/emailOpen?email_key=1234",
             "view_new_endorsements_url":    web_app_root_url_verified + "/news/a/" + activity_tidbit_we_vote_id,
             "view_your_ballot_url":         web_app_root_url_verified + "/ballot",
         }
@@ -651,7 +671,10 @@ def notice_friend_endorsements_send(
             recipient_email_we_vote_id=recipient_email_we_vote_id,
             recipient_voter_email=recipient_email,
             template_variables_in_json=template_variables_in_json,
-            kind_of_email_template=kind_of_email_template)
+            kind_of_email_template=kind_of_email_template,
+            list_unsubscribe_mailto=list_unsubscribe_mailto,
+            list_unsubscribe_url=list_unsubscribe_url,
+        )
         status += outbound_results['status'] + " "
         success = outbound_results['success']
         if outbound_results['email_outbound_description_saved']:
@@ -894,22 +917,41 @@ def notice_voter_daily_summary_send(  # NOTICE_VOTER_DAILY_SUMMARY
         if not positive_value_exists(subject):
             subject = "Your friends have commented"
 
+        # Unsubscribe link in email
+        # "recipient_unsubscribe_url":    web_app_root_url_verified + "/settings/notifications/esk/" +
+        # recipient_email_subscription_secret_key,
+        recipient_unsubscribe_url = \
+            "{root_url}/unsubscribe/{email_secret_key}/dailyfriendactivity" \
+            "".format(
+                email_secret_key=recipient_email_subscription_secret_key,
+                root_url=web_app_root_url_verified,
+            )
+        # Instant unsubscribe link in email header
+        list_unsubscribe_url = \
+            "{root_url}/apis/v1/unsubscribeInstant/{email_secret_key}/dailyfriendactivity/" \
+            "".format(
+                email_secret_key=recipient_email_subscription_secret_key,
+                root_url=WE_VOTE_SERVER_ROOT_URL,
+            )
+        # Instant unsubscribe email address in email header
+        # from voter.models import NOTIFICATION_VOTER_DAILY_SUMMARY_EMAIL
+        list_unsubscribe_mailto = "[email protected]?subject=unsubscribe%20{setting}" \
+                                  "".format(setting='dailyfriendactivity')
+
         template_variables_for_json = {
-            "introduction_line":            introduction_line,
-            "subject":                      subject,
-            "friend_activity_dict_list":    friend_activity_dict_list_modified,
+            "introduction_line":                introduction_line,
+            "subject":                          subject,
+            "friend_activity_dict_list":        friend_activity_dict_list_modified,
             # "sender_name":                  speaker_voter_name,
             # "sender_photo":                 speaker_voter_photo,
             # "sender_email_address":         speaker_voter_email,  # Does not affect the "From" email header
             # "sender_description":           speaker_voter_description,
             # "sender_network_details":       speaker_voter_network_details,
-            "recipient_name":               recipient_name,
-            "recipient_voter_email":        recipient_email,
-            "recipient_unsubscribe_url":    web_app_root_url_verified + "/settings/notifications/esk/" +
-            recipient_email_subscription_secret_key,
-            "email_open_url":               WE_VOTE_SERVER_ROOT_URL + "/apis/v1/emailOpen?email_key=1234",
+            "recipient_name":                   recipient_name,
+            "recipient_unsubscribe_url":        recipient_unsubscribe_url,
+            "recipient_voter_email":            recipient_email,
             "view_main_discussion_page_url":    web_app_root_url_verified + "/news",
-            "view_your_ballot_url":         web_app_root_url_verified + "/ballot",
+            "view_your_ballot_url":             web_app_root_url_verified + "/ballot",
         }
         template_variables_in_json = json.dumps(template_variables_for_json, ensure_ascii=True)
         from_email_for_daily_summary = "We Vote <[email protected]>"  # TODO DALE Make system variable
@@ -924,7 +966,10 @@ def notice_voter_daily_summary_send(  # NOTICE_VOTER_DAILY_SUMMARY
             recipient_email_we_vote_id=recipient_email_we_vote_id,
             recipient_voter_email=recipient_email,
             template_variables_in_json=template_variables_in_json,
-            kind_of_email_template=kind_of_email_template)
+            kind_of_email_template=kind_of_email_template,
+            list_unsubscribe_mailto=list_unsubscribe_mailto,
+            list_unsubscribe_url=list_unsubscribe_url,
+        )
         status += outbound_results['status'] + " "
         success = outbound_results['success']
         if outbound_results['email_outbound_description_saved']:

admin_tools/views.py

@@ -2,8 +2,8 @@
 # Brought to you by We Vote. Be good.
 # -*- coding: UTF-8 -*-
 
-from config.base import get_environment_variable, get_git_merge_date, get_node_version, get_postgres_version, \
-    get_python_version, LOGIN_URL
+from config.base import get_environment_variable, get_node_version, get_postgres_version, \
+    get_python_version, LOGIN_URL, get_git_commit_hash
 from ballot.models import BallotReturned, VoterBallotSaved
 from candidate.models import CandidateCampaign, CandidateManager
 from candidate.controllers import candidates_import_from_sample_file
@@ -113,7 +113,8 @@ def admin_home_view(request):
         'google_civic_election_id':           google_civic_election_id,
         'python_version':                     get_python_version(),
         'node_version':                       get_node_version(),
-        'git_merge_date':                     get_git_merge_date(),
+        'git_commit_hash':                    get_git_commit_hash(False),
+        'git_commit_hash_url':                get_git_commit_hash(True),
         'postgres_version':                   get_postgres_version(),
         'shared_link_clicked_unique_sharer_count': shared_link_clicked_unique_sharer_count,
         'shared_link_clicked_unique_viewer_count': shared_link_clicked_unique_viewer_count,
@@ -1711,7 +1712,7 @@ def login_we_vote(request):
 
     voter_manager = VoterManager()
     voter_device_link_manager = VoterDeviceLinkManager()
-    results = voter_manager.retrieve_voter_from_voter_device_id(voter_api_device_id)
+    results = voter_manager.retrieve_voter_from_voter_device_id(voter_api_device_id, read_only=True)
     if results['voter_found']:
         voter_on_stage = results['voter']
         voter_on_stage_id = voter_on_stage.id

analytics/models.py

@@ -729,7 +729,8 @@ def retrieve_analytics_processed_list(
             success = False
 
         try:
-            retrieved_voter_we_vote_id_list = voter_list_query.values_list('voter_we_vote_id', flat=True).distinct()
+            voter_list_query = voter_list_query.values_list('voter_we_vote_id', flat=True).distinct()
+            retrieved_voter_we_vote_id_list = list(voter_list_query)
             retrieved_voter_we_vote_id_list_found = True
         except Exception as e:
             retrieved_voter_we_vote_id_list_found = False

apis_v1/documentation_source/friend_list_doc.py

@@ -59,7 +59,7 @@ def friend_list_doc_template_values(url_root):
                    '  "state_code": string,\n' \
                    '  "kind_of_list": string, \n' \
                    '  "friend_list": list\n' \
-                   '   [\n' \
+                   '   [{\n' \
                    '     "voter_we_vote_id": string,\n' \
                    '     "voter_display_name": string,\n' \
                    '     "voter_photo_url_large": string,\n' \
@@ -74,8 +74,14 @@ def friend_list_doc_template_values(url_root):
                    '     "invitation_status": string,\n' \
                    '     "invitation_sent_to": string,\n' \
                    '     "positions_taken": number,\n' \
+                   '     "mutual_friend_count": number,\n' \
+                   '     "mutual_friend_preview_list": list\n' \
+                   '     [{\n' \
+                   '       "friend_display_name": string,\n' \
+                   '       "friend_photo_url_medium": string,\n' \
+                   '     }],\n' \
                    '     "mutual_friends": number,\n' \
-                   '   ],\n' \
+                   '   }],\n' \
                    '}'
 
     template_values = {

apis_v1/documentation_source/friend_lists_all_doc.py

@@ -57,7 +57,8 @@ def friend_lists_all_doc_template_values(url_root):
         'api_slug': 'friendListsAll',
         'api_introduction':
             "Request information about a voter's friends, including invitations to become a friend, "
-            "a list of current friends, and friends you share in common with another voter.  This API differs from friendList in that it "
+            "a list of current friends, and friends you share in common with another voter. "
+            "This API differs from friendList in that it "
             "returns six different lists at once.",
         'try_now_link': 'apis_v1:friendListsAllView',
         'url_root': url_root,

apis_v1/documentation_source/voter_contact_list_retrieve_doc.py

@@ -8,6 +8,11 @@ def voter_contact_list_retrieve_doc_template_values(url_root):
     Show documentation about voterContactListRetrieve
     """
     required_query_parameter_list = [
+        {
+            'name': 'voter_device_id',
+            'value': 'string',  # boolean, integer, long, string
+            'description': 'An 88 character unique identifier linked to a voter record on the server',
+        },
         {
             'name':         'api_key',
             'value':        'string (from post, cookie, or get (in that order))',  # boolean, integer, long, string
@@ -53,16 +58,17 @@ def voter_contact_list_retrieve_doc_template_values(url_root):
                    '     "has_data_from_google_people_api": boolean,\n' \
                    '     "ignore_contact": boolean,\n' \
                    '     "imported_by_voter_we_vote_id": string,\n' \
+                   '     "is_friend": boolean,\n' \
                    '     "state_code": string,\n' \
                    '   },],\n' \
                    '}'
 
     template_values = {
-        'api_name': 'voterPlanListRetrieve',
-        'api_slug': 'voterPlanListRetrieve',
+        'api_name': 'voterContactListRetrieve',
+        'api_slug': 'voterContactListRetrieve',
         'api_introduction':
             "Retrieve a voter_contact_list that we can display publicly.",
-        'try_now_link': 'apis_v1:voterPlanListRetrieveView',
+        'try_now_link': 'apis_v1:voterContactListRetrieveView',
         'try_now_link_variables_dict': try_now_link_variables_dict,
         'url_root': url_root,
         'get_or_post': 'GET',

apis_v1/documentation_source/voter_contact_save_doc.py

@@ -0,0 +1,74 @@
+# apis_v1/documentation_source/voter_contact_save_doc.py
+# Brought to you by We Vote. Be good.
+# -*- coding: UTF-8 -*-
+
+
+def doc_template_values(url_root):
+    """
+    Show documentation about voterContactSave
+    """
+    required_query_parameter_list = [
+        {
+            'name':         'api_key',
+            'value':        'string (from post, cookie, or get (in that order))',  # boolean, integer, long, string
+            'description':  'The unique key provided to any organization using the WeVoteServer APIs',
+        },
+        {
+            'name':         'voter_device_id',
+            'value':        'string',  # boolean, integer, long, string
+            'description':  'An 88 character unique identifier linked to a voter record on the server. ',
+        },
+        {
+            'name':         'email_address_text',
+            'value':        'string',  # boolean, integer, long, string
+            'description':  'The email of the VoterContactEmail that we want to alter.',
+        },
+    ]
+
+    optional_query_parameter_list = [
+        {
+            'name': 'ignore_voter_contact',
+            'value': 'boolean',  # boolean, integer, long, string
+            'description': 'Set to true if the voter wants to ignore this VoterContact entry.',
+        },
+    ]
+
+    potential_status_codes_list = [
+        {
+            'code':         'VALID_VOTER_DEVICE_ID_MISSING',
+            'description':  'A valid voter_device_id parameter was not included. Cannot proceed.',
+        },
+        {
+            'code':         'VOTER_NOT_FOUND_FROM_VOTER_DEVICE_ID',
+            'description':  'No voter could be found from the voter_device_id',
+        },
+    ]
+
+    try_now_link_variables_dict = {
+        # 'voter_device_id': '',
+    }
+
+    api_response = '{\n' \
+                   '  "success": boolean,\n' \
+                   '  "status": string,\n' \
+                   '  "ignore_voter_contact" boolean, \n' \
+                   '  "email_address_text": string, \n' \
+                   '}'
+
+    template_values = {
+        'api_name': 'voterContactSave',
+        'api_slug': 'voterContactSave',
+        'api_introduction':
+            'Make changes to specific voterContactEmail entries.',
+        'try_now_link': 'apis_v1:voterContactSaveView',
+        'try_now_link_variables_dict': try_now_link_variables_dict,
+        'url_root': url_root,
+        'get_or_post': 'get',
+        'required_query_parameter_list': required_query_parameter_list,
+        'optional_query_parameter_list': optional_query_parameter_list,
+        'api_response': api_response,
+        'api_response_notes':
+            "",
+        'potential_status_codes_list': potential_status_codes_list,
+    }
+    return template_values

apis_v1/documentation_source/voter_email_address_save_doc.py

@@ -80,12 +80,16 @@ def voter_email_address_save_doc_template_values(url_root):
                    '  "text_for_email_address": string,\n' \
                    '  "make_primary_email": boolean,\n' \
                    '  "delete_email": boolean,\n' \
-                   '  "email_address_saved_we_vote_id": string,\n' \
+                   '  "email_address_we_vote_id": string,\n' \
+                   '  "email_address_saved_we_vote_id": boolean,\n' \
+                   '  "email_address_already_owned_by_other_voter": boolean,\n' \
+                   '  "email_address_already_owned_by_this_voter": boolean,\n' \
                    '  "email_address_created": boolean,\n' \
-                   '  "email_address_deleted": boolean,\n' \
                    '  "email_address_not_valid": boolean,\n' \
+                   '  "email_address_deleted": boolean,\n' \
                    '  "verification_email_sent": boolean,\n' \
-                   '  "email_address_already_owned_by_other_voter": boolean,\n' \
+                   '  "link_to_sign_in_email_sent": boolean,\n' \
+                   '  "sign_in_code_email_sent": boolean,\n' \
                    '  "email_address_found": boolean,\n' \
                    '  "email_address_list_found": boolean,\n' \
                    '  "email_address_list": list\n' \
@@ -96,6 +100,7 @@ def voter_email_address_save_doc_template_values(url_root):
                    '     "email_ownership_is_verified": boolean,\n' \
                    '     "voter_we_vote_id": string,\n' \
                    '     "email_we_vote_id": string,\n' \
+                   '  "secret_code_system_locked_for_this_voter_device_id": boolean\n' \
                    '   ],\n' \
                    '}'
 

apis_v1/documentation_source/voter_email_address_sign_in_doc.py

@@ -48,7 +48,10 @@ def voter_email_address_sign_in_doc_template_values(url_root):
                    '  "voter_device_id": string (88 characters long),\n' \
                    '  "email_ownership_is_verified": boolean,\n' \
                    '  "email_secret_key_belongs_to_this_voter": boolean,\n' \
+                   '  "email_sign_in_attempted": boolean,\n' \
                    '  "email_address_found": boolean,\n' \
+                   '  "yes_please_merge_accounts": boolean,\n' \
+                   '  "voter_we_vote_id_from_secret_key": string,\n' \
                    '}'
 
     template_values = {