Commit 90bd6749 authored by deepdey's avatar deepdey

chore: fix address crud api issues

parent f4f321b7
......@@ -37,11 +37,12 @@ class AddAddress(Resource):
try:
validator = AddAddressValidator()
payload: dict = validator.load(request.get_json())
payload['user_id'] = user_id
payload['created_by'] = user_id
address_id: int = add_address(payload)
return prepare_api_response(SUCCESS_CODE, INSERT_SUCCESS_MESSAGE, data={'id': address_id})
return prepare_api_response(SUCCESS_CODE, INSERT_SUCCESS_MESSAGE)
except ValidationError as e:
return prepare_api_response(
......@@ -96,12 +97,13 @@ class GetAddress(Resource):
@ns.expect(*get_address_payload())
@ns.response(*get_address_response())
@sanitized()
def get(self):
@fetch_user()
def get(self, user_id: int):
try:
validator = GetAddressValidator()
arguments: dict = validator.load(request.args)
address_info: ORM.Address | None = get_address_by_id(arguments['id'])
address_info: ORM.Address | None = get_address_by_id(arguments['id'], user_id)
if address_info is None:
return prepare_api_response(404, 'Address not found')
......@@ -129,9 +131,10 @@ class GetAllAddresses(Resource):
@ns.doc(security=SECURITY)
@ns.response(*get_address_list_response())
def get(self):
@fetch_user()
def get(self, user_id: int):
try:
addresses_list = get_address_list()
addresses_list = get_addresses_by_user_id(user_id)
return prepare_api_response(
SUCCESS_CODE,
......
......@@ -3,41 +3,35 @@ from app import orm as ORM
from app import db
def get_address_by_id(address_id: int) -> ORM.Address | None:
return ORM.Address.query.filter_by(id=address_id).first()
def get_address_by_id(address_id: int, user_id: int) -> ORM.Address | None:
return ORM.Address.query.filter_by(id=address_id, user_id=user_id).first()
def get_addresses_by_user_id(user_id: int) -> List[ORM.Address]:
return ORM.Address.query.filter_by(user_id=user_id).all()
def get_addresses_by_user_id_and_name(user_id: int, name: str) -> List[ORM.Address]:
return ORM.Address.query.filter_by(user_id=user_id, name=name).first()
def add_address(payload: dict) -> int:
try:
existing_address: ORM.Address | None = \
get_addresses_by_user_id_and_name(payload.get('user_id'), payload.get('name'))
if existing_address:
raise Exception('address already exists')
address_model = ORM.Address(
user_id=payload['user_id'],
name=payload['name'],
phone_number=payload['phone_number'],
user_id=payload.get('user_id'),
name=payload.get('name'),
phone_number=payload.get('phone_number'),
alternate_phone_number=payload.get('alternate_phone_number'),
address_line_1=payload['address_line_1'],
address_line_1=payload('address_line_1'),
address_line_2=payload.get('address_line_2'),
landmark=payload.get('landmark'),
city=payload['city'],
state=payload['state'],
pincode=payload['pincode'],
city=payload('city'),
state=payload('state'),
pincode=payload('pincode'),
is_default=payload.get('is_default', False),
created_by=payload['created_by']
created_by=payload('created_by'),
)
db.session.add(address_model)
db.session.flush([address_model])
db.session.commit()
return address_model.id
......@@ -49,14 +43,16 @@ def add_address(payload: dict) -> int:
def update_address(payload: dict) -> bool:
try:
address: ORM.Address | None = get_address_by_id(payload.get('id'))
if not address:
raise Exception ('address does not exist')
raise Exception('address does not exist')
address.name = payload.get('name', address.name)
address.phone_number = payload.get('phone_number', address.phone_number)
address.alternate_phone_number = payload.get('alternate_phone_number', address.alternate_phone_number)
address.alternate_phone_number = payload.get(
'alternate_phone_number', address.alternate_phone_number
)
address.address_line_1 = payload.get('address_line_1', address.address_line_1)
address.address_line_2 = payload.get('address_line_2', address.address_line_2)
address.landmark = payload.get('landmark', address.landmark)
......@@ -68,7 +64,7 @@ def update_address(payload: dict) -> bool:
db.session.commit()
return True
except Exception as e:
db.session.rollback()
raise e
......@@ -83,6 +79,3 @@ def delete_address(address_id: int) -> bool:
db.session.commit()
return True
def get_address_list() -> List[ORM.Address]:
return ORM.Address.query.all()
from marshmallow import Schema, fields, validate
class AddAddressValidator(Schema):
user_id = fields.Integer(required=True, validate=validate.Range(min=1))
name = fields.String(required=True)
phone_number = fields.String(required=True)
alternate_phone_number = fields.String()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment