feature/balance #13
|
@ -113,7 +113,9 @@ def get_transaction(transaction_id) -> Transaction:
|
||||||
return transaction
|
return transaction
|
||||||
|
|
||||||
|
|
||||||
def get_transactions(user, start=None, end=None, limit=None, offset=None, show_reversal=False, show_cancelled=True):
|
def get_transactions(
|
||||||
|
user, start=None, end=None, limit=None, offset=None, show_reversal=False, show_cancelled=True, descending=False
|
||||||
|
):
|
||||||
count = None
|
count = None
|
||||||
query = Transaction.query.filter((Transaction.sender_ == user) | (Transaction.receiver_ == user))
|
query = Transaction.query.filter((Transaction.sender_ == user) | (Transaction.receiver_ == user))
|
||||||
if start:
|
if start:
|
||||||
|
@ -125,7 +127,10 @@ def get_transactions(user, start=None, end=None, limit=None, offset=None, show_r
|
||||||
query = query.filter(Transaction.original_ == None)
|
query = query.filter(Transaction.original_ == None)
|
||||||
if not show_cancelled:
|
if not show_cancelled:
|
||||||
query = query.filter(Transaction.reversal_id.is_(None))
|
query = query.filter(Transaction.reversal_id.is_(None))
|
||||||
query = query.order_by(Transaction.time)
|
if descending:
|
||||||
|
query = query.order_by(Transaction.time.desc())
|
||||||
|
else:
|
||||||
|
query = query.order_by(Transaction.time)
|
||||||
if limit is not None:
|
if limit is not None:
|
||||||
count = query.count()
|
count = query.count()
|
||||||
query = query.limit(limit)
|
query = query.limit(limit)
|
||||||
|
|
|
@ -170,6 +170,7 @@ def get_transactions(userid, current_session: Session):
|
||||||
show_cancelled = request.args.get("showCancelled", True)
|
show_cancelled = request.args.get("showCancelled", True)
|
||||||
limit = request.args.get("limit")
|
limit = request.args.get("limit")
|
||||||
offset = request.args.get("offset")
|
offset = request.args.get("offset")
|
||||||
|
descending = request.args.get("descending", False)
|
||||||
try:
|
try:
|
||||||
if limit is not None:
|
if limit is not None:
|
||||||
limit = int(limit)
|
limit = int(limit)
|
||||||
|
@ -179,11 +180,20 @@ def get_transactions(userid, current_session: Session):
|
||||||
show_reversals = str2bool(show_reversals)
|
show_reversals = str2bool(show_reversals)
|
||||||
if not isinstance(show_cancelled, bool):
|
if not isinstance(show_cancelled, bool):
|
||||||
show_cancelled = str2bool(show_cancelled)
|
show_cancelled = str2bool(show_cancelled)
|
||||||
|
if not isinstance(descending, bool):
|
||||||
|
descending = str2bool(descending)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
raise BadRequest
|
raise BadRequest
|
||||||
|
|
||||||
transactions, count = balance_controller.get_transactions(
|
transactions, count = balance_controller.get_transactions(
|
||||||
user, start, end, limit, offset, show_reversal=show_reversals, show_cancelled=show_cancelled
|
user,
|
||||||
|
start,
|
||||||
|
end,
|
||||||
|
limit,
|
||||||
|
offset,
|
||||||
|
show_reversal=show_reversals,
|
||||||
|
show_cancelled=show_cancelled,
|
||||||
|
descending=descending,
|
||||||
)
|
)
|
||||||
return {"transactions": transactions, "count": count}
|
return {"transactions": transactions, "count": count}
|
||||||
|
|
||||||
|
|
|
@ -567,6 +567,7 @@ def get_columns(userid, current_session):
|
||||||
userController.persist()
|
userController.persist()
|
||||||
return no_content()
|
return no_content()
|
||||||
|
|
||||||
|
|
||||||
@PriceListPlugin.blueprint.route("/users/<userid>/pricecalc_columns_order", methods=["GET", "PUT"])
|
@PriceListPlugin.blueprint.route("/users/<userid>/pricecalc_columns_order", methods=["GET", "PUT"])
|
||||||
@login_required()
|
@login_required()
|
||||||
def get_columns_order(userid, current_session):
|
def get_columns_order(userid, current_session):
|
||||||
|
|
Loading…
Reference in New Issue