lostplaces/lostplaces_app/admin.py

@@ -6,15 +6,15 @@
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin
-from lostplaces_app.models import *
+from .models import *
 
-from lostplaces_app.forms import ExplorerCreationForm, ExplorerChangeForm
+from .forms import ExplorerCreationForm, ExplorerChangeForm
 
 # Register your models here.
 
 class VoucherAdmin(admin.ModelAdmin):
-    fields = ['code', 'expires_when', 'created_when']
-    readonly_fields = ['created_when']
+    fields = ['code', 'expires', 'created']
+    readonly_fields = ['created']
 
 admin.site.register(Explorer)
 admin.site.register(Voucher, VoucherAdmin)

lostplaces/lostplaces_app/models.py

@@ -33,7 +33,7 @@ class Explorer(models.Model):
     )
 
     def __str__(self):
-        return self.user.username
+        return self.user.name
         
 @receiver(post_save, sender=User)
 def create_user_profile(sender, instance, created, **kwargs):
@@ -54,11 +54,11 @@ class Voucher(models.Model):
     """
 
     code = models.CharField(unique=True, max_length=30)
-    created_when = models.DateTimeField(auto_now_add=True)
-    expires_when = models.DateTimeField()
+    created = models.DateTimeField(auto_now_add=True)
+    expires = models.DateField()
 
     def __str__(self):
-        return "Voucher " + str(self.code)
+        return "Voucher " + str(self.pk)
 
 
 class Place (models.Model):

lostplaces/lostplaces_app/tests/models/test_explorer_model.py

@@ -10,7 +10,7 @@ class ExplorerTestCase(TestCase):
     def setUpTestData(self):
         User.objects.create_user(
             username='testpeter',
-            password='Develop123'
+            
         )
 
     def test_epxlorer_creation(self):

lostplaces/lostplaces_app/tests/models/test_place_image_model.py

@@ -7,11 +7,10 @@ from django.test import TestCase
 from django.db import models
 from django.core.files import File
 from django.conf import settings
-from django.contrib.auth.models import User
 
 from lostplaces_app.models import PlaceImage, Place
 from lostplaces_app.tests.models import SubmittableTestCase
-from lostplaces_app.tests.models.test_place_model import PlaceTestCase
+from lostplaces_app.tests.models.test_place_model Test
 
 from easy_thumbnails.fields import ThumbnailerImageField
 
@@ -20,22 +19,8 @@ class TestPlaceImage(SubmittableTestCase, TestCase):
 
     @classmethod
     def setUpTestData(cls):
-        user = User.objects.create_user(
-            username='testpeter',
-            password='Develop123'
-        )
-        
-        place = Place.objects.create(
-            name='Im a place',
-            submitted_when=datetime.datetime.now(),
-            submitted_by=User.objects.get(username='testpeter').explorer,
-            location='Testtown',
-            latitude=50.5,
-            longitude=7.0,
-            description='This is just a test, do not worry'
-        )
-        place.tags.add('I a tag', 'testlocation')
-        place.save()
+
+        Place.setUpTestData()
 
         current_dir = os.path.dirname(os.path.abspath(__file__))
         if not os.path.isfile(os.path.join(settings.MEDIA_ROOT, 'im_a_image_copy.jpeg')):
@@ -43,13 +28,12 @@ class TestPlaceImage(SubmittableTestCase, TestCase):
                 os.path.join(current_dir, 'im_a_image.jpeg'),
                 os.path.join(settings.MEDIA_ROOT, 'im_a_image_copy.jpeg')
             )
-            
         PlaceImage.objects.create(
             description='Im a description',
             filename=os.path.join(settings.MEDIA_ROOT, 'im_a_image_copy.jpeg'),
-            place=place,
+            place=Place.objects.get(id=1),
             submitted_when=datetime.datetime.now(),
-            submitted_by=user.explorer
+            submitted_by=User.objects.get(username='testpeter').explorer
         )
 
     def test_description(self):

lostplaces/lostplaces_app/tests/models/test_place_model.py

@@ -19,15 +19,13 @@ class PlaceTestCase(SubmittableTestCase, TestCase):
 
     @classmethod
     def setUpTestData(cls):
-        user = User.objects.create_user(
-            username='testpeter',
-            password='Develop123'
-        )
-        
+
+        BaseData.setUpTestData()
+
         place = Place.objects.create(
             name='Im a place',
             submitted_when=datetime.datetime.now(),
-            submitted_by=user.explorer,
+            submitted_by=User.objects.get(username='testpeter').explorer,
             location='Testtown',
             latitude=50.5,
             longitude=7.0,
@@ -76,9 +74,9 @@ class PlaceTestCase(SubmittableTestCase, TestCase):
         of 10 places
         '''
         place_list = []
+        place = Place.objects.get(id=1)
+        place.id = None
         for i in range(10):
-            place = Place.objects.get(id=1)
-            place.id = None
             place.latitude = i+1
             place.longitude = i+10
             place.save()

lostplaces/lostplaces_app/tests/models/test_voucher_model.py

@@ -2,7 +2,6 @@ import datetime
 
 from django.test import TestCase
 from django.db import models
-from django.utils import timezone
 
 from lostplaces_app.models import Voucher
 from lostplaces_app.tests.models import ModelTestCase
@@ -15,9 +14,9 @@ class VoucheTestCase(ModelTestCase, TestCase):
     def setUpTestData(cls):
         Voucher.objects.create(
         code='ayDraJCCwfhcFiYmSR5GrcjcchDfcahv',
-        expires_when=timezone.now() + datetime.timedelta(days=1)
+        expires=datetime.datetime.now() + datetime.timedelta(days=1)
     )
-    
+
     def test_voucher_code(self):
         self._test_char_field(
             'code',
@@ -46,4 +45,4 @@ class VoucheTestCase(ModelTestCase, TestCase):
             msg='Expecting %s.__str__ to contain the voucher code' % (
                 self.model_name
             )
-        )
+        )

lostplaces/lostplaces_app/tests/views/test_base_views.py

@@ -1,8 +1,5 @@
-import datetime
-
 from django.test import TestCase, Client
 from django.urls import reverse_lazy
-from django.contrib.auth.models import User
 
 from lostplaces_app.models import Place
 
@@ -10,25 +7,6 @@ from django.contrib.auth.models import User
 
 class TestIsAuthenticated(TestCase):
 
-    @classmethod
-    def setUpTestData(cls):
-        user = User.objects.create_user(
-            username='testpeter',
-            password='Develop123'
-        )
-        
-        place = Place.objects.create(
-            name='Im a place',
-            submitted_when=datetime.datetime.now(),
-            submitted_by=User.objects.get(username='testpeter').explorer,
-            location='Testtown',
-            latitude=50.5,
-            longitude=7.0,
-            description='This is just a test, do not worry'
-        )
-        place.tags.add('I a tag', 'testlocation')
-        place.save()
-        
     def setUp(self):
         self. client = Client()
 
@@ -55,25 +33,6 @@ class TestIsAuthenticated(TestCase):
 
 class TestIsPlaceSubmitter(TestCase):
 
-    @classmethod
-    def setUpTestData(cls):
-        user = User.objects.create_user(
-            username='testpeter',
-            password='Develop123'
-        )
-        
-        place = Place.objects.create(
-            name='Im a place',
-            submitted_when=datetime.datetime.now(),
-            submitted_by=user.explorer,
-            location='Testtown',
-            latitude=50.5,
-            longitude=7.0,
-            description='This is just a test, do not worry'
-        )
-        place.tags.add('I a tag', 'testlocation')
-        place.save()
-
     def setUp(self):
         self. client = Client()
 

lostplaces/lostplaces_app/tests/views/test_place_views.py

@@ -1,32 +1,10 @@
-import datetime
-
 from django.test import TestCase, Client
 from django.urls import reverse_lazy
-from django.contrib.auth.models import User
 
 from lostplaces_app.models import Place
 
 class TestPlaceCreateView(TestCase):
-    
-    @classmethod
-    def setUpTestData(cls):
-        user = User.objects.create_user(
-            username='testpeter',
-            password='Develop123'
-        )
-        
-        place = Place.objects.create(
-            name='Im a place',
-            submitted_when=datetime.datetime.now(),
-            submitted_by=user.explorer,
-            location='Testtown',
-            latitude=50.5,
-            longitude=7.0,
-            description='This is just a test, do not worry'
-        )
-        place.tags.add('I a tag', 'testlocation')
-        place.save()
-        
+
     def setUp(self):
         self. client = Client()
 

lostplaces/lostplaces_app/urls.py

@@ -1,5 +1,5 @@
 from django.urls import path
-from lostplaces_app.views import (
+from .views import (
     HomeView, 
     PlaceDetailView, 
     PlaceListView,