alahouze/accountant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up session management.

Browse Source
This commit is contained in:
Alexis Lahouze 2013-12-03 23:01:17 +01:00
parent b19bb5fc7a
commit a300db9845
4 changed files with 119 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
api/controller/accounts.py
View File

@ -15,7 +15,7 @@
along with Accountant. If not, see <http://www.gnu.org/licenses/>. along with Accountant. If not, see <http://www.gnu.org/licenses/>.
""" """
from .. import api from .. import api
from ..model import db from ..model import db, session_scope
from ..model.accounts import Account from ..model.accounts import Account
from ..model.entries import Entry from ..model.entries import Entry
from ..model.operations import Operation from ..model.operations import Operation
@ -27,8 +27,7 @@ def get_accounts():
""" """
Returns accounts with their solds. Returns accounts with their solds.
""" """
session = db.session with session_scope() as session:
query = session.query( query = session.query(
Account.id.label("id"), Account.id.label("id"),
Account.name.label("name"), Account.name.label("name"),
@ -49,8 +48,7 @@ def get_accounts():
@api.route("/accounts/<account_id>/<year>/<month>/") @api.route("/accounts/<account_id>/<year>/<month>/")
def get_account_status(account_id, year, month): def get_account_status(account_id, year, month):
session = db.session with session_scope() as session:
query = session.query( query = session.query(
func.sum(case([(func.sign(Operation.value) == -1, Operation.value)], else_=0)).label("expenses"), func.sum(case([(func.sign(Operation.value) == -1, Operation.value)], else_=0)).label("expenses"),
func.sum(case([(func.sign(Operation.value) == 1, Operation.value)], else_=0)).label("revenues"), func.sum(case([(func.sign(Operation.value) == 1, Operation.value)], else_=0)).label("revenues"),
@ -79,8 +77,7 @@ def get_account_status(account_id, year, month):
@api.route("/accounts/<account_id>/months") @api.route("/accounts/<account_id>/months")
def get_months(account_id): def get_months(account_id):
session = db.session with session_scope() as session:
query = session.query( query = session.query(
distinct(func.lpad(cast(extract("year", Entry.operation_date), db.String), 4, '0')).label("year"), distinct(func.lpad(cast(extract("year", Entry.operation_date), db.String), 4, '0')).label("year"),
func.lpad(cast(extract("month", Entry.operation_date), db.String), 2, '0').label("month") func.lpad(cast(extract("month", Entry.operation_date), db.String), 2, '0').label("month")
@ -93,50 +90,32 @@ def get_months(account_id):
@api.route("/accounts", methods=["PUT"]) @api.route("/accounts", methods=["PUT"])
def add_account(): def add_account():
session = db.session with session_scope() as session:
try:
account = Account(request.json['name'], request.json['authorized_overdraft']) account = Account(request.json['name'], request.json['authorized_overdraft'])
session.add(account) session.add(account)
session.commit()
return json.dumps("Account added.") return json.dumps("Account added.")
except:
session.rollback()
raise
@api.route("/accounts/<account_id>", methods=["PUT"]) @api.route("/accounts/<account_id>", methods=["PUT"])
def update_account(account_id): def update_account(account_id):
session = db.session with session_scope() as session:
try:
account = session.query(Account).filter(Account.id == account_id).first() account = session.query(Account).filter(Account.id == account_id).first()
account.name = request.json['name'] account.name = request.json['name']
account.authorized_overdraft = request.json['authorized_overdraft'] account.authorized_overdraft = request.json['authorized_overdraft']
session.merge(account) session.merge(account)
session.commit()
return json.dumps("Account #%s updated." % account_id) return json.dumps("Account #%s updated." % account_id)
except:
session.rollback()
raise
@api.route("/accounts/<account_id>", methods=["DELETE"]) @api.route("/accounts/<account_id>", methods=["DELETE"])
def delete_account(account_id): def delete_account(account_id):
session = db.session with session_scope() as session:
try:
account = session.query(Account).filter(Account.id == account_id).first() account = session.query(Account).filter(Account.id == account_id).first()
session.delete(account) session.delete(account)
session.commit()
return json.dumps("Account #%s deleted." % account_id) return json.dumps("Account #%s deleted." % account_id)
except:
session.rollback()
raise

29
api/controller/entries.py
View File

@ -15,7 +15,7 @@
along with Accountant. If not, see <http://www.gnu.org/licenses/>. along with Accountant. If not, see <http://www.gnu.org/licenses/>.
""" """
from .. import api from .. import api
from ..model import db from ..model import db, session_scope
from ..model.entries import Entry from ..model.entries import Entry
from ..model.operations import Operation from ..model.operations import Operation
from ..model.scheduled_operations import ScheduledOperation from ..model.scheduled_operations import ScheduledOperation
@ -30,8 +30,7 @@ def get_entries(account_id, year, month):
""" """
Return entries for an account, year, and month. Return entries for an account, year, and month.
""" """
session = db.session with session_scope() as session:
base_query = session.query( base_query = session.query(
Operation, Operation,
case(whens={Operation.canceled: None}, else_=func.sum(Operation.value).over(partition_by="canceled", order_by="operation_date, value desc, label desc")).label("sold") case(whens={Operation.canceled: None}, else_=func.sum(Operation.value).over(partition_by="canceled", order_by="operation_date, value desc, label desc")).label("sold")
@ -58,9 +57,7 @@ def get_entries(account_id, year, month):
@api.route("/entries", methods=["PUT"]) @api.route("/entries", methods=["PUT"])
def add_entry(): def add_entry():
session = db.session with session_scope() as session:
try:
entry = Entry( entry = Entry(
operation_date = request.json['operation_date'], operation_date = request.json['operation_date'],
pointed = request.json['pointed'], pointed = request.json['pointed'],
@ -72,18 +69,12 @@ def add_entry():
) )
session.add(entry) session.add(entry)
session.commit()
return json.dumps("Entry added.") return json.dumps("Entry added.")
except:
session.rollback()
raise
@api.route("/entries/<entry_id>", methods=["PUT"]) @api.route("/entries/<entry_id>", methods=["PUT"])
def update_entry(entry_id): def update_entry(entry_id):
session = db.session with session_scope() as session:
try:
entry = session.query(Entry).filter(Entry.id == entry_id).first() entry = session.query(Entry).filter(Entry.id == entry_id).first()
entry.id = entry_id entry.id = entry_id
@ -96,25 +87,15 @@ def update_entry(entry_id):
entry.scheduled_operation_id = request.json['scheduled_operation_id'] entry.scheduled_operation_id = request.json['scheduled_operation_id']
session.merge(entry) session.merge(entry)
session.commit()
return json.dumps("Entry #%s updated." % entry_id) return json.dumps("Entry #%s updated." % entry_id)
except:
session.rollback()
raise
@api.route("/entries/<entry_id>", methods=["DELETE"]) @api.route("/entries/<entry_id>", methods=["DELETE"])
def delete_entry(entry_id): def delete_entry(entry_id):
session = db.session with session_scope() as session:
try:
entry = session.query(Entry).filter(Entry.id == entry_id).first() entry = session.query(Entry).filter(Entry.id == entry_id).first()
session.delete(entry) session.delete(entry)
session.commit()
return json.dumps("Entry #%s deleted." % entry_id) return json.dumps("Entry #%s deleted." % entry_id)
except:
session.rollback()
raise

29
api/controller/scheduled_operations.py
View File

@ -1,5 +1,5 @@
from .. import api from .. import api
from ..model import db from ..model import db, session_scope
from ..model.scheduled_operations import ScheduledOperation from ..model.scheduled_operations import ScheduledOperation
from flask import json, request from flask import json, request
from sqlalchemy import func, desc from sqlalchemy import func, desc
@ -12,8 +12,7 @@ def get_scheduled_operations(account_id):
""" """
Return entries for an account, year, and month. Return entries for an account, year, and month.
""" """
session = db.session with session_scope() as session:
query = session.query( query = session.query(
ScheduledOperation ScheduledOperation
).select_from( ).select_from(
@ -40,9 +39,7 @@ def get_scheduled_operations(account_id):
@api.route("/scheduled_operations", methods=["PUT"]) @api.route("/scheduled_operations", methods=["PUT"])
def add_scheduled_operation(): def add_scheduled_operation():
session = db.session with session_scope() as session:
try:
scheduledOperation = ScheduledOperation( scheduledOperation = ScheduledOperation(
start_date = request.json['start_date'], start_date = request.json['start_date'],
stop_date = request.json['stop_date'], stop_date = request.json['stop_date'],
@ -55,18 +52,12 @@ def add_scheduled_operation():
) )
session.add(scheduledOperation) session.add(scheduledOperation)
session.commit()
return json.dumps("Scheduled operation added.") return json.dumps("Scheduled operation added.")
except:
session.rollback()
raise
@api.route("/scheduled_operations/<scheduled_operation_id>", methods=["PUT"]) @api.route("/scheduled_operations/<scheduled_operation_id>", methods=["PUT"])
def update_scheduled_operation(scheduled_operation_id): def update_scheduled_operation(scheduled_operation_id):
session = db.session with session_scope() as session:
try:
scheduledOperation = session.query(ScheduledOperation).filter(ScheduledOperation.id == scheduled_operation_id).first() scheduledOperation = session.query(ScheduledOperation).filter(ScheduledOperation.id == scheduled_operation_id).first()
scheduledOperation.id = scheduled_operation_id scheduledOperation.id = scheduled_operation_id
@ -80,25 +71,15 @@ def update_scheduled_operation(scheduled_operation_id):
scheduledOperation.account_id = request.json['account_id'] scheduledOperation.account_id = request.json['account_id']
session.merge(scheduledOperation) session.merge(scheduledOperation)
session.commit()
return json.dumps("Scheduled operation #%s updated." % scheduled_operation_id) return json.dumps("Scheduled operation #%s updated." % scheduled_operation_id)
except:
session.rollback()
raise
@api.route("/scheduled_operations/<scheduled_operation_id>", methods=["DELETE"]) @api.route("/scheduled_operations/<scheduled_operation_id>", methods=["DELETE"])
def delete_scheduled_operation(scheduled_operation_id): def delete_scheduled_operation(scheduled_operation_id):
session = db.session with session_scope() as session:
try:
scheduledOperation = session.query(ScheduledOperation).filter(ScheduledOperation.id == scheduled_operation_id).first() scheduledOperation = session.query(ScheduledOperation).filter(ScheduledOperation.id == scheduled_operation_id).first()
session.delete(scheduledOperation) session.delete(scheduledOperation)
session.commit()
return json.dumps("Scheduled operation #%s deleted." % scheduled_operation_id) return json.dumps("Scheduled operation #%s deleted." % scheduled_operation_id)
except:
session.rollback()
raise

6
api/model/__init__.py
View File

@ -6,9 +6,9 @@ from sqlalchemy.orm import scoped_session, sessionmaker
db = SQLAlchemy() db = SQLAlchemy()
@contextmanager @contextmanager
def session_scope(engine): def session_scope():
if engine: #session = scoped_session(sessionmaker(autocommit = False, autoflush = False, bind = engine))
session = scoped_session(sessionmaker(autocommit = False, autoflush = False, bind = engine)) session = db.session
#Base.query = session.query_property() #Base.query = session.query_property()
try: try: