Skip to content

Commit af3d241

Browse files
committed
formatted code
1 parent cc90211 commit af3d241

File tree

8 files changed

+49
-46
lines changed

8 files changed

+49
-46
lines changed

api/firebase_api.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
from firebase_admin import auth as firebase_auth
55
from google.oauth2 import id_token
66

7-
from api.validators.user_validation import (ChangePasswordPayload,
8-
ChangePasswordResponse,
9-
FirebaseLoginPayload,
10-
FirebaseLoginResponse,
11-
FirebaseRegistrationPayload,
12-
FirebaseRegistrationResponse)
7+
from api.validators.user_validation import (
8+
ChangePasswordPayload,
9+
ChangePasswordResponse,
10+
FirebaseLoginPayload,
11+
FirebaseLoginResponse,
12+
FirebaseRegistrationPayload,
13+
FirebaseRegistrationResponse,
14+
)
1315
from models.service.user_service import User
1416

1517
logger = logging.getLogger("groceror")

api/helpers/inventory_helper.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ class InventoryHelper(object):
1414
def __init__(self, user: User) -> None:
1515
self.user = user
1616

17-
def add_inventory(self, name: str, quantity: int, category: Enum, notes: str = None) -> dict:
17+
def add_inventory(
18+
self, name: str, quantity: int, category: Enum, notes: str = None
19+
) -> dict:
1820
try:
1921
inventory_obj = (
2022
db_session.query(Inventory)
@@ -42,9 +44,7 @@ def add_inventory(self, name: str, quantity: int, category: Enum, notes: str = N
4244
finally:
4345
db_session.close()
4446

45-
def get_store_inventory(
46-
self, items: List[str] = None, quantity_limit: int = None
47-
) -> List[Dict]:
47+
def get_store_inventory(self, items: List[str] = None) -> List[Dict]:
4848
try:
4949
store_inventory = (
5050
db_session.query(Inventory)
@@ -57,10 +57,6 @@ def get_store_inventory(
5757
store_inventory = store_inventory.filter(
5858
Inventory.name.in_(items)
5959
).all()
60-
if quantity_limit:
61-
store_inventory = store_inventory.filter(
62-
Inventory.quantity > quantity_limit
63-
)
6460
else:
6561
logger.critical(f"No store inventory found for {self.user}")
6662
except Exception as e:
@@ -109,10 +105,14 @@ def get_inventory_by_name(self, name: str) -> List[Dict]:
109105

110106
def update_inventory(self, inventory: dict) -> None:
111107
try:
112-
db_session.query(Inventory).filter(Inventory.id == inventory.id).update(inventory)
108+
db_session.query(Inventory).filter(Inventory.id == inventory.id).update(
109+
inventory
110+
)
113111
db_session.commit()
114112
except Exception as e:
115-
logger.exception(f"Error while updating inventory with exception details {e}")
113+
logger.exception(
114+
f"Error while updating inventory with exception details {e}"
115+
)
116116
raise e
117117
finally:
118118
db_session.close()
@@ -122,5 +122,7 @@ def delete_inventory(self, inventory: dict) -> None:
122122
db_session.query(Inventory).filter(Inventory.id == inventory.id).delete()
123123
db_session.commit()
124124
except Exception as e:
125-
logger.exception(f"Error while deleting inventory with exception details {e}")
126-
raise e
125+
logger.exception(
126+
f"Error while deleting inventory with exception details {e}"
127+
)
128+
raise e

api/inventory_api.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
from fastapi import APIRouter, Depends, HTTPException, status
55

66
from api.helpers.inventory_helper import InventoryHelper
7-
from api.validators.inventory_validation import (AddInventoryPayload,
8-
AddInventoryResponse,
9-
StoreInventoryResponse)
7+
from api.validators.inventory_validation import (
8+
AddInventoryPayload,
9+
AddInventoryResponse,
10+
StoreInventoryResponse,
11+
)
1012
from helpers.jwt import auth_required
1113
from models.entity.user_entity import User
1214

api/user_api.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@
66
from loguru import logger
77

88
from api.helpers import auth_helper
9-
from api.validators.user_validation import (ChangePasswordPayload,
10-
ChangePasswordResponse,
11-
LoginPayload, LoginResponse,
12-
RegistrationPayload,
13-
RegistrationResponse)
9+
from api.validators.user_validation import (
10+
ChangePasswordPayload,
11+
ChangePasswordResponse,
12+
LoginPayload,
13+
LoginResponse,
14+
RegistrationPayload,
15+
RegistrationResponse,
16+
)
1417
from config import JWTConfig
1518
from helpers.jwt import JWT
1619

@@ -43,9 +46,7 @@ async def register(registration_payload: RegistrationPayload):
4346
logger.info(f"Registering user with payload: {registration_payload}")
4447
try:
4548
if not auth_helper.is_user_exists(email=registration_payload.email):
46-
new_user = auth_helper.register(
47-
**registration_payload.dict()
48-
)
49+
new_user = auth_helper.register(**registration_payload.dict())
4950
else:
5051
raise HTTPException(
5152
status_code=status.HTTP_409_CONFLICT,
@@ -87,5 +88,3 @@ async def change_password(
8788
logger.info(f"Changing password for user with payload: {change_password_payload}")
8889
auth_helper.change_password(current_user, change_password_payload)
8990
return {"status": "success"}
90-
91-

engine/inventory/cart.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from models.entity.user_entity import User
22

3+
34
class Cart(object):
45
def __init__(self, user: User):
56
self.user = user
@@ -13,26 +14,25 @@ def remove_item(self, item: dict):
1314

1415
def get_cart(self):
1516
return self.items
16-
17+
1718
def clear_cart(self):
1819
self.items = []
19-
20+
2021
def get_total(self):
21-
return sum(item['price'] for item in self.items)
22-
22+
return sum(item["price"] for item in self.items)
23+
2324
def checkout(self):
2425
self.clear_cart()
2526
return self.get_cart_total()
26-
27+
2728
def get_cart_items(self):
2829
return self.items
29-
30+
3031
def get_cart_total(self):
3132
return self.get_total()
3233

3334
def get_cart_count(self):
3435
return len(self.items)
3536

3637
def get_cart_items_total(self):
37-
return sum(item['price'] for item in self.items)
38-
38+
return sum(item["price"] for item in self.items)

helpers/jwt.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,16 @@ def decode_token(self, token: str) -> Union[Dict[str, str], None]:
5555
except jwt.ExpiredSignatureError:
5656
logger.exception("Token has expired")
5757
raise HTTPException(
58-
status_code=status.HTTP_401_UNAUTHORIZED,
59-
detail="Token has expired"
58+
status_code=status.HTTP_401_UNAUTHORIZED, detail="Token has expired"
6059
)
6160
except jwt.InvalidTokenError:
6261
logger.exception("Invalid token")
6362
raise HTTPException(
64-
status_code=status.HTTP_401_UNAUTHORIZED,
65-
detail="Invalid token"
63+
status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid token"
6664
)
6765
except Exception as e:
6866
logger.exception(f"Error while decoding token: {e}")
6967
raise HTTPException(
70-
status_code=status.HTTP_401_UNAUTHORIZED,
71-
detail="Error decoding token"
68+
status_code=status.HTTP_401_UNAUTHORIZED, detail="Error decoding token"
7269
)
7370
return decoded_token

models/entity/user_entity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ class User(SQLModel, table=True):
2222
created_at: datetime = Field(default_factory=datetime.utcnow, nullable=False)
2323
updated_at: datetime = Field(default_factory=datetime.utcnow, nullable=False)
2424
location: Optional[str] = None
25-
#inventory: List["Inventory"] = Relationship(back_populates="user")
25+
# inventory: List["Inventory"] = Relationship(back_populates="user")

models/service/user_service.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import sqlalchemy
66

77
from helpers.exceptions import GrocerorError
8+
89
# from helpers.jwt import JWT
910
from models.db import db_session
1011
from models.entity.user_entity import User

0 commit comments

Comments
 (0)