Convert to black formatting

This commit is contained in:
Alan Pryor
2019-08-03 12:55:38 -04:00
parent 9bdaa8f161
commit 9b136b1ffa
59 changed files with 512 additions and 476 deletions

View File

@@ -9,47 +9,47 @@ from .service import FizzbazService
from .model import Fizzbaz
from .interface import FizzbazInterface
api = Namespace('Fizzbaz', description='A modular namespace within fizz') # noqa
api = Namespace("Fizzbaz", description="A modular namespace within fizz") # noqa
@api.route('/')
@api.route("/")
class FizzbazResource(Resource):
'''Fizzbazs'''
"""Fizzbaz"""
@responds(schema=FizzbazSchema, many=True)
def get(self) -> List[Fizzbaz]:
'''Get all Fizzbazs'''
"""Get all Fizzbaz"""
return FizzbazService.get_all()
@accepts(schema=FizzbazSchema, api=api)
@responds(schema=FizzbazSchema)
def post(self) -> Fizzbaz:
'''Create a Single Fizzbaz'''
"""Create a Single Fizzbaz"""
return FizzbazService.create(request.parsed_obj)
@api.route('/<int:fizzbazId>')
@api.param('fizzbazId', 'Fizzbaz database ID')
@api.route("/<int:fizzbazId>")
@api.param("fizzbazId", "Fizzbaz database ID")
class FizzbazIdResource(Resource):
@responds(schema=FizzbazSchema)
def get(self, fizzbazId: int) -> Fizzbaz:
'''Get Single Fizzbaz'''
"""Get Single Fizzbaz"""
return FizzbazService.get_by_id(fizzbazId)
def delete(self, fizzbazId: int) -> Response:
'''Delete Single Fizzbaz'''
"""Delete Single Fizzbaz"""
from flask import jsonify
id = FizzbazService.delete_by_id(fizzbazId)
return jsonify(dict(status='Success', id=id))
return jsonify(dict(status="Success", id=id))
@accepts(schema=FizzbazSchema, api=api)
@responds(schema=FizzbazSchema)
def put(self, fizzbazId: int) -> Fizzbaz:
'''Update Single Fizzbaz'''
"""Update Single Fizzbaz"""
changes: FizzbazInterface = request.parsed_obj
Fizzbaz = FizzbazService.get_by_id(fizzbazId)

View File

@@ -1,4 +1,3 @@
from unittest.mock import patch
from flask.testing import FlaskClient
@@ -10,75 +9,91 @@ from .interface import FizzbazInterface
from .. import BASE_ROUTE
def make_fizzbaz(id: int = 123, name: str = 'Test fizzbaz',
purpose: str = 'Test purpose') -> Fizzbaz:
return Fizzbaz(
fizzbaz_id=id, name=name, purpose=purpose
)
def make_fizzbaz(
id: int = 123, name: str = "Test fizzbaz", purpose: str = "Test purpose"
) -> Fizzbaz:
return Fizzbaz(fizzbaz_id=id, name=name, purpose=purpose)
class TestFizzbazResource:
@patch.object(FizzbazService, 'get_all',
lambda: [make_fizzbaz(123, name='Test Fizzbaz 1'),
make_fizzbaz(456, name='Test Fizzbaz 2')])
@patch.object(
FizzbazService,
"get_all",
lambda: [
make_fizzbaz(123, name="Test Fizzbaz 1"),
make_fizzbaz(456, name="Test Fizzbaz 2"),
],
)
def test_get(self, client: FlaskClient): # noqa
with client:
results = client.get(f'/api/{BASE_ROUTE}/fizzbaz',
follow_redirects=True).get_json()
expected = FizzbazSchema(many=True).dump(
[make_fizzbaz(123, name='Test Fizzbaz 1'),
make_fizzbaz(456, name='Test Fizzbaz 2')]
).data
results = client.get(
f"/api/{BASE_ROUTE}/fizzbaz", follow_redirects=True
).get_json()
expected = (
FizzbazSchema(many=True)
.dump(
[
make_fizzbaz(123, name="Test Fizzbaz 1"),
make_fizzbaz(456, name="Test Fizzbaz 2"),
]
)
.data
)
for r in results:
assert r in expected
@patch.object(FizzbazService, 'create',
lambda create_request: Fizzbaz(**create_request))
@patch.object(
FizzbazService, "create", lambda create_request: Fizzbaz(**create_request)
)
def test_post(self, client: FlaskClient): # noqa
with client:
payload = dict(name='Test fizzbaz', purpose='Test purpose')
result = client.post(f'/api/{BASE_ROUTE}/fizzbaz/', json=payload).get_json()
expected = FizzbazSchema().dump(Fizzbaz(
name=payload['name'],
purpose=payload['purpose'],
)).data
payload = dict(name="Test fizzbaz", purpose="Test purpose")
result = client.post(f"/api/{BASE_ROUTE}/fizzbaz/", json=payload).get_json()
expected = (
FizzbazSchema()
.dump(Fizzbaz(name=payload["name"], purpose=payload["purpose"]))
.data
)
assert result == expected
def fake_update(fizzbaz: Fizzbaz, changes: FizzbazInterface) -> Fizzbaz:
# To fake an update, just return a new object
updated_Fizzbaz = Fizzbaz(fizzbaz_id=fizzbaz.fizzbaz_id,
name=changes['name'],
purpose=changes['purpose'])
updated_Fizzbaz = Fizzbaz(
fizzbaz_id=fizzbaz.fizzbaz_id, name=changes["name"], purpose=changes["purpose"]
)
return updated_Fizzbaz
class TestFizzbazIdResource:
@patch.object(FizzbazService, 'get_by_id',
lambda id: make_fizzbaz(id=id))
@patch.object(FizzbazService, "get_by_id", lambda id: make_fizzbaz(id=id))
def test_get(self, client: FlaskClient): # noqa
with client:
result = client.get(f'/api/{BASE_ROUTE}/fizzbaz/123').get_json()
result = client.get(f"/api/{BASE_ROUTE}/fizzbaz/123").get_json()
expected = Fizzbaz(fizzbaz_id=123)
assert result['fizzbazId'] == expected.fizzbaz_id
assert result["fizzbazId"] == expected.fizzbaz_id
@patch.object(FizzbazService, 'delete_by_id',
lambda id: [id])
@patch.object(FizzbazService, "delete_by_id", lambda id: [id])
def test_delete(self, client: FlaskClient): # noqa
with client:
result = client.delete(f'/api/{BASE_ROUTE}/fizzbaz/123').get_json()
expected = dict(status='Success', id=[123])
result = client.delete(f"/api/{BASE_ROUTE}/fizzbaz/123").get_json()
expected = dict(status="Success", id=[123])
assert result == expected
@patch.object(FizzbazService, 'get_by_id',
lambda id: make_fizzbaz(id=id))
@patch.object(FizzbazService, 'update', fake_update)
@patch.object(FizzbazService, "get_by_id", lambda id: make_fizzbaz(id=id))
@patch.object(FizzbazService, "update", fake_update)
def test_put(self, client: FlaskClient): # noqa
with client:
result = client.put(f'/api/{BASE_ROUTE}/fizzbaz/123',
json={'name': 'New Fizzbaz',
'purpose': 'New purpose'}).get_json()
expected = FizzbazSchema().dump(
Fizzbaz(fizzbaz_id=123, name='New Fizzbaz', purpose='New purpose')).data
result = client.put(
f"/api/{BASE_ROUTE}/fizzbaz/123",
json={"name": "New Fizzbaz", "purpose": "New purpose"},
).get_json()
expected = (
FizzbazSchema()
.dump(
Fizzbaz(fizzbaz_id=123, name="New Fizzbaz", purpose="New purpose")
)
.data
)
assert result == expected

