From 510c56be3a1ad5b31d7231e6a114b785f20789b4 Mon Sep 17 00:00:00 2001
From: Mark <mark@openappstack.net>
Date: Tue, 10 Sep 2019 17:01:38 +0200
Subject: [PATCH] Refactor space between class defs
---
database/models.py | 5 +++++
database/schema.py | 5 +++++
test/test_database.py | 1 +
3 files changed, 11 insertions(+)
diff --git a/database/models.py b/database/models.py
index bbebc47..52f9837 100644
--- a/database/models.py
+++ b/database/models.py
@@ -5,29 +5,34 @@ from sqlalchemy.orm import relationship, backref
from sqlalchemy import Boolean, DateTime, Column, Integer, \
String, ForeignKey
+
class RolesUsers(Base):
__tablename__ = 'oas_roles_users'
id = Column(Integer(), primary_key=True)
user_id = Column('user_id', Integer(), ForeignKey('oas_user.id'))
role_id = Column('role_id', Integer(), ForeignKey('oas_role.id'))
+
class ApplicationsUsers(Base):
__tablename__ = 'oas_applications_users'
id = Column(Integer(), primary_key=True)
user_id = Column('user_id', Integer(), ForeignKey('oas_user.id'))
application_id = Column('application_id', Integer(), ForeignKey('oas_application.id'))
+
class Role(Base, RoleMixin):
__tablename__ = 'oas_role'
id = Column(Integer(), primary_key=True)
name = Column(String(80), unique=True)
description = Column(String(255))
+
class Application(Base):
__tablename__ = 'oas_application'
id = Column(Integer, primary_key=True)
name = Column(String(80), unique=True)
+
class User(Base, UserMixin):
__tablename__ = 'oas_user'
id = Column(Integer, primary_key=True)
diff --git a/database/schema.py b/database/schema.py
index 9ccbc33..5b27140 100644
--- a/database/schema.py
+++ b/database/schema.py
@@ -7,12 +7,14 @@ from flask_security.utils import hash_password
user_datastore = get_user_datastore()
+
class User(SQLAlchemyObjectType):
class Meta:
model = UserModel
exclude_fields = ("password")
interfaces = (relay.Node, )
+
class UserMutation(graphene.Mutation):
class Arguments:
username = graphene.String(required=True)
@@ -28,11 +30,13 @@ class UserMutation(graphene.Mutation):
user_datastore.commit()
return UserMutation(user=user)
+
class Application(SQLAlchemyObjectType):
class Meta:
model = ApplicationModel
interfaces = (relay.Node, )
+
class Role(SQLAlchemyObjectType):
class Meta:
model = RoleModel
@@ -78,6 +82,7 @@ class Query(graphene.ObjectType):
query = User.get_query(info)
return query.filter(UserModel.username == username).first()
+
class Mutation(graphene.ObjectType):
create_user = UserMutation.Field()
create_role = CreateRole.Field()
diff --git a/test/test_database.py b/test/test_database.py
index 381f421..f8d3c61 100644
--- a/test/test_database.py
+++ b/test/test_database.py
@@ -7,6 +7,7 @@ from flask_security import SQLAlchemySessionUserDatastore
from database.models import User, Role, Application
from database.database import init_db
+
class DatabaseSetupTest(unittest.TestCase):
def setUp(self):
--
GitLab