diff --git a/config.py b/config.py index 261c700..cd984c8 100644 --- a/config.py +++ b/config.py @@ -10,4 +10,4 @@ class Config: SQLALCHEMY_ECHO = True # APPLICATION_ROOT = '/api' - # FIREBASE_ \ No newline at end of file + # FIREBASE_ diff --git a/src/__init__.py b/src/__init__.py index 6ca7408..4a982fb 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -34,9 +34,6 @@ def create_app(config=Config()): def load_user(user): user_info = str(user).split('_') user_type, user_id = user_info[0], user_info[1] - print(' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ') - print(user_info) - print(' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ') if user_type == 'club': return Club.query.get({'id': user_id}) elif user_type == 'admin': diff --git a/src/models/fundraiser.py b/src/models/fundraiser.py index 781a382..40b115c 100644 --- a/src/models/fundraiser.py +++ b/src/models/fundraiser.py @@ -42,11 +42,6 @@ def serialize(self, simplified=False, ios_style=True): 'endTime': str(self.end_datetime.strftime(DATETIME_FORMAT)), 'items': [item.serialize() for item in self.items] } - let - items: [FundraiserItem] - let - transactions: [Transaction] - extra = {} if not simplified: diff --git a/src/models/transaction.py b/src/models/transaction.py index 14bfdf1..a660f10 100644 --- a/src/models/transaction.py +++ b/src/models/transaction.py @@ -3,6 +3,7 @@ from src import db from src.utils import DATETIME_FORMAT from src.models.fundraiser_item import fundraiser_item_transaction_association_table +from src.models import Fundraiser class Transaction(db.Model): @@ -33,7 +34,7 @@ def serialize(self, simplified=False, ios_style=True): return { 'id': self.id, 'referenceString': self.reference_string, - 'fundraiserId': self.fundraiser, + 'fundraiser': Fundraiser.query.get({'id': self.fundraiser}), 'timestamp': str(self.added_timestamp.strftime(DATETIME_FORMAT)), 'items': [item.serialize(ios_style=True) for item in self.items], 'buyerId': self.payer,