View File

@@ -5,9 +5,7 @@ from .interface import FizzbazInterface
@fixture
def interface() -> FizzbazInterface:
return FizzbazInterface(
fizzbaz_id=1, name='Test fizzbaz', purpose='Test purpose'
)
return FizzbazInterface(fizzbaz_id=1, name="Test fizzbaz", purpose="Test purpose")
def test_FizzbazInterface_create(interface: FizzbazInterface):

View File

@@ -5,9 +5,9 @@ from typing import Any
class Fizzbaz(db.Model): # type: ignore
'''A snazzy Fizzbaz'''
"""A snazzy Fizzbaz"""
__tablename__ = 'fizzbaz'
__tablename__ = "fizzbaz"
fizzbaz_id = Column(Integer(), primary_key=True)
name = Column(String(255))

View File

@@ -6,9 +6,7 @@ from .model import Fizzbaz
@fixture
def fizzbaz() -> Fizzbaz:
return Fizzbaz(
fizzbaz_id=1, name='Test fizzbaz', purpose='Test purpose'
)
return Fizzbaz(fizzbaz_id=1, name="Test fizzbaz", purpose="Test purpose")
def test_Fizzbaz_create(fizzbaz: Fizzbaz):

View File

@@ -2,8 +2,8 @@ from marshmallow import fields, Schema
class FizzbazSchema(Schema):
'''Fizzbaz schema'''
"""Fizzbaz schema"""
fizzbazId = fields.Number(attribute='fizzbaz_id')
name = fields.String(attribute='name')
purpose = fields.String(attribute='purpose')
fizzbazId = fields.Number(attribute="fizzbaz_id")
name = fields.String(attribute="name")
purpose = fields.String(attribute="purpose")

View File

@@ -15,13 +15,11 @@ def test_FizzbazSchema_create(schema: FizzbazSchema):
def test_FizzbazSchema_works(schema: FizzbazSchema):
params: FizzbazInterface = schema.load({
'fizzbazId': '123',
'name': 'Test fizzbaz',
'purpose': 'Test purpose'
}).data
params: FizzbazInterface = schema.load(
{"fizzbazId": "123", "name": "Test fizzbaz", "purpose": "Test purpose"}
).data
fizzbaz = Fizzbaz(**params)
assert fizzbaz.fizzbaz_id == 123
assert fizzbaz.name == 'Test fizzbaz'
assert fizzbaz.purpose == 'Test purpose'
assert fizzbaz.name == "Test fizzbaz"
assert fizzbaz.purpose == "Test purpose"