Merge branch 'routes' into swagger

Author: petak5

.editorconfig

@@ -5,6 +5,7 @@ root = true
 indent_style = space
 end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.py]
 indent_style = space

src/api/__init__.py

@@ -4,6 +4,8 @@
 
 from flask import Flask
 app = Flask(__name__)
+# Disable sorting of the jsonified data
+app.config['JSON_SORT_KEYS'] = False
 
 from api.models import db
 import api.models

src/api/controllers/projectController.py

@@ -1,14 +1,134 @@
-from api.models import db, Project
+from api.models import db, Project, UserHasProject, ProjectLink, ProjectFeedback
 
 class ProjectController:
     session = db.session()
+
+    # Project
     def create_project(self, **kwargs):
-        project = Project(**kwargs)
-        self.session.add(project)
-        self.session.commit()
+        try:
+            project = Project(**kwargs)
+            self.session.add(project)
+            self.session.commit()
+
+            return project
+        except:
+            return None
+
+    def update_project(self, id, **kwargs):
+        project = Project.query.filter_by(id=id).first()
+
+        if project == None:
+            return None
+        
+        for key, value in kwargs.items():
+            if not hasattr(project, key):
+                return None
+
+        for key, value in kwargs.items():
+            setattr(project, key, value)
+
+        db.session.commit()
+
+        return project
 
     def get_project(self, **kwargs):
         project = Project.query.filter_by(**kwargs).first()
+
+        return project
+
+    def get_all_projects(self, **kwargs):
+        all_projects = Project.query.all()
+
+        return all_projects
+
+    def delete_project(self, id):
+        # Remove all project's links
+        for link in ProjectLink.query.filter_by(project_id=id).all():
+            db.session.delete(link)
+
+        # Remove project from all users
+        for project in UserHasProject.query.filter_by(project_id=id).all():
+            db.session.delete(project)
+
+        project = Project.query.filter_by(id=id).first()
+
+        if project == None:
+            return project
+
+        db.session.delete(project)
+        db.session.commit()
+
         return project
 
+    # Project Link
+    def create_link(self, project_id, **kwargs):
+        try:
+            link = ProjectLink(project_id=project_id, **kwargs)
+            self.session.add(link)
+            self.session.commit()
+
+            return link
+        except:
+            return None
+
+    def update_link(self, project_id, link_id, **kwargs):
+        link = ProjectLink.query.filter_by(project_id=project_id, id=link_id).first()
+
+        if link == None:
+            return None
+
+        for key, value in kwargs.items():
+            if not hasattr(link, key):
+                return None
+
+        for key, value in kwargs.items():
+            setattr(link, key, value)
+
+        db.session.commit()
+
+        return link
+
+    def get_all_links(self, project_id):
+        all_links = ProjectLink.query.filter_by(project_id=project_id).all()
+
+        return all_links
+
+    def delete_link(self, project_id, link_id):
+        link = ProjectLink.query.filter_by(project_id=project_id, id=link_id).first()
+
+        if link == None:
+            return None
+
+        db.session.delete(link)
+        db.session.commit()
+
+        return link
+
+    # Project Feedback
+    def create_feedback(self, project_id, **kwargs):
+        try:
+            feedback = ProjectFeedback(project_id=project_id, **kwargs)
+            self.session.add(feedback)
+            self.session.commit()
+
+            return feedback
+        except:
+            return None
+
+    def get_all_feedbacks(self, project_id):
+        all_feedbacks = ProjectFeedback.query.filter_by(project_id=project_id).all()
+
+        return all_feedbacks
+
+    def delete_feedback(self, project_id, feedback_id):
+        feedback = ProjectFeedback.query.filter_by(project_id=project_id, id=feedback_id).first()
+
+        if feedback == None:
+            return None
+
+        db.session.delete(feedback)
+        db.session.commit()
+
+        return feedback
+
 projectController = ProjectController()

src/api/controllers/userController.py

@@ -1,14 +1,134 @@
-from api.models import db, User
+from api.models import db, User, UserHasProject, UserLink, UserFeedback
 
 class UserController:
     session = db.session()
+
+    # User
     def create_user(self, **kwargs):
-        user = User(**kwargs)
-        self.session.add(user)
-        self.session.commit()
+        try:
+            user = User(**kwargs)
+            self.session.add(user)
+            self.session.commit()
+
+            return user
+        except:
+            return None
+
+    def update_user(self, id, **kwargs):
+        user = User.query.filter_by(id=id).first()
+
+        if user == None:
+            return None
+
+        for key, value in kwargs.items():
+            if not hasattr(user, key):
+                return None
+
+        for key, value in kwargs.items():
+            setattr(user, key, value)
+
+        db.session.commit()
+
+        return user
 
     def get_user(self, **kwargs):
         user = User.query.filter_by(**kwargs).first()
+
         return user
 
