Merge pull request #9 from Matsadura/db_models

[UPDATE] Change DB Schema

server/api/app.py

@@ -13,6 +13,7 @@
 app.register_blueprint(app_views)
 HOST = "0.0.0.0"
 PORT = 5000
+SECRET_KEY = os.getenv('SECRET_KEY')
 
 
 @app.route('/volumes')

server/api/views/index.py

@@ -13,11 +13,11 @@ def status():
 def stats():
     """Return the count of all classes"""
     from models.user import User
-    from models.mood import Mood
-    from models.recommendation import Recommendation
+    from models.movie import Movie
+    from models.user_movie import User_Movie
     from models import storage
 
     return {"Users": storage.count(User),
-            "Moods": storage.count(Mood),
-            "Recommendations": storage.count(Recommendation)
+            "Movies": storage.count(Movie),
+            "User_Movies": storage.count(User_Movie)
             }

server/models/engine/db_storage.py

@@ -4,14 +4,14 @@
 """
 
 from models.base_model import BaseModel, Base
-from models.mood import Mood
-from models.recommendation import Recommendation
+from models.movie import Movie
+from models.user_movie import User_Movie
 from models.user import User
 from os import getenv
 from sqlalchemy import create_engine
 from sqlalchemy.orm import scoped_session, sessionmaker
 
-classes = {"Mood": Mood, "Recommendation": Recommendation, "User": User}
+classes = {"Movie": Movie, "User_Movie": User_Movie, "User": User}
 
 
 class DBStorage:

server/models/movie.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+"""Holds class Movie"""
+from models.base_model import BaseModel, Base
+from sqlalchemy import Column, String
+from sqlalchemy.orm import relationship
+
+
+class Movie(BaseModel, Base):
+    """Representation of a user """
+    __tablename__ = 'movies'
+    movie = Column(String(60), nullable=False)
+    user_movies = relationship("User_Movie",
+                               back_populates="movie",
+                               cascade="all, delete-orphan")
+
+    def __init__(self, *args, **kwargs):
+        """Initializes user"""
+        super().__init__(*args, **kwargs)

server/models/user.py

@@ -13,10 +13,10 @@ class User(BaseModel, Base):
     password = Column(String(128), nullable=False)
     first_name = Column(String(128), nullable=False)
     last_name = Column(String(128), nullable=False)
-    recent_mood = Column(String(24), nullable=False)
-    recommendations = relationship("Recommendation",
-                                   back_populates="user",
-                                   cascade="all, delete-orphan")
+    avatar = Column(String(256), nullable=True)
+    user_movies = relationship("User_Movie",
+                               back_populates="user",
+                               cascade="all, delete-orphan")
 
     def __init__(self, *args, **kwargs):
         """Initializes user"""

server/models/user_movie.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+"""Holds class User_Movie"""
+from models.base_model import BaseModel, Base
+from sqlalchemy import Column, String, Boolean, ForeignKey
+from sqlalchemy.orm import relationship
+
+
+class User_Movie(BaseModel, Base):
+    """Representation of a vault """
+    __tablename__ = 'user_movies'
+    user_id = Column(String(128),
+                     ForeignKey('users.id', ondelete='CASCADE'),
+                     nullable=False)
+    movie_id = Column(String(128),
+                      ForeignKey('movies.id', ondelete='CASCADE'),
+                      nullable=False)
+    seen = Column(Boolean, nullable=True)
+    like = Column(Boolean, nullable=True)
+    movie = relationship("Movie", back_populates="user_movies")
+    user = relationship("User", back_populates="user_movies",)
+
+    def __init__(self, *args, **kwargs):
+        """initializes vault"""
+        super().__init__(*args, **kwargs)