Added new functionality, refactored, added CHANGELOG.md, and more

tests/test_user_model.py

@@ -0,0 +1,43 @@
+# Import libraries
+import pytest
+
+# Import db
+from accounts.models import db
+
+# Import db models
+from accounts.models.dog import Dog
+from accounts.models.dog.breed_size import BreedSize
+from accounts.models.user import User
+from accounts.models.visit.visit_type import VisitType
+
+# Import flask app factory function
+from tests.testing_app import create_app
+from tests.testing_app import create_app
+
+def test_db():
+    app = create_app()
+
+    with app.app_context():
+        man_man = db.session.execute(db.select(User).where(User.name == 'Man Man')).scalar_one()
+        man_man_bookings = man_man.get_bookings()
+
+        real_person = db.session.execute(db.select(User).where(User.name == 'Real Person')).scalar_one()
+        real_person_bookings = real_person.get_bookings()
+
+    # Assert something
+    assert man_man.id == 1
+    assert man_man.name == 'Man Man'
+    assert man_man.username == 'mamanman'
+    assert man_man.email == 'man_man@email.com'
+    assert man_man.address == '123 Home Ln. City, AA 11223'
+    assert man_man.password == 'manword'
+    assert len(man_man_bookings) == 2
+
+    assert real_person.id == 2
+    assert real_person.name == 'Real Person'
+    assert real_person.username == 'imarealperson'
+    assert real_person.email == 'real_person@email.com'
+    assert real_person.address == '113 Park St. City, AA 13433'
+    assert real_person.password == 'realpassword'
+    assert len(real_person_bookings) == 1
+

tests/testing_app.py

@@ -13,8 +13,10 @@ from accounts.models import db
 
 # Import db models
 from accounts.models.dog import Dog
+from accounts.models.dog.breed_size import BreedSize
 from accounts.models.user import User
 from accounts.models.visit import Visit
+from accounts.models.visit.visit_type import VisitType
 
 def create_app():
     # Initialize flask app
@@ -39,39 +41,72 @@ def create_app():
 
 def add_test_data(db):
     # Create test users
-    test_user1 = User(username='test_user1',
-                     email='testing@email.com',
-                     address='123 Home Ln. Baltimore,MD 12345',
-                     password='12345')
+    man_man = User(name='Man Man',
+                   username='mamanman',
+                   email='man_man@email.com',
+                   address='123 Home Ln. City, AA 11223',
+                   password='manword')
+
+    real_person = User(name='Real Person',
+                       username='imarealperson',
+                       email='real_person@email.com',
+                       address='113 Park St. City, AA 13433',
+                       password='realpassword')
 
     # Add test users to db session
-    db.session.add(test_user1)
+    db.session.add(man_man)
+    db.session.add(real_person)
 
     # Commit test users to db
     db.session.commit()
 
     # Create test dogs
-    test_dog1 = Dog(name='Lassey',
-                    breed='Golden Retreiver',
-                    owner_id=test_user1.id)
-    test_dog2 = Dog(name='Rufus',
-                    breed='Basset Hound',
-                    owner_id=test_user1.id)
+    lassey = Dog(name='Lassey',
+                 breed_size=BreedSize.LARGE,
+                 owner_id=man_man.id)
+
+    rufus = Dog(name='Rufus',
+                breed_size=BreedSize.SMALL,
+                owner_id=man_man.id)
+
+    air_bud = Dog(name='Air Bud',
+                  owner_id=real_person.id)
 
     # Add test dogs to db session
-    db.session.add(test_dog1)
-    db.session.add(test_dog2)
+    db.session.add(lassey)
+    db.session.add(rufus)
+    db.session.add(air_bud)
 
     # Commit test dogs to db
     db.session.commit()
 
     # Create test visits
+
+    # Visit with the date in the past
     test_visit1 = Visit(date_time=datetime(2023,12,5,10,30),
-                       owner_id=test_user1.id,
-                       dog_id=test_dog2.id)
+                        owner_id=man_man.id,
+                        dog_id=rufus.id)
+
+    # Visit with the date in the future
+    test_visit2 = Visit(date_time=datetime(2034,12,5,10,30),
+                        owner_id=man_man.id,
+                        dog_id=lassey.id)
+
+    # Visit with non-default visit type
+    test_visit3 = Visit(date_time=datetime(2034,12,5,10,30),
+                        owner_id=real_person.id,
+                        visit_type=VisitType.HOUSE_SITTING,
+                        dog_id=air_bud.id)
+
+    # Visit with more than one dog
+    #test_visit3 = Visit(date_time=datetime(2034,12,5,10,30),
+    #                    owner_id=man_man.id,
+    #                    dog_id=[lassey.id, rufus.id])
 
     # Add test visits to db session
     db.session.add(test_visit1)
+    db.session.add(test_visit2)
+    db.session.add(test_visit3)
 
     # Commit test visits to db
     db.session.commit()