Added __init__.py for stripe_donations

Author: SailingSteve

admin_tools/views.py

@@ -2,7 +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_python_version, LOGIN_URL
+from config.base import get_environment_variable, get_git_merge_date, get_node_version, get_postgres_version, \
+    get_python_version, LOGIN_URL
 from ballot.models import BallotReturned, VoterBallotSaved
 from candidate.models import CandidateCampaign, CandidateManager
 from candidate.controllers import candidates_import_from_sample_file
@@ -110,6 +111,7 @@ def admin_home_view(request):
         'python_version':                     get_python_version(),
         'node_version':                       get_node_version(),
         'git_merge_date':                     get_git_merge_date(),
+        '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,
         'shared_links_count':                 shared_links_count,

config/base.py

@@ -10,6 +10,7 @@
 import pathlib
 import re
 from django.core.exceptions import ImproperlyConfigured
+from django.db import connection
 
 # Consider switching to the way that Two Scoops of Django 1.8 suggests file path handling, section 5.6
 # from unipath import Path
@@ -59,7 +60,7 @@ def get_environment_variable_default(var_name, default_value):
 
 
 def get_python_version():
-    version = os.popen('python --version').read().strip()
+    version = os.popen('python --version').read().strip().replace('Python', '')
     print(version)    # Something like 'Python 3.7.2'
     return version
 
@@ -69,7 +70,7 @@ def get_node_version():
     raw = os.popen('node -v').read().replace('\n', '').strip()
     version = 'Node not installed on this server'
     if len(raw) > 0:
-        version = "Node " + os.popen('node -v').read().replace('\n', '').strip()
+        version = os.popen('node -v').read().replace('\n', '').strip()
     print(version)    # Something like 'v14.15.1'
     return version
 
@@ -89,6 +90,16 @@ def get_git_merge_date():
     return out_string
 
 
+def get_postgres_version():
+    formatted = 'fail'
+    try:
+        version = str(connection.cursor().connection.server_version)
+        formatted = version[0:2] + '.' + version[2:4] + '.' + version[4:6]
+    except Exception:
+        pass
+    print('Postgres ', formatted)
+    return formatted
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 PROJECT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))

stripe_donations/migrations/__init__.py

@@ -424,7 +424,7 @@ def retrieve_or_create_recurring_donation_plan(voter_we_vote_id, we_plan_id, don
             try:
                 plan_id_query = stripe.Plan.retrieve(we_plan_id)
             except stripe.error.StripeError as stripeError:
-                logger.error('Stripe (informational for splunk) error (1): %s', stripeError)
+                # logger.error('Stripe (informational for splunk) error (1): %s', stripeError)
                 pass
 
             if positive_value_exists(plan_id_query):

stripe_donations/models.py

@@ -160,9 +160,24 @@ <h2>Maintenance</h2>
 {# This information does not have to be on the front page, as long as it can be found somewhere #}
 <h4>Technical Information</h4>
 <p>
-    Running: {{ python_version }}<br>
-    Running: {{ node_version }}<br>
-    Git date:&nbsp; {{git_merge_date}}<br>
+    <table>
+        <tr>
+            <td>Python:</td>
+            <td>{{ python_version }}</td>
+        </tr>
+        <tr>
+            <td>Node:</td>
+            <td>{{ node_version }}</td>
+        </tr>
+        <tr>
+            <td>Postgres:&nbsp;&nbsp;</td>
+            <td>{{ postgres_version }}</td>
+        </tr>
+        <tr>
+            <td>Git date:</td>
+            <td>{{git_merge_date}}</td>
+        </tr>
+     </table>
 </p>
 
 {%  endblock %}