ataxya/CICD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert to black formatting

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
app/fizz/__init__.py
View File

@@ -1,9 +1,9 @@
BASE_ROUTE = 'fizz'
BASE_ROUTE = "fizz"
def register_routes(api, app, root='api'):
def register_routes(api, app, root="api"):
from .fizzbar.controller import api as fizzbar_api
from .fizzbaz.controller import api as fizzbaz_api
api.add_namespace(fizzbar_api, path=f'/{root}/{BASE_ROUTE}/fizzbar')
api.add_namespace(fizzbaz_api, path=f'/{root}/{BASE_ROUTE}/fizzbaz')
api.add_namespace(fizzbar_api, path=f"/{root}/{BASE_ROUTE}/fizzbar")
api.add_namespace(fizzbaz_api, path=f"/{root}/{BASE_ROUTE}/fizzbaz")

25
app/fizz/fizzbar/controller.py
View File

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

99
app/fizz/fizzbar/controller_test.py
View File

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

4
app/fizz/fizzbar/interface_test.py
View File

@@ -5,9 +5,7 @@ from .interface import FizzbarInterface
@fixture
def interface() -> FizzbarInterface:
return FizzbarInterface(
fizzbar_id=1, name='Test fizzbar', purpose='Test purpose'
)
return FizzbarInterface(fizzbar_id=1, name="Test fizzbar", purpose="Test purpose")
def test_FizzbarInterface_create(interface: FizzbarInterface):

4
app/fizz/fizzbar/model.py
View File

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

4
app/fizz/fizzbar/model_test.py
View File

@@ -6,9 +6,7 @@ from .model import Fizzbar
@fixture
def fizzbar() -> Fizzbar:
return Fizzbar(
fizzbar_id=1, name='Test fizzbar', purpose='Test purpose'
)
return Fizzbar(fizzbar_id=1, name="Test fizzbar", purpose="Test purpose")
def test_Fizzbar_create(fizzbar: Fizzbar):

8
app/fizz/fizzbar/schema.py
View File

@@ -2,8 +2,8 @@ from marshmallow import fields, Schema
class FizzbarSchema(Schema):
'''Fizzbar schema'''
"""Fizzbar schema"""
fizzbarId = fields.Number(attribute='fizzbar_id')
name = fields.String(attribute='name')
purpose = fields.String(attribute='purpose')
fizzbarId = fields.Number(attribute="fizzbar_id")
name = fields.String(attribute="name")
purpose = fields.String(attribute="purpose")

12
app/fizz/fizzbar/schema_test.py
View File

@@ -15,13 +15,11 @@ def test_FizzbarSchema_create(schema: FizzbarSchema):
def test_FizzbarSchema_works(schema: FizzbarSchema):
params: FizzbarInterface = schema.load({
'fizzbarId': '123',
'name': 'Test fizzbar',
'purpose': 'Test purpose'
}).data
params: FizzbarInterface = schema.load(
{"fizzbarId": "123", "name": "Test fizzbar", "purpose": "Test purpose"}
).data
fizzbar = Fizzbar(**params)
assert fizzbar.fizzbar_id == 123
assert fizzbar.name == 'Test fizzbar'
assert fizzbar.purpose == 'Test purpose'
assert fizzbar.name == "Test fizzbar"
assert fizzbar.purpose == "Test purpose"

7
app/fizz/fizzbar/service.py
View File

@@ -4,7 +4,7 @@ from .model import Fizzbar
from .interface import FizzbarInterface
class FizzbarService():
class FizzbarService:
@staticmethod
def get_all() -> List[Fizzbar]:
return Fizzbar.query.all()
@@ -30,10 +30,7 @@ class FizzbarService():
@staticmethod
def create(new_attrs: FizzbarInterface) -> Fizzbar:
new_fizzbar = Fizzbar(
name=new_attrs['name'],
purpose=new_attrs['purpose']
)
new_fizzbar = Fizzbar(name=new_attrs["name"], purpose=new_attrs["purpose"])
db.session.add(new_fizzbar)
db.session.commit()

16
app/fizz/fizzbar/service_test.py
View File

@@ -7,8 +7,8 @@ from .interface import FizzbarInterface
def test_get_all(db: SQLAlchemy): # noqa
yin: Fizzbar = Fizzbar(fizzbar_id=1, name='Yin', purpose='thing 1')
yang: Fizzbar = Fizzbar(fizzbar_id=2, name='Yang', purpose='thing 2')
yin: Fizzbar = Fizzbar(fizzbar_id=1, name="Yin", purpose="thing 1")
yang: Fizzbar = Fizzbar(fizzbar_id=2, name="Yang", purpose="thing 2")
db.session.add(yin)
db.session.add(yang)
db.session.commit()
@@ -20,21 +20,21 @@ def test_get_all(db: SQLAlchemy): # noqa
def test_update(db: SQLAlchemy): # noqa
yin: Fizzbar = Fizzbar(fizzbar_id=1, name='Yin', purpose='thing 1')
yin: Fizzbar = Fizzbar(fizzbar_id=1, name="Yin", purpose="thing 1")
db.session.add(yin)
db.session.commit()
updates: FizzbarInterface = dict(name='New Fizzbar name')
updates: FizzbarInterface = dict(name="New Fizzbar name")
FizzbarService.update(yin, updates)
result: Fizzbar = Fizzbar.query.get(yin.fizzbar_id)
assert result.name == 'New Fizzbar name'
assert result.name == "New Fizzbar name"
def test_delete_by_id(db: SQLAlchemy): # noqa
yin: Fizzbar = Fizzbar(fizzbar_id=1, name='Yin', purpose='thing 1')
yang: Fizzbar = Fizzbar(fizzbar_id=2, name='Yang', purpose='thing 2')
yin: Fizzbar = Fizzbar(fizzbar_id=1, name="Yin", purpose="thing 1")
yang: Fizzbar = Fizzbar(fizzbar_id=2, name="Yang", purpose="thing 2")
db.session.add(yin)
db.session.add(yang)
db.session.commit()
@@ -50,7 +50,7 @@ def test_delete_by_id(db: SQLAlchemy): # noqa
def test_create(db: SQLAlchemy): # noqa
yin: FizzbarInterface = dict(name='Fancy new fizzbar', purpose='Fancy new purpose')
yin: FizzbarInterface = dict(name="Fancy new fizzbar", purpose="Fancy new purpose")
FizzbarService.create(yin)
results: List[Fizzbar] = Fizzbar.query.all()

22
app/fizz/fizzbaz/controller.py
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)

99
app/fizz/fizzbaz/controller_test.py
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

4
app/fizz/fizzbaz/interface_test.py
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):

4
app/fizz/fizzbaz/model.py
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))

4
app/fizz/fizzbaz/model_test.py
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):

8
app/fizz/fizzbaz/schema.py
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")

12
app/fizz/fizzbaz/schema_test.py
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"