Merge pull request #362 from brickbox-io/justin

Justin

bb_public/tests/__init__.py

@@ -0,0 +1 @@
+''' Allows access to the tests in the bb_public/tests directory. '''

bb_public/tests/test_urls.py

@@ -0,0 +1,68 @@
+''' bb_public - test_urls.py '''
+
+from django.test import TestCase
+from django.urls import reverse, resolve
+
+class TestUrls(TestCase):
+    '''
+    Tests performed for each URL:
+    - Internal reverse lookup provides the correct URL
+    - URL points to the same internal refrence
+    - The correct template is served for the URL (if applicable)
+    '''
+
+    def test_reverse_urls(self):
+        '''
+        Reverse lookup tests for each URL
+        '''
+        # Landing Page
+        url_landing_page = reverse('bb_public:landing_page')
+        self.assertEqual(url_landing_page, '/')
+
+        # Legal Page
+        url_legal_page = reverse('bb_public:legal_page')
+        self.assertEqual(url_legal_page, '/legal')
+
+        # Offline Page
+        url_offline_page = reverse('bb_public:pwa_offline')
+        self.assertEqual(url_offline_page, '/offline/')
+
+        # Email Form
+        url_forms_email_list = reverse('bb_public:email_list_form')
+        self.assertEqual(url_forms_email_list, '/forms/email_list')
+
+    def test_resolver_urls(self):
+        '''
+        Test that the correct view is used for the URL request.
+        '''
+        # Landing Page
+        resolver_landing_page = resolve('/')
+        self.assertEqual(resolver_landing_page.func.__name__, 'landing_page')
+        self.assertEqual(resolver_landing_page.args, ())
+        self.assertEqual(resolver_landing_page.kwargs, {})
+        self.assertEqual(resolver_landing_page.url_name, 'landing_page')
+        self.assertEqual(resolver_landing_page.view_name, 'bb_public:landing_page')
+
+        # Legal Page
+        resolver_legal_page = resolve('/legal')
+        self.assertEqual(resolver_legal_page.func.__name__, 'legal_page')
+        self.assertEqual(resolver_legal_page.args, ())
+        self.assertEqual(resolver_legal_page.kwargs, {})
+        self.assertEqual(resolver_legal_page.url_name, 'legal_page')
+        self.assertEqual(resolver_legal_page.view_name, 'bb_public:legal_page')
+
+        # Offline Page
+        resolver_offline_page = resolve('/offline/')
+        self.assertEqual(resolver_offline_page.func.__name__, 'pwa_offline')
+        self.assertEqual(resolver_offline_page.args, ())
+        self.assertEqual(resolver_offline_page.kwargs, {})
+        self.assertEqual(resolver_offline_page.url_name, 'pwa_offline')
+        self.assertEqual(resolver_offline_page.view_name, 'bb_public:pwa_offline')
+
+        # Email Form
+        resolver_email_form = resolve('/forms/email_list')
+        self.assertEqual(resolver_email_form.func.__name__, 'email_list_form')
+        self.assertEqual(resolver_email_form.args, ())
+        self.assertEqual(resolver_email_form.kwargs, {})
+        self.assertEqual(resolver_email_form.url_name, 'email_list_form')
+        self.assertEqual(resolver_email_form.view_name, 'bb_public:email_list_form')

bb_public/urls.py

@@ -7,12 +7,12 @@
 app_name = 'bb_public'
 
 urlpatterns = [
-   path('', views.landing, name='landing_page'),    # Landing/Home Page
-   path('legal', views.legal, name='legal_page'),
+    path('', views.landing_page, name='landing_page'),    # Landing/Home Page
+    path('legal', views.legal_page, name='legal_page'),   # Legal Page
 
-    # ----------------------------------- Forms ---------------------------------- #
-    path('forms/email_list/', views.forms_email_list, name='forms_email_list'),
+    # ------------------------------------ PWA ----------------------------------- #
+    path('offline/', views.pwa_offline, name='pwa_offline'),    # Offline Page
 
-   # ------------------------------------ PWA ----------------------------------- #
-   path('offline/', views.pwa_offline, name='pwa_offline'),
+    # ----------------------------------- Forms ---------------------------------- #
+    path('forms/email_list', views.email_list_form, name='email_list_form'),
 ]

bb_public/views.py

@@ -6,14 +6,14 @@
 from bb_public.models import EmailUpdateList
 
 # ------------------------------- Landing Page ------------------------------- #
-def landing(request):
+def landing_page(request):
     '''
     URL: brickbox.io
     '''
     return render(request, 'landing.html')
 
 # -------------------------------- Legal Page -------------------------------- #
-def legal(request):
+def legal_page(request):
     '''
     URL: brickbox.io/legal
     '''
@@ -23,7 +23,7 @@ def legal(request):
 #                                     Forms                                    #
 # ---------------------------------------------------------------------------- #
 
-def forms_email_list(request):
+def email_list_form(request):
     '''
     URL: brickbox.io/forms/email_list/
     '''

bb_tasks/tasks/billing.py

@@ -32,6 +32,7 @@ def threshold_resource_invoicing():
     for invoice_due in invoices_due:
         user_profile = UserProfile.objects.get(user=invoice_due.user)
 
+        # Indicates the user is month to month or on the credit system.
         if user_profile.threshold == 0 or user_profile.strikes >= 3:
             continue
 

bb_tasks/tasks/periodic.py

@@ -237,9 +237,10 @@ def resource_time_track():
 
                 tracker.save()
         except  VirtualBrickOwner.DoesNotExist:
-            return {
-                "Brick Owner DNE": f"{str(brick.id)}"
-            }
+            print(f"{brick} has no owner")
+            # return {
+            #     "Brick Owner DNE": f"{str(brick.id)}"
+            # }
 
         # return {
         #         "Brick Owner": f"{str(brick.id)}"