[chore #157693451] fix flake8 failing test

- refactor files to adhere to flake8 specifications

api/block/models.py

@@ -1,11 +1,9 @@
 from sqlalchemy import (
-    Column, String, Integer, ForeignKey, func, 
-    DateTime, create_engine)
+    Column, String, Integer, ForeignKey)
 from sqlalchemy.orm import relationship
-
 from helpers.database import Base
 from utilities.utility import Utility
-from api.location.models import Location
+from api.location.models import Location  # noqa: F401
 
 
 class Block(Base, Utility):

api/block/schema.py

@@ -1,24 +1,25 @@
 import graphene
-from graphene import Schema
 from graphene_sqlalchemy import SQLAlchemyObjectType
 from api.block.models import Block as BlockModel
 
+
 class Block(SQLAlchemyObjectType):
     class Meta:
         model = BlockModel
 
+
 class Query(graphene.ObjectType):
     floor = graphene.List(Block)
     get_rooms_in_a_block = graphene.List(
-        lambda:Block,
-        block_id = graphene.Int()
+        lambda: Block,
+        block_id=graphene.Int()
     )
 
-    def resolve_blocks(self,info):
+    def resolve_blocks(self, info):
         query = Block.get_query(info)
         return query.all()
 
-    def resolve_get_rooms_in_a_block(self,info,block_id):
+    def resolve_get_rooms_in_a_block(self, info, block_id):
         query = Block.get_query(info)
         result = query.filter(BlockModel.id == block_id)
-        return result
+        return result

api/floor/models.py

@@ -1,11 +1,10 @@
 from sqlalchemy import (
-    Column, String, Integer, ForeignKey, func, 
-    DateTime, create_engine)
+    Column, String, Integer, ForeignKey)
 from sqlalchemy.orm import relationship
 
 from helpers.database import Base
 from utilities.utility import Utility
-from api.block.models import Block
+from api.block.models import Block  # noqa: F401
 
 
 class Floor(Base, Utility):

api/floor/schema.py

@@ -1,17 +1,16 @@
 import graphene
-from graphene import Schema
-
 from graphene_sqlalchemy import SQLAlchemyObjectType
-
 from api.floor.models import Floor as FloorModel
 
+
 class Floor(SQLAlchemyObjectType):
     class Meta:
         model = FloorModel
 
+
 class Query(graphene.ObjectType):
     floor = graphene.List(Floor)
 
-    def resolve_floors(self,info):
+    def resolve_floors(self, info):
         query = Floor.get_query(info)
         return query.all()

api/location/models.py

@@ -1,6 +1,5 @@
 from sqlalchemy import (
-    Column, String, Integer, ForeignKey, func, 
-    DateTime, create_engine)
+    Column, String, Integer)
 from sqlalchemy.orm import relationship
 
 from helpers.database import Base
@@ -12,4 +11,4 @@ class Location(Base, Utility):
     id = Column(Integer, primary_key=True)
     name = Column(String, nullable=False)
     abbreviation = Column(String, nullable=False)
-    block = relationship('Block')
+    block = relationship('Block')

api/location/schema.py

@@ -1,35 +1,28 @@
 import graphene
-from graphene import Schema
 from graphene_sqlalchemy import SQLAlchemyObjectType
 
 from api.location.models import Location as LocationModel
 
-from api.floor.models import Floor as FloorModel 
-from api.room.models import Room as RoomModel
+from api.room_resource.models import Resource as ResourceModel  # noqa: F401
 
-from api.room_resource.models import Resource as ResourceModel 
 
 class Location(SQLAlchemyObjectType):
     class Meta:
         model = LocationModel
 
+
 class Query(graphene.ObjectType):
     all_locations = graphene.List(Location)
-    get_rooms_in_a_location =graphene.List(
-        lambda:Location,
-        location_id = graphene.Int()
+    get_rooms_in_a_location = graphene.List(
+        lambda: Location,
+        location_id=graphene.Int()
     )
 
-
-    def resolve_all_locations(self,info):
+    def resolve_all_locations(self, info):
         query = Location.get_query(info)
         return query.all()
 
-    def resolve_get_rooms_in_a_location(self,info,location_id):
-        query =Location.get_query(info)
+    def resolve_get_rooms_in_a_location(self, info, location_id):
+        query = Location.get_query(info)
         result = query.filter(LocationModel.id == location_id)
         return result
-
-
-
-

api/room/models.py

@@ -1,11 +1,10 @@
 from sqlalchemy import (
-    Column, String, Integer, ForeignKey, func, 
-    DateTime, create_engine, CheckConstraint)
+    Column, String, Integer, ForeignKey)
 from sqlalchemy.orm import relationship
 
 from helpers.database import Base
 from utilities.utility import Utility, validate_empty_fields
-from api.floor.models import Floor
+from api.floor.models import Floor  # noqa: F401
 
 
 class Room(Base, Utility):
@@ -20,7 +19,7 @@ class Room(Base, Utility):
     def __init__(self, **kwargs):
         # validating empty fields
         validate_empty_fields(**kwargs)
-        
+
         self.name = kwargs['name']
         self.room_type = kwargs['room_type']
         self.capacity = kwargs['capacity']

api/room/schema.py

@@ -1,22 +1,18 @@
 import graphene
 
-from graphene import  Schema
-from graphene_sqlalchemy import (SQLAlchemyObjectType, 
-                                 SQLAlchemyConnectionField)
+from graphene_sqlalchemy import (SQLAlchemyObjectType)
 from graphql import GraphQLError
 from api.room.models import Room as RoomModel
 from api.room_resource.schema import Resource
