From eb1d1e1dd32a185e853357ae460e5daf93ce4e56 Mon Sep 17 00:00:00 2001 From: "J.P. Krauss" Date: Thu, 14 Jul 2022 17:17:11 -0700 Subject: [PATCH] Fix Code Styling --- sigl/cli.py | 8 ++------ sigl/database/orm.py | 15 +++------------ sigl/domain/models/product.py | 2 +- sigl/domain/service.py | 3 ++- sigl/views/lists.py | 25 ++++++++++++++++++++----- sigl/views/products.py | 13 +++++-------- sigl/wsgi.py | 1 - 7 files changed, 33 insertions(+), 34 deletions(-) diff --git a/sigl/cli.py b/sigl/cli.py index 2f6ad89..ef88781 100644 --- a/sigl/cli.py +++ b/sigl/cli.py @@ -8,15 +8,11 @@ Copyright (c) 2022 Asymworks, LLC. All Rights Reserved. def init_shell(): # pragma: no cover """Initialize the Flask Shell Context.""" import datetime + import sqlalchemy as sa from sigl.database import db - from sigl.domain.models import ( - ListEntry, - Product, - ProductLocation, - ShoppingList, - ) + from sigl.domain.models import ListEntry, Product, ProductLocation, ShoppingList return { # Imports diff --git a/sigl/database/orm.py b/sigl/database/orm.py index 541a62a..59306e0 100644 --- a/sigl/database/orm.py +++ b/sigl/database/orm.py @@ -4,27 +4,18 @@ Simple Grocery List (Sigl) | sigl.app Copyright (c) 2022 Asymworks, LLC. All Rights Reserved. """ -from sigl.domain.models import ( - Product, - ProductLocation, -) +from sigl.domain.models import Product, ProductLocation from sigl.domain.models.list import ListEntry, ShoppingList from .globals import db -from .tables import ( - list_entries, - lists, - product_locations, - products, -) +from .tables import list_entries, lists, product_locations, products __all__ = ('init_orm', ) def init_orm(): """Initialize the Sigl ORM.""" - - # # List Entries + # List Entries db.mapper(ListEntry, list_entries, properties={ 'product': db.relationship( Product, diff --git a/sigl/domain/models/product.py b/sigl/domain/models/product.py index 53e9598..869abc5 100644 --- a/sigl/domain/models/product.py +++ b/sigl/domain/models/product.py @@ -5,7 +5,7 @@ Copyright (c) 2022 Asymworks, LLC. All Rights Reserved. """ from dataclasses import dataclass, field -from typing import List, TYPE_CHECKING +from typing import TYPE_CHECKING, List from .mixins import NotesMixin, TimestampMixin diff --git a/sigl/domain/service.py b/sigl/domain/service.py index cb65a70..13fd83c 100644 --- a/sigl/domain/service.py +++ b/sigl/domain/service.py @@ -9,6 +9,7 @@ from typing import List, Optional, Union from sqlalchemy.orm import Session from sigl.exc import DomainError, NotFoundError + from .models import ListEntry, Product, ProductLocation, ShoppingList @@ -140,7 +141,7 @@ def list_stores(session: Session, id: Optional[int]) -> List[str]: Product has locations are returned. """ if id is None: - return list(set([loc.store for loc in session.query(ProductLocation).all()])) + return list({loc.store for loc in session.query(ProductLocation).all()}) sList = list_by_id(session, id) if not sList: diff --git a/sigl/views/lists.py b/sigl/views/lists.py index 4285dff..a50ba4c 100644 --- a/sigl/views/lists.py +++ b/sigl/views/lists.py @@ -6,17 +6,32 @@ Copyright (c) 2022 Asymworks, LLC. All Rights Reserved. from flask import ( Blueprint, - flash, jsonify, make_response, redirect, render_template, request, url_for + flash, + jsonify, + make_response, + redirect, + render_template, + request, + url_for, ) -from sigl.exc import DomainError, Error, NotFoundError from sigl.database import db from sigl.domain.service import ( - list_entry_by_id, lists_all, list_by_id, list_create, list_delete, - list_update, list_addItem, list_deleteItem, list_editItem, list_stores, - list_deleteCrossedOff, list_entry_set_crossedOff, + list_addItem, + list_by_id, + list_create, + list_delete, + list_deleteCrossedOff, + list_deleteItem, + list_editItem, + list_entry_by_id, + list_entry_set_crossedOff, + list_stores, + list_update, + lists_all, products_all, ) +from sigl.exc import DomainError, Error, NotFoundError __all__ = ('bp', ) diff --git a/sigl/views/products.py b/sigl/views/products.py index 5d116a1..26ec6e1 100644 --- a/sigl/views/products.py +++ b/sigl/views/products.py @@ -4,23 +4,20 @@ Simple Grocery List (Sigl) | sigl.app Copyright (c) 2022 Asymworks, LLC. All Rights Reserved. """ -from flask import ( - Blueprint, - flash, redirect, render_template, request, url_for -) +from flask import Blueprint, flash, redirect, render_template, request, url_for -from sigl.exc import Error, NotFoundError from sigl.database import db from sigl.domain.service import ( list_stores, - products_all, + product_addLocation, product_by_id, product_create, product_delete, - product_update, - product_addLocation, product_removeLocation, + product_update, + products_all, ) +from sigl.exc import Error, NotFoundError __all__ = ('bp', ) diff --git a/sigl/wsgi.py b/sigl/wsgi.py index f6b31b8..1c0b8f4 100644 --- a/sigl/wsgi.py +++ b/sigl/wsgi.py @@ -6,5 +6,4 @@ Copyright (c) 2022 Asymworks, LLC. All Rights Reserved. from .factory import create_app - app = create_app()