Frontend Mods

Author: joshgarde

backend/api/event.py

@@ -64,8 +64,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 or 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

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'])
@@ -301,13 +301,9 @@ def get_registered_events():
     #print(register_obj)
     events = []
     for registered in register_obj:
-        event_obj = db.session.query(Event).filter(Event.event_id == registered.event_id).first()
-        data = {
-            'event_id': registered.event_id,
-            'event_name': event_obj.event_name,
-            'created_at': registered.created_at
-        }
-        events.append(data)
+        event_obj = db.session.query(Event).filter(Event.event_id == registered.event_id).all()
+        event_schema = EventSchema(many=True)
+        events.append(event_schema.dump(event_obj))
     return jsonify({'success': True, 'message': 'show my registered events', 'events': events})