Started using Bootstrap for styling, moved app factory, added tests, started work on login and registration templates, and more

accounts/models/dog/__init__.py

@@ -2,6 +2,7 @@
 from datetime import datetime
 
 from sqlalchemy import Enum
+from sqlalchemy.ext.hybrid import hybrid_property
 
 # Import db
 from accounts.models import db
@@ -13,23 +14,44 @@ class Dog(db.Model):
     __tablename__ = 'dogs'
 
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    owner = db.relationship('User', back_populates='dogs')
+    owner_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
     name = db.Column(db.String, nullable=False)
     breed_size = db.Column(Enum(BreedSize), default=BreedSize.MEDIUM)
-    age = db.Column(db.DateTime, default=datetime(1970, 1, 1, 0, 0, 0))
-    owner_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
-    owner = db.relationship('User', back_populates='dogs')
+    birth_date = db.Column(db.DateTime, default=datetime(1970, 1, 1))
     visits = db.relationship('Visit', back_populates='dogs')
-    status = db.Column(Enum(Status), default=Status.ACTIVE)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(db.DateTime, onupdate=datetime.utcnow)
 
+    def __str__(self):
+        return self.name
+
     def __repr__(self):
-        return f'{self.name}'
+        return self.to_dict()
+
+    @hybrid_property
+    def status(self):
+        return self.owner.status
+
+    def get_age(self):
+        current_date = datetime.now()
+        age = (current_date.year - self.birth_date.year
+                - ((current_date.month, current_date.day) < (self.birth_date.month, self.birth_date.day)))
+
+        return age
 
     def to_dict(self):
         return {
+            'id': self.id,
+            'owner': self.owner,
+            'owner_id': self.owner_id,
             'name': self.name,
-            'breed': self.breed,
-            'owner': self.owner
+            'breed_size': self.breed_size,
+            'birth_date': self.birth_date,
+            'age': self.get_age(),
+            'visits': self.visits,
+            'status': self.status,
+            'created_at': self.created_at,
+            'updated_at': self.updated_at
         }
 

accounts/models/dog/breed_size.py

@@ -2,7 +2,8 @@ from enum import Enum
 from enum import auto
 
 class BreedSize(Enum):
-    SMALL = auto()
-    MEDIUM = auto()
-    LARGE = auto()
+    SMALL = 'Small'
+    MEDIUM = 'Medium'
+    LARGE = 'Large'
+    XLARGE = 'X-large'
 

accounts/models/user.py

@@ -1,8 +1,12 @@
 from datetime import datetime
 
+from sqlalchemy import Enum
+
 # Import db
 from accounts.models import db
 
+from accounts.models.status import Status
+
 class User(db.Model):
     __tablename__ = 'users'
 
@@ -14,11 +18,15 @@ class User(db.Model):
     password = db.Column(db.String, nullable=False)
     dogs = db.relationship('Dog', back_populates='owner')
     visits = db.relationship('Visit', back_populates='owner')
+    status = db.Column(Enum(Status), default=Status.ACTIVE)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(db.DateTime, onupdate=datetime.utcnow)
 
+    def __str__(self):
+        return self.name
+
     def __repr__(self):
-        return f'{self.username}'
+        return self.to_dict()
 
     # Get all dogs currently set
     def get_dogs(self):
@@ -29,15 +37,23 @@ class User(db.Model):
         return [visit for visit in self.visits]
 
     # Retrieve past booked visits
-    def get_visit_history(self):
+    def get_visit_overview(self):
         current_time = datetime.now()
 
         return [visit for visit in self.visits if visit.date_time < current_time]
 
     def to_dict(self):
         return {
+            'name': self.name,
             'username': self.username,
             'email': self.email,
+            'address': self.address,
             'password': self.password,
+            'dogs': self.get_dogs(),
+            'visits': self.get_visits(),
+            'status': self.status,
+            'created_at': self.created_at,
+            'updated_at': self.updated_at
+
         }
 

accounts/models/visit/__init__.py

@@ -17,12 +17,18 @@ class Visit(db.Model):
     date_time = db.Column(db.DateTime, nullable=False)
     owner_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
     owner = db.relationship('User', back_populates='visits')
-    visit_type = db.Column(Enum(VisitType), default=VisitType.MEDIUM_MINUTE_WALK)
+    visit_type = db.Column(Enum(VisitType), default=VisitType.MEDIUM_WALK)
     dog_id = db.Column(db.Integer, db.ForeignKey('dogs.id'), nullable=False)
     dogs = db.relationship('Dog', back_populates='visits')
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(db.DateTime, onupdate=datetime.utcnow)
 
+    def __str__(self):
+        return self.date_time
+
+    def __repr__(self):
+        return self.to_dict()
+
     def get_date(self):
         year = self.date_time.year
         month = self.date_time.month
@@ -42,9 +48,14 @@ class Visit(db.Model):
 
     def to_dict(self):
         return {
-            'ID': self.id,
-            'Date-Time': self.date_time,
-            'Owner-ID': self.owner_id,
-            'Dog-ID': self.dog_id
+            'id': self.id,
+            'date_time': self.date_time,
+            'owner_id': self.owner_id,
+            'owner': self.owner,
+            'visit_type': self.visit_type,
+            'dog_id': self.dog_id,
+            'dogs': self.dogs,
+            'created_at': self.created_at,
+            'updated_at': self.update_at
         }
 

accounts/models/visit/visit_type.py

@@ -2,8 +2,8 @@ from enum import Enum
 from enum import auto
 
 class VisitType(Enum):
-    SMALL_MINUTE_WALK = auto()
-    MEDIUM_MINUTE_WALK = auto()
-    LARGE_MINUTE_WALK = auto()
-    HOUSE_SITTING = auto()
+    SMALL_WALK = '15-minute walk'
+    MEDIUM_WALK = '30-minute walk'
+    LARGE_WALK = '45-minute walk'
+    HOUSE_SITTING = 'House sitting'