+    def get_all_users(self, **kwargs):
+        all_users = User.query.all()
+
+        return all_users
+
+    def delete_user(self, id):
+        # Remove all user's links
+        for link in UserLink.query.filter_by(user_id=id).all():
+            db.session.delete(link)
+
+        # Remove user from all projects
+        for project in UserHasProject.query.filter_by(user_id=id).all():
+            db.session.delete(project)
+
+        user = User.query.filter_by(id=id).first()
+
+        if user == None:
+            return None
+
+        db.session.delete(user)
+        db.session.commit()
+
+        return user
+
+    # User Link
+    def create_link(self, user_id, **kwargs):
+        try:
+            link = UserLink(user_id=user_id, **kwargs)
+            self.session.add(link)
+            self.session.commit()
+
+            return link
+        except:
+            return None
+
+    def update_link(self, user_id, link_id, **kwargs):
+        link = UserLink.query.filter_by(user_id=user_id, id=link_id).first()
+
+        if link == None:
+            return None
+
+        for key, value in kwargs.items():
+            if not hasattr(link, key):
+                return None
+
+        for key, value in kwargs.items():
+            setattr(link, key, value)
+
+        db.session.commit()
+
+        return link
+
+    def get_all_links(self, user_id):
+        all_links = UserLink.query.filter_by(user_id=user_id).all()
+
+        return all_links
+
+    def delete_link(self, user_id, link_id):
+        link = UserLink.query.filter_by(user_id=user_id, id=link_id).first()
+
+        if link == None:
+            return None
+
+        db.session.delete(link)
+        db.session.commit()
+
+        return link
+
+    # User Feedback
+    def create_feedback(self, user_id, **kwargs):
+        try:
+            feedback = UserFeedback(user_id=user_id, **kwargs)
+            self.session.add(feedback)
+            self.session.commit()
+
+            return feedback
+        except:
+            return None
+
+    def get_all_feedbacks(self, user_id):
+        all_feedbacks = UserFeedback.query.filter_by(user_id=user_id).all()
+
+        return all_feedbacks
+
+    def delete_feedback(self, user_id, feedback_id):
+        feedback = UserFeedback.query.filter_by(user_id=user_id, id=feedback_id).first()
+
+        if feedback == None:
+            return None
+
+        db.session.delete(feedback)
+        db.session.commit()
+
+        return feedback
+
 userController = UserController()

src/api/models/__init__.py

@@ -3,9 +3,16 @@
 """
 from sys import argv
 from datetime import datetime
+
 from api.models.database import db, init_db
-from api.models.userModel import UserHasProject, User, UserLink
-from api.models.projectModel import Project, ProjectLink
+
+from api.models.userModel import User
+from api.models.userLinkModel import UserLink
+from api.models.projectModel import Project
+from api.models.projectLinkModel import ProjectLink
+from api.models.userHasProjectModel import UserHasProject
+from api.models.userFeedbackModel import UserFeedback
+from api.models.projectFeedbackModel import ProjectFeedback
 
 if '--reset-db' in argv:
     init_db(True)
@@ -17,10 +24,12 @@
 import datetime;
 
 user1 = User(name='Foe Joe')
+user2 = User(name='Tommy Frich')
+user3 = User(name='Limm Carter')
 link1 = UserLink(name='GitHub', url='https://github.com')
 user1.links.append(link1)
 
-project1 = Project(name='Hello, World!', description='First project.', development_status=2, creation_date=datetime.datetime.now())
+project1 = Project(name='Hello, World!', repository="https://github.com/ProgrammingBuddies/programmingbuddies-api", description='First project.', development_status=2, creation_date=datetime.datetime.now())
 link2 = ProjectLink(name='Reddit', url='https://reddit.com')
 project1.links.append(link2)
 
@@ -29,6 +38,17 @@
 
 user1.projects.append(userHasProject)
 
+feedback1 = ProjectFeedback(rating=3, description="Cool project!", project_feed_author=user1, project=project1)
+feedback2 = ProjectFeedback(rating=1, description="Not so cool!",  project_feed_author=user2, project=project1)
+
+# project1.feedbacks.append(feedback1)
+# project1.feedbacks.append(feedback2)
+
+feedback3 = UserFeedback(user_feed_author=user1, destination=user2, rating=5, description="Good guy!")
+feedback4 = UserFeedback(user_feed_author=user3, destination=user2, rating=1, description="Poor guy!")
+
 db.session.add(user1)
+db.session.add(user2)
+db.session.add(user3)
 db.session.commit()
 """

src/api/models/projectFeedbackModel.py

@@ -0,0 +1,18 @@
+from api.models import db
+
+class ProjectFeedback(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
+    project_id = db.Column(db.Integer, db.ForeignKey('project.id'))
+    rating = db.Column(db.Integer, nullable=False)
+    description = db.Column(db.String(255), nullable=True)
+
+    def as_dict(self):
+        obj_d = {
+            'id': self.id,
+            'user_id': self.user_id,
+            'project_id': self.project_id,
+            'rating': self.rating,
+            'description': self.description,
+        }
+        return obj_d

src/api/models/projectLinkModel.py

@@ -0,0 +1,20 @@
+from api.models import db
+
+class ProjectLink(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(80), nullable=False)
+    url = db.Column(db.Text, nullable=False)
+    project_id = db.Column(db.Integer, db.ForeignKey('project.id'), nullable=False)
+
+    # todo: decide if this should contain project_id (it is already present in the model)
+    def as_dict(self):
+        obj_d = {
+            'id': self.id,
+            'name': self.name,
+            'url': self.url,
+            'project_id': self.project_id
+        }
+        return obj_d
+
+    def __repr__(self):
+        return '<ProjectLink %r>' % self.name