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

accounts/models/dog.py

@@ -1,21 +0,0 @@
-from accounts.models import db
-
-class Dog(db.Model):
-    __tablename__ = 'dogs'
-
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    name = db.Column(db.String, nullable=False)
-    breed = db.Column(db.String, nullable=False)
-    owner_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
-    owner = db.relationship('User', backref='dogs')
-
-    def __repr__(self):
-        return f'{self.name}'
-
-    def to_dict(self):
-        return {
-            'name': self.name,
-            'breed': self.breed,
-            'owner': self.owner
-        }
-

accounts/models/dog/__init__.py

@@ -0,0 +1,35 @@
+# Standard library imports
+from datetime import datetime
+
+from sqlalchemy import Enum
+
+# Import db
+from accounts.models import db
+
+from accounts.models.dog.breed_size import BreedSize
+from accounts.models.status import Status
+
+class Dog(db.Model):
+    __tablename__ = 'dogs'
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    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')
+    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 __repr__(self):
+        return f'{self.name}'
+
+    def to_dict(self):
+        return {
+            'name': self.name,
+            'breed': self.breed,
+            'owner': self.owner
+        }
+

accounts/models/dog/breed_size.py

@@ -0,0 +1,8 @@
+from enum import Enum
+from enum import auto
+
+class BreedSize(Enum):
+    SMALL = auto()
+    MEDIUM = auto()
+    LARGE = auto()
+

accounts/models/status.py

@@ -0,0 +1,7 @@
+from enum import Enum
+from enum import auto
+
+class Status(Enum):
+    INACTIVE = auto()
+    ACTIVE = auto()
+

accounts/models/user.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 # Import db
 from accounts.models import db
 
@@ -5,11 +7,15 @@ class User(db.Model):
     __tablename__ = 'users'
 
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    name = db.Column(db.String, nullable=False)
     username = db.Column(db.String, unique=True, nullable=False)
     email = db.Column(db.String, nullable=False)
     address = db.Column(db.String, nullable=False)
     password = db.Column(db.String, nullable=False)
+    dogs = db.relationship('Dog', back_populates='owner')
     visits = db.relationship('Visit', back_populates='owner')
+    created_at = db.Column(db.DateTime, default=datetime.utcnow)
+    updated_at = db.Column(db.DateTime, onupdate=datetime.utcnow)
 
     def __repr__(self):
         return f'{self.username}'

accounts/models/visit.py

@@ -1,21 +0,0 @@
-# Import db
-from accounts.models import db
-
-class Visit(db.Model):
-    __tablename__ = 'visits'
-
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    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')
-    dog_id = db.Column(db.Integer, db.ForeignKey('dogs.id'), nullable=False)
-    dog = db.relationship('Dog', backref='visits')
-
-    def to_dict(self):
-        return {
-            'ID': self.id,
-            'Date-Time': self.date_time,
-            'Owner-ID': self.owner_id,
-            'Dog-ID': self.dog_id
-        }
-

accounts/models/visit/__init__.py

@@ -0,0 +1,50 @@
+from datetime import datetime
+
+# Import SQLAlchemy enum type
+from sqlalchemy import Enum
+
+# Import db
+from accounts.models import db
+
+# Import custom enum db column
+from accounts.models.status import Status
+from accounts.models.visit.visit_type import VisitType
+
+class Visit(db.Model):
+    __tablename__ = 'visits'
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    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)
+    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 get_date(self):
+        year = self.date_time.year
+        month = self.date_time.month
+        day = self.date_time.month
+
+        return f'{year}-{month}-{day}'
+
+    def get_time(self):
+        hour = self.date_time.hour
+        minute = self.date_time.minute
+
+        if hour == 0 and minute == 0:
+            return 0
+
+        else:
+            return f'{hour}:{minute}'
+
+    def to_dict(self):
+        return {
+            'ID': self.id,
+            'Date-Time': self.date_time,
+            'Owner-ID': self.owner_id,
+            'Dog-ID': self.dog_id
+        }
+

accounts/models/visit/visit_type.py

@@ -0,0 +1,9 @@
+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()
+