Users, Posts 를 MVC 분리

Author: msnodeve

.gitignore

@@ -9,4 +9,6 @@
 __pycache__
 
 # testcode
-.pytest_cache
+.pytest_cache
+.coverage
+cov_html

Makefile

@@ -0,0 +1,7 @@
+GREEN=\033[1;32;40m
+RED=\033[1;31;40m
+NC=\033[0m # No Color
+
+test:
+	@bash -c "echo -e \"${GREEN}[pytest 시작]${NC}\"" 
+	pipenv run pytest app/tests --cov-report=html:cov_html --cov-report=term --cov=app

app/api/database.py

@@ -1,9 +1,33 @@
 """
     Create db
 """
-
+from flask import jsonify
+from flask import make_response
+from http import HTTPStatus
 from flask_sqlalchemy import SQLAlchemy
+from sqlalchemy.exc import IntegrityError
 from flask_marshmallow import Marshmallow
 
 DB = SQLAlchemy()
-MA = Marshmallow()
+MA = Marshmallow()
+
+class CRUD:
+    body = ''
+    status_code = HTTPStatus.NOT_IMPLEMENTED
+
+    def add(self, resource, schema):
+        try:
+            DB.session.add(resource)
+            DB.session.commit()
+            self.body = jsonify(schema.dump(resource).data)
+            self.status_code = HTTPStatus.OK
+        except IntegrityError as err:
+            DB.session.rollback()
+            err_meg = str(err)
+            self.body = jsonify({'error' : err_meg, 'type' : 'IntegrityError'})
+            if "Duplicate entry" in err_meg:
+                self.status_code = HTTPStatus.CONFLICT
+            else:
+                self.status_code = HTTPStatus.BAD_REQUEST
+        return make_response(self.body, self.status_code)
+    

app/posts/models.py

@@ -2,12 +2,12 @@
     Posts model file
 """
 
-from app.api.database import DB, MA
+from app.api.database import DB, MA, CRUD
 from marshmallow import Schema, fields, validate
 from app.users.models import Users, UsersSchema
 from sqlalchemy.sql import text
 
-class Posts(DB.Model):
+class Posts(DB.Model, CRUD):
     __tablename__ = 'posts'
     __table_args__ = {'mysql_collate': 'utf8_general_ci'}
 

app/posts/views.py

@@ -31,7 +31,10 @@ def get(self):
         try:
             posts = Posts.query.all()
             body = jsonify(POSTS_SCHEMA.dump(posts, many=True).data)
-            code = HTTPStatus.OK
+            if posts:
+                code = HTTPStatus.OK
+            else:
+                code = HTTPStatus.NOT_FOUND
         except SQLAlchemyError as err:
             body = jsonify({'message' : str(err)})
             code = HTTPStatus.INTERNAL_SERVER_ERROR
@@ -42,24 +45,19 @@ def get(self):
     def post(self):
         args_ = self.parser.parse_args()
         post = Posts(author_id=args_['author_id'], title=args_['title'], body=args_['body'])
-        try:
-            DB.session.add(post)
-            DB.session.commit()
-            body = jsonify({'post', POSTS_SCHEMA.dump(post).data})
-            code = HTTPStatus.OK
-        except SQLAlchemyError as err:
-            body = jsonify({'message' : str(err)})
-            code = HTTPStatus.INTERNAL_SERVER_ERROR
-        return make_response(body, code.value)
+        return post.add(post, POSTS_SCHEMA)
 
 @API.route('/<int:reqno>')
 class PostItem(Resource):
     def get(self, reqno):
         try:
             post = DB.session.query(Posts).outerjoin(
                 Users, Users.user_id == Posts.author_id).filter(Posts.id==reqno).first()
-            body = jsonify({'post' : POSTS_SCHEMA.dump(post).data})
-            code = HTTPStatus.OK
+            body = POSTS_SCHEMA.dump(post).data
+            if post:
+                code = HTTPStatus.OK
+            else:
+                code = HTTPStatus.NOT_FOUND
         except SQLAlchemyError as err:
             body = jsonify({'message' : str(err)})
             code = HTTPStatus.INTERNAL_SERVER_ERROR

app/tests/conftest.py

@@ -0,0 +1,10 @@
+import pytest
+from app import create_app  # flask application factory
+
+@pytest.fixture(scope='session')
+def flask_app():
+    app = create_app()
+    app_context = app.app_context()
+    app_context.push()
+    yield app
+    app_context.pop()

app/tests/test_models.py

@@ -0,0 +1,14 @@
+from app.posts.models import Posts
+from app.users.models import Users
+
+def test_posts_init():
+    test_post = Posts("a", "b", "c")
+    assert type(test_post.author_id) is str
+    assert type(test_post.title) is str
+    assert type(test_post.body) is str
+
+def test_users_init():
+    test_user = Users("a", "b", "c")
+    assert type(test_user.user_id) is str
+    assert type(test_user.user_password) is str
+    assert type(test_user.user_email) is str

app/tests/test_practice.py

@@ -18,5 +18,3 @@ def test_practice():
         except ValueError as err:
             message = str(err)
             print(message)
-        print(result)
-        assert False

app/tests/test_request.py

@@ -0,0 +1,7 @@
+from http import HTTPStatus
+from app import create_app
+
+def test_url(flask_app):
+    with flask_app.test_client() as client:
+        response = client.get('/posts')
+        assert response.status_code == HTTPStatus.OK

app/users/models.py

@@ -2,11 +2,11 @@
     Users models file
 """
 from sqlalchemy.sql import text
-from app.api.database import DB, MA
+from app.api.database import DB, MA, CRUD
 from flask_sqlalchemy import SQLAlchemy
 from marshmallow import Schema, fields, validate
 
-class Users(DB.Model):
+class Users(DB.Model, CRUD):
     __tablename__ = 'users'
     __table_args__ = {'mysql_collate': 'utf8_general_ci'}
 
@@ -16,7 +16,7 @@ class Users(DB.Model):
     user_email = DB.Column(DB.String(255), nullable=False)
     created = DB.Column(DB.TIMESTAMP, server_default=text("CURRENT_TIMESTAMP"), nullable=False)
 
-    def __init__(self, user_id, user_password, user_email):
+    def __init__(self, user_id : str, user_password : str, user_email : str):
         self.user_id = user_id
         self.user_password = user_password
         self.user_email = user_email