Commit fe649651 authored by Pratik Shrivastava's avatar Pratik Shrivastava

Merge remote-tracking branch 'upstream/master'

parents 4d2ece43 543926f4
...@@ -10,10 +10,10 @@ SERVER_HOST: str = os.environ.get('SERVER_HOST', '0.0.0.0') ...@@ -10,10 +10,10 @@ SERVER_HOST: str = os.environ.get('SERVER_HOST', '0.0.0.0')
SERVER_PORT: str = os.environ.get('SERVER_PORT', '5011') SERVER_PORT: str = os.environ.get('SERVER_PORT', '5011')
POSTGRES: dict = { POSTGRES: dict = {
'user': os.environ.get('POSTGRES_USER', ''), 'user': os.environ.get('POSTGRES_USER', 'webomagic_python_db'),
'db': os.environ.get('POSTGRES_DB', 'user_db'), 'db': os.environ.get('POSTGRES_DB', 'user_db'),
'host': os.environ.get('POSTGRES_HOST', '127.0.0.1'), 'host': os.environ.get('POSTGRES_HOST', '127.0.0.1'),
'password': urllib.parse.quote(os.environ.get('POSTGRES_PASSWORD', '')), 'password': urllib.parse.quote(os.environ.get('POSTGRES_PASSWORD', 'P@$$w0rdIITKGP')),
'port': os.environ.get('POSTGRES_PORT', '5432') 'port': os.environ.get('POSTGRES_PORT', '5432')
} }
DB_URI: str = 'postgresql://%(user)s:%(password)s@%(host)s:%(port)s/%(db)s' % POSTGRES DB_URI: str = 'postgresql://%(user)s:%(password)s@%(host)s:%(port)s/%(db)s' % POSTGRES
...@@ -27,12 +27,12 @@ REDIS_DATABASE = os.environ.get('REDIS_DATABASE', 0) ...@@ -27,12 +27,12 @@ REDIS_DATABASE = os.environ.get('REDIS_DATABASE', 0)
MAIL_SERVER: str = os.environ.get('MAIL_SERVER', 'smtp.gmail.com') MAIL_SERVER: str = os.environ.get('MAIL_SERVER', 'smtp.gmail.com')
MAIL_PORT: int = os.environ.get('MAIL_PORT', 587) MAIL_PORT: int = os.environ.get('MAIL_PORT', 587)
MAIL_USERNAME = os.environ.get('MAIL_USERNAME', 'shadowtitan3003@gmail.com') MAIL_USERNAME = os.environ.get('MAIL_USERNAME', 'deep.websofttechs@gmail.com')
MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD', 'extv zmvb ibln hquj') MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD', 'xtzsnezbtawrsbwn')
MAIL_DEFAULT_SENDER = os.environ.get('MAIL_DEFAULT_SENDER', 'WEBOMAGIC-TEST') MAIL_DEFAULT_SENDER = os.environ.get('MAIL_DEFAULT_SENDER', 'Webomagic Admin')
LOGGER_PATH: str = os.environ.get('LOGGER_PATH', f'{os.getcwd()}{os.sep}logs{os.sep}') LOGGER_PATH: str = os.environ.get('LOGGER_PATH', '/etc/webomagic_user/logs/')
print(LOGGER_PATH) print(LOGGER_PATH)
def get_logger(__name__: str) -> logging.Logger: def get_logger(__name__: str) -> logging.Logger:
......
...@@ -37,11 +37,12 @@ class AddAddress(Resource): ...@@ -37,11 +37,12 @@ class AddAddress(Resource):
try: try:
validator = AddAddressValidator() validator = AddAddressValidator()
payload: dict = validator.load(request.get_json()) payload: dict = validator.load(request.get_json())
payload['user_id'] = user_id
payload['created_by'] = user_id payload['created_by'] = user_id
address_id: int = add_address(payload) 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: except ValidationError as e:
return prepare_api_response( return prepare_api_response(
...@@ -96,12 +97,13 @@ class GetAddress(Resource): ...@@ -96,12 +97,13 @@ class GetAddress(Resource):
@ns.expect(*get_address_payload()) @ns.expect(*get_address_payload())
@ns.response(*get_address_response()) @ns.response(*get_address_response())
@sanitized() @sanitized()
def get(self): @fetch_user()
def get(self, user_id: int):
try: try:
validator = GetAddressValidator() validator = GetAddressValidator()
arguments: dict = validator.load(request.args) 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: if address_info is None:
return prepare_api_response(404, 'Address not found') return prepare_api_response(404, 'Address not found')
...@@ -129,9 +131,10 @@ class GetAllAddresses(Resource): ...@@ -129,9 +131,10 @@ class GetAllAddresses(Resource):
@ns.doc(security=SECURITY) @ns.doc(security=SECURITY)
@ns.response(*get_address_list_response()) @ns.response(*get_address_list_response())
def get(self): @fetch_user()
def get(self, user_id: int):
try: try:
addresses_list = get_address_list() addresses_list = get_addresses_by_user_id(user_id)
return prepare_api_response( return prepare_api_response(
SUCCESS_CODE, SUCCESS_CODE,
......
...@@ -3,41 +3,35 @@ from app import orm as ORM ...@@ -3,41 +3,35 @@ from app import orm as ORM
from app import db from app import db
def get_address_by_id(address_id: int) -> ORM.Address | None: def get_address_by_id(address_id: int, user_id: int) -> ORM.Address | None:
return ORM.Address.query.filter_by(id=address_id).first() 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]: def get_addresses_by_user_id(user_id: int) -> List[ORM.Address]:
return ORM.Address.query.filter_by(user_id=user_id).all() 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]: 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() return ORM.Address.query.filter_by(user_id=user_id, name=name).first()
def add_address(payload: dict) -> int: def add_address(payload: dict) -> int:
try: 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( address_model = ORM.Address(
user_id=payload['user_id'], user_id=payload.get('user_id'),
name=payload['name'], name=payload.get('name'),
phone_number=payload['phone_number'], phone_number=payload.get('phone_number'),
alternate_phone_number=payload.get('alternate_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'), address_line_2=payload.get('address_line_2'),
landmark=payload.get('landmark'), landmark=payload.get('landmark'),
city=payload['city'], city=payload('city'),
state=payload['state'], state=payload('state'),
pincode=payload['pincode'], pincode=payload('pincode'),
is_default=payload.get('is_default', False), is_default=payload.get('is_default', False),
created_by=payload['created_by'] created_by=payload('created_by'),
) )
db.session.add(address_model) db.session.add(address_model)
db.session.flush([address_model])
db.session.commit() db.session.commit()
return address_model.id return address_model.id
...@@ -52,11 +46,13 @@ def update_address(payload: dict) -> bool: ...@@ -52,11 +46,13 @@ def update_address(payload: dict) -> bool:
address: ORM.Address | None = get_address_by_id(payload.get('id')) address: ORM.Address | None = get_address_by_id(payload.get('id'))
if not address: if not address:
raise Exception ('address does not exist') raise Exception('address does not exist')
address.name = payload.get('name', address.name) address.name = payload.get('name', address.name)
address.phone_number = payload.get('phone_number', address.phone_number) 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_1 = payload.get('address_line_1', address.address_line_1)
address.address_line_2 = payload.get('address_line_2', address.address_line_2) address.address_line_2 = payload.get('address_line_2', address.address_line_2)
address.landmark = payload.get('landmark', address.landmark) address.landmark = payload.get('landmark', address.landmark)
...@@ -83,6 +79,3 @@ def delete_address(address_id: int) -> bool: ...@@ -83,6 +79,3 @@ def delete_address(address_id: int) -> bool:
db.session.commit() db.session.commit()
return True return True
def get_address_list() -> List[ORM.Address]:
return ORM.Address.query.all()
from marshmallow import Schema, fields, validate from marshmallow import Schema, fields, validate
class AddAddressValidator(Schema): class AddAddressValidator(Schema):
user_id = fields.Integer(required=True, validate=validate.Range(min=1))
name = fields.String(required=True) name = fields.String(required=True)
phone_number = fields.String(required=True) phone_number = fields.String(required=True)
alternate_phone_number = fields.String() 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