fixing: solved conflicts in app.py

josethz00 · josethz00 · commit 7057dd8b41c1 · 2021-03-01T11:19:14.000-03:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,6 +3,8 @@
     "python.linting.flake8Enabled": true,
     "python.linting.flake8Args": [
         "--ignore=E303", 
-        "--ignore=E302"
+        "--ignore=E302",
+        "--ignore=F401"
     ],
+    "python.pythonPath": "server/.venv"
 }
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ $ cd server
 -----------------------------------
 
 ```
-$ pip3 install -r requirements.txt
+$ pip3 install -r requirements/requirements.txt
 ```
 
 4- Start Flask server
diff --git a/server/.editorconfig b/server/.editorconfig
@@ -9,4 +9,4 @@ indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = true
+insert_final_newline = true
diff --git a/server/.gitignore b/server/.gitignore
@@ -1,4 +1,6 @@
-.env
+.venv
 env
 __pycache__
-dump.rdb
+dump.rdb
+.vscode
+variables.py
diff --git a/server/app.py b/server/app.py
@@ -1,19 +1,41 @@
 from flask import Flask
+from flask_cors import CORS
+from werkzeug.exceptions import HTTPException
+from flask_mail import Mail
+
 from src.shared.utils.exception_handler import exception_handler
 from src.modules.projects.project_blueprint import project_bp
 from src.modules.users.user_blueprint import user_bp
 from src.modules.tasks.task_blueprint import task_bp
+from src.shared.database.sql_connector import SQLConnector
+from src.shared.database.db import db
+from config import variables, extensions
+import manage
 
 
 def create_app() -> Flask:
 
     app = Flask(__name__)
     db_conn = SQLConnector()
 
+    configure_cors(app, extensions.cors)
+
+    app.config['SQLALCHEMY_DATABASE_URI'] = db_conn.connection_url
+    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+
+    app.config['MAIL_SERVER'] = variables.MAIL_SERVER
+    app.config['MAIL_PORT'] = variables.MAIL_PORT
+    app.config['MAIL_USERNAME'] = variables.MAIL_USERNAME
+    app.config['MAIL_PASSWORD'] = variables.MAIL_PASSWORD
+    app.config['MAIL_USE_TLS'] = bool(variables.MAIL_USE_TLS)
+    app.config['MAIL_USE_SSL'] = bool(variables.MAIL_USE_SSL)
+
     db.init_app(app)
     with app.app_context():
         db.create_all()
 
+    configure_mail(app, extensions.mail)
+
     app.register_blueprint(user_bp)
     app.register_blueprint(project_bp)
     app.register_blueprint(task_bp)
@@ -23,3 +45,11 @@ def get_error(error):
         return exception_handler(error)
 
     return app
+
+
+def configure_mail(app: Flask, mail: Mail) -> None:
+    mail.init_app(app)
+
+
+def configure_cors(app: Flask, cors: CORS) -> None:
+    cors.init_app(app)
diff --git a/server/config/extensions.py b/server/config/extensions.py
@@ -0,0 +1,8 @@
+from flask_mail import Mail
+from flask_cors import CORS
+
+from config import variables
+
+
+mail = Mail()
+cors = CORS()
diff --git a/server/config/variables.example.py b/server/config/variables.example.py
@@ -0,0 +1,35 @@
+import os
+
+
+os.environ['HOST'] = '0.0.0.0'
+os.environ['PORT'] = '5000'
+os.environ['SQL_DATABASE'] = 'your database'
+os.environ['DATABASE_USER'] = 'your user database'
+os.environ['DATABASE_PASSWORD'] = 'your database password'
+os.environ['DATABASE_NAME'] = 'your database name'
+os.environ['DATABASE_HOST'] = 'your local ipv4 or remote host'
+os.environ['DATABASE_PORT'] = 'the port thatthe database is running'
+os.environ['FLASK_ENV'] = 'development | production | testing'
+os.environ['SECRET_KEY'] = 'your secret key'
+os.environ['MAIL_SERVER'] = 'mail server'
+os.environ['MAIL_PORT'] = 'mail server port'
+os.environ['MAIL_USERNAME'] = 'mail username'
+os.environ['MAIL_PASSWORD'] = 'mail password'
+
+HOST = os.environ.get('HOST')
+PORT = os.environ.get('PORT')
+DEBUG = True
+SQL_DATABASE = os.environ.get('SQL_DATABASE')
+DATABASE_USER = os.environ.get('DATABASE_USER')
+DATABASE_PASSWORD = os.environ.get('DATABASE_PASSWORD')
+DATABASE_NAME = os.environ.get('DATABASE_NAME')
+DATABASE_HOST = os.environ.get('DATABASE_HOST')
+DATABASE_PORT = os.environ.get('DATABASE_PORT')
+FLASK_ENV = os.environ.get('FLASK_ENV')
+SECRET_KEY = os.environ.get('SECRET_KEY')
+MAIL_SERVER = os.environ.get('MAIL_SERVER')
+MAIL_PORT = os.environ.get('MAIL_PORT')
+MAIL_USERNAME = os.environ.get('MAIL_USERNAME')
+MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD')
+MAIL_USE_TLS = True
+MAIL_USE_SSL = False
diff --git a/server/manage.py b/server/manage.py
@@ -0,0 +1,3 @@
+from src.modules.users.user import User
+from src.modules.projects.project import Project
+from src.modules.tasks.task import Task
diff --git a/server/requirements/requirements.dev.txt b/server/requirements/requirements.dev.txt
@@ -0,0 +1,2 @@
+-r requirements.txt
+flake8
diff --git a/server/requirements/requirements.txt b/server/requirements/requirements.txt
@@ -1,6 +1,7 @@
 flask
+psycopg2-binary
 flask_sqlalchemy
 flask_cors
 gunicorn
-celery
-redis
+Flask-Mail
+PyJWT
diff --git a/server/src/modules/projects/project.py b/server/src/modules/projects/project.py
@@ -1,3 +1,38 @@
-class Project:
+from datetime import datetime
 
-    __tablename__ = 'project'
+from src.shared.database.db import db
+
+
+class Project(db.Model):
+
+    __tablename__ = 'projects'
+
+    id = db.Column(db.Integer, primary_key=True, nullable=False)
+    title = db.Column(db.String(50), nullable=False)
+    description = db.Column(db.String(250), nullable=False)
+    created_at = db.Column(
+        db.DateTime(),
+        default=datetime.utcnow(),
+        nullable=False
+    )
+    updated_at = db.Column(
+        db.DateTime(),
+        default=datetime.utcnow(),
+        onupdate=datetime.utcnow(),
+        nullable=False
+    )
+    user_id = db.Column(
+        db.Integer,
+        db.ForeignKey('users.id'),
+        nullable=True
+    )
+
+    task = db.relationship(
+        'Task',
+        backref='projects',
+        cascade='all, delete-orphan',
+        uselist=True
+    )
+
+    def __repr__(self):
+        return '<Project %r>' % self.id
diff --git a/server/src/modules/projects/project_blueprint.py b/server/src/modules/projects/project_blueprint.py
@@ -1,8 +1,46 @@
-from flask import Blueprint
+from flask import Blueprint, request
+import json
+
+from src.modules.projects.project import Project
+from src.shared.database.db import db
+from src.shared.middlewares.auth_middleware import auth_middleware
 
 project_bp = Blueprint('projects', __name__, url_prefix='/projects')
 
 
-project_bp.route('/', methods=['GET'])
-def index():
-    return 'hello'
+@project_bp.route('', methods=['GET'])
+@auth_middleware
+def index() -> json:
+    results = []
+    projects = Project.query().all()
+
+    for project in projects:
+        results.append(
+            {
+                'id': project.id,
+                'title': project.title,
+                'description': project.description
+            }
+        )
+
+    return json.dumps(results), 200
+
+
+@project_bp.route('', methods=['POST'])
+@auth_middleware
+def store() -> json:
+    title, description, user_id = request.json.values()
+
+    new_project = Project(
+        title=title,
+        description=description,
+        user_id=user_id
+    )
+    db.session.add(new_project)
+    db.session.commit()
+
+    return json.dumps(
+        {
+            'success': f'New project created: {new_project.title}!'
+        }
+    ), 201
diff --git a/server/src/modules/tasks/task.py b/server/src/modules/tasks/task.py
@@ -1,3 +1,37 @@
-class Task:
+from datetime import datetime
 