-from utilities.utility import validate_empty_fields,update_entity_fields
+from utilities.utility import validate_empty_fields, update_entity_fields
 
 
 class Room(SQLAlchemyObjectType):
-
     class Meta:
         model = RoomModel
 
 
 class CreateRoom(graphene.Mutation):
-
     class Arguments:
         name = graphene.String(required=True)
         room_type = graphene.String(required=True)
@@ -25,29 +21,28 @@ class Arguments:
     room = graphene.Field(Room)
 
     def mutate(self, info, **kwargs):
-        room  = RoomModel(**kwargs)
+        room = RoomModel(**kwargs)
         room.save()
 
         return CreateRoom(room=room)
 
-class UpdateRoom(graphene.Mutation):
 
+class UpdateRoom(graphene.Mutation):
     class Arguments:
         room_id = graphene.Int()
         room_type = graphene.String()
         capacity = graphene.Int()
         name = graphene.String()
-
 
     room = graphene.Field(Room)
-    
+
     def mutate(self, info, room_id, **kwargs):
         validate_empty_fields(**kwargs)
 
         query_room = Room.get_query(info)
         exact_room = query_room.filter(RoomModel.id == room_id).first()
-        
-        update_entity_fields(exact_room,**kwargs)
+
+        update_entity_fields(exact_room, **kwargs)
 
         exact_room.save()
         return UpdateRoom(room=exact_room)
@@ -57,25 +52,23 @@ class Query(graphene.ObjectType):
     rooms = graphene.List(Room)
     resource = graphene.List(Resource)
     get_room_by_id = graphene.List(
-        lambda:Room,
-        room_id = graphene.Int()
+        lambda: Room,
+        room_id=graphene.Int()
         )
 
-    def resolve_rooms(self,info):
+    def resolve_rooms(self, info):
         query = Room.get_query(info)
         return query.all()
 
-    def resolve_get_room_by_id(self,info,room_id):
-        query =Room.get_query(info) 
+    def resolve_get_room_by_id(self, info, room_id):
+        query = Room.get_query(info)
         check_room = query.filter(RoomModel.id == room_id).first()
         if not check_room:
             raise GraphQLError("Room not found")
         result = query.filter(RoomModel.id == room_id)
         return result
 
+
 class Mutation(graphene.ObjectType):
     create_room = CreateRoom.Field()
     update_room = UpdateRoom.Field()
-
-
-

api/room_resource/models.py

@@ -1,15 +1,12 @@
 from sqlalchemy import (
-    Column, String, Integer, ForeignKey, func, 
-    DateTime, create_engine)
-from sqlalchemy.orm import relationship
-
+    Column, String, Integer, ForeignKey)
 from helpers.database import Base
 from utilities.utility import Utility
-from api.room.models import Room
+from api.room.models import Room  # noqa: F401
 
 
 class Resource(Base, Utility):
     __tablename__ = 'resources'
     id = Column(Integer, primary_key=True)
     name = Column(String, nullable=False)
-    room_id = Column(Integer, ForeignKey('rooms.id'))
+    room_id = Column(Integer, ForeignKey('rooms.id'))

api/room_resource/schema.py

@@ -1,18 +1,13 @@
-import graphene
-
-
-from graphene import Schema
-from graphene_sqlalchemy import (SQLAlchemyObjectType, 
-                                 SQLAlchemyConnectionField)
+from graphene_sqlalchemy import (SQLAlchemyObjectType)
 
 from api.room_resource.models import Resource as ResourceModel
 
 
 class Resource(SQLAlchemyObjectType):
-    
+
     class Meta:
         model = ResourceModel
 
-    def resolve_Resource(self,info):
+    def resolve_Resource(self, info):
         query = Resource.get_query(info)
         return query.all()

app.py

@@ -7,23 +7,21 @@
 from schema import schema
 
 
-
 def create_app(config_name):
     app = Flask(__name__)
     app.config.from_object(config[config_name])
     config[config_name].init_app(app)
-    
+
     app.add_url_rule(
         '/mrm',
         view_func=GraphQLView.as_view(
             'mrm',
             schema=schema,
-            graphiql=True # for having the GraphiQL interface
+            graphiql=True  # for having the GraphiQL interface
         )
     )
 
     @app.teardown_appcontext
     def shutdown_session(exception=None):
         db_session.remove()
-
     return app

config.py

@@ -1,6 +1,7 @@
 import os
 basedir = os.path.abspath(os.path.dirname(__file__))
 
+
 class Config:
     SECRET_KEY = os.getenv('SECRET_KEY') or 'hard to guess string'
     SQLALCHEMY_COMMIT_ON_TEARDOWN = True
@@ -13,17 +14,18 @@ def init_app(app):
 class DevelopmentConfig(Config):
     DEBUG = True
     SQLALCHEMY_DATABASE_URI = os.getenv('DEV_DATABASE_URL') or \
-    'sqlite:///' + os.path.join(basedir, 'dev-db.sqlite')
+        'sqlite:///' + os.path.join(basedir, 'dev-db.sqlite')
+
 
 class TestingConfig(Config):
     TESTING = True
     SQLALCHEMY_DATABASE_URI = os.getenv('TEST_DATABASE_URL') or \
-    'sqlite:///' + os.path.join(basedir, 'test-db.sqlite')
+        'sqlite:///' + os.path.join(basedir, 'test-db.sqlite')
 
 
 class ProductionConfig(Config):
     SQLALCHEMY_DATABASE_URI = os.getenv('DATABASE_URL') or \
-    'sqlite:///' + os.path.join(basedir, 'data.sqlite')
+        'sqlite:///' + os.path.join(basedir, 'data.sqlite')
 
 
 config = {