diff --git a/backend/api/event.py b/backend/api/event.py index d2f0852..c382824 100644 --- a/backend/api/event.py +++ b/backend/api/event.py @@ -156,8 +156,8 @@ def create_event(org_id): return {'message': "You do not have any role in this organization", 'success': False} - if roleObj.role != Roles.ADMIN: - return {'message': 'You need to be an ADMIN in this organization to create events', + if roleObj.role != Roles.ADMIN and roleObj.role != Roles.CHAIRMAN: + return {'message': 'You need to be an administrator or chairperson in this organization to create events', 'success': False} userObj = sessionObj.user diff --git a/backend/api/user.py b/backend/api/user.py index e09c6c2..780adfe 100644 --- a/backend/api/user.py +++ b/backend/api/user.py @@ -13,7 +13,7 @@ from database.session import Session from database.user import User from database.organization import Organization, OrganizationSchema -from database.event import Event +from database.event import Event, EventSchema from sqlalchemy.dialects.postgresql import UUID @app.route('/login', methods=['POST']) @@ -299,24 +299,11 @@ def get_registered_events(): register_obj = db.session.query(Registration).filter(Registration.register_id == request.user.user_id).all() #print("...DEBUGGING...") #print(register_obj) + event_schema = EventSchema() events = [] for registered in register_obj: event_obj = db.session.query(Event).filter(Event.event_id == registered.event_id).first() - data = { - 'categories': event_obj.categories, - 'contact_id': event_obj.contact_id, - 'creator_id': event_obj.creator_id, - 'start_date': event_obj.start_date, - 'end_date': event_obj.end_date, - 'perk': event_obj.perk, - 'phase': event_obj.phase, - 'info': event_obj.info, - 'organization_id': event_obj.organization_id, - 'event_id': registered.event_id, - 'event_name': event_obj.event_name, - 'created_at': registered.created_at - } - events.append(data) + events.append(event_schema.dump(event_obj)) return jsonify({'success': True, 'message': 'show my registered events', 'events': events})