-    __tablename__ = 'task'
+from src.shared.database.db import db
+
+
+class Task(db.Model):
+
+    __tablename__ = 'tasks'
+
+    id = db.Column(db.Integer, primary_key=True, nullable=False)
+    title = db.Column(db.String(50), nullable=False)
+    description = db.Column(db.String(250), nullable=False)
+    priority = db.Column(db.String(10), nullable=False)
+    created_at = db.Column(
+        db.DateTime(),
+        default=datetime.utcnow(),
+        nullable=False
+    )
+    updated_at = db.Column(
+        db.DateTime(),
+        default=datetime.utcnow(),
+        onupdate=datetime.utcnow(),
+        nullable=False
+    )
+    user_id = db.Column(
+        db.Integer,
+        db.ForeignKey('users.id'),
+        nullable=True
+    )
+    project_id = db.Column(
+        db.Integer,
+        db.ForeignKey('projects.id'),
+        nullable=False
+    )
+
+    def __repr__(self):
+        return '<Task %r>' % self.id
diff --git a/server/src/modules/tasks/task_blueprint.py b/server/src/modules/tasks/task_blueprint.py
@@ -1,8 +1,48 @@
-from flask import Blueprint
+from flask import Blueprint, request
+import json
 
-task_bp = Blueprint('task', __name__, url_prefix='/task')
+from src.modules.tasks.task import Task
+from src.shared.database.db import db
+from src.shared.middlewares.auth_middleware import auth_middleware
 
+task_bp = Blueprint('task', __name__, url_prefix='/tasks')
 
-task_bp.route('/', methods=['GET'])
-def index():
-    return 'hello'
+
+@task_bp.route('/', methods=['GET'])
+@auth_middleware
+def index() -> json:
+    results = []
+    tasks = Task.query().all()
+
+    for task in tasks:
+        results.append(
+            {
+                'id': task.id,
+                'title': task.title,
+                'description': task.description
+            }
+        )
+
+    return json.dumps(results), 200
+
+
+@task_bp.route('/', methods=['POST'])
+@auth_middleware
+def store() -> json:
+    title, description, priority, user_id, project_id = request.json.values()
+
+    new_task = Task(
+        title=title,
+        description=description,
+        priority=priority,
+        user_id=user_id,
+        project_id=project_id
+    )
+    db.session.add(new_task)
+    db.session.commit()
+
+    return json.dumps(
+        {
+            'success': f'New task created: {new_task.title}!'
+        }
+    ), 201
diff --git a/server/src/modules/users/user.py b/server/src/modules/users/user.py
@@ -1,3 +1,36 @@
-class Users:
+from datetime import datetime
+from dataclasses import dataclass
+
+from src.shared.database.db import db
+
+
+@dataclass
+class User(db.Model):
+
+    id: int
+    username: str
+    email: str
+    password: str
+    created_at: datetime
+    updated_at: datetime
 
     __tablename__ = 'users'
+
+    id = db.Column(db.Integer, primary_key=True, nullable=False)
+    username = db.Column(db.String(50), unique=True, nullable=False)
+    email = db.Column(db.String(100), unique=True, nullable=False)
+    password = db.Column(db.String, nullable=False)
+    created_at = db.Column(
+        db.DateTime(),
+        default=datetime.utcnow(),
+        nullable=False
+    )
+    updated_at = db.Column(
+        db.DateTime(),
+        default=datetime.utcnow(),
+        onupdate=datetime.utcnow(),
+        nullable=False
+    )
+
+    def __repr__(self):
+        return '<User %r>' % self.id
diff --git a/server/src/modules/users/user_blueprint.py b/server/src/modules/users/user_blueprint.py
diff --git a/server/src/shared/database/db.py b/server/src/shared/database/db.py
diff --git a/server/src/shared/database/sql_connector.py b/server/src/shared/database/sql_connector.py
diff --git a/server/src/shared/middlewares/auth_middleware.py b/server/src/shared/middlewares/auth_middleware.py
diff --git a/server/src/shared/utils/jwt_handler.py b/server/src/shared/utils/jwt_handler.py
diff --git a/server/src/shared/utils/mail_handler.py b/server/src/shared/utils/mail_handler.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from src.modules.users.user import User`
	`2`	`+from src.modules.projects.project import Project`
	`3`	`+from src.modules.tasks.task import Task`