Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on event related and added new create_on and updated_on forced change to UTC.

Browse Source
This commit is contained in:
Scott Idem
2021-09-28 15:04:09 -04:00
parent 35e9178472
commit e0b9c975b0
4 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
app/methods/event_methods.py
View File

@@ -27,9 +27,9 @@ def load_event_obj(
exclude_unset: bool = True,
model_as_dict: bool = False,
enabled: str = 'enabled', # enabled, disabled, all
inc_address: bool = False, # Under contact
inc_address: bool = False, # Loads address_location and under contact(s)
# inc_address_location: bool = False,
inc_contact: bool = False,
inc_contact: bool = False, # Loads all 3 contacts
# inc_contact_1: bool = False,
# inc_contact_2: bool = False,
# inc_contact_3: bool = False,
@@ -295,8 +295,9 @@ def get_event_rec_list(
organization_id: str = None,
person_id: str = None,
user_id: str = None,
limit: int = 1000,
limit: int = 500,
enabled: str = 'enabled', # enabled, disabled, all
archived: str = 'archived', # archived, not_archived, all
conference: bool = False, # If it is a conference then organization, person, and user are queried as participants (not the owner/organizer)
) -> list|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -324,6 +325,18 @@ def get_event_rec_list(
data['user_id'] = user_id
data['conference'] = conference
if archived in ['archived', 'not_archived', 'all']:
if archived == 'archived':
data['archive'] = True
sql_archived = f'AND `event`.archive = :archive'
elif archived == 'not_archived':
data['archive'] = False
sql_archived = f'AND (`event`.archive = :archive OR `event`.archive IS NULL)'
elif archived == 'all':
sql_archived = ''
else:
sql_archived = f'AND `event`.archive = :archive'
if conference:
data['conference'] = True
sql_conference = f'AND `event`.conference = :conference'
@@ -331,7 +344,17 @@ def get_event_rec_list(
data['conference'] = False
sql_conference = f'AND `event`.conference = :conference'
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
sql_enabled = f'AND `event`.enable = :enable'
elif enabled == 'disabled':
data['enable'] = False
sql_enabled = f'AND `event`.enable = :enable'
elif enabled == 'all':
sql_enabled = ''
else:
sql_enabled = f'AND `event`.enable = :enable'
if limit:
data['limit'] = limit
@@ -349,24 +372,13 @@ def get_event_rec_list(
elif user_id:
sql_where_type_id = f'`event`.user_id = :user_id'
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
sql_enabled = f'AND `event`.enable = :enable'
elif enabled == 'disabled':
data['enable'] = False
sql_enabled = f'AND `event`.enable = :enable'
elif enabled == 'all':
sql_enabled = ''
else:
sql_enabled = f'AND `event`.enable = :enable'
sql = f"""
SELECT `event`.id AS 'event_id', `event`.id_random AS 'event_id_random'
FROM `event` AS `event`
WHERE
{sql_where_type_id}
{sql_enabled}
{sql_archived}
{sql_conference}
ORDER BY `event`.created_on DESC, `event`.updated_on DESC
{sql_limit};
@@ -379,26 +391,15 @@ def get_event_rec_list(
elif user_id:
sql_inner_join = f'`user` ON event_person.user_id = user.id AND user.id AND user.id = :user_id'
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
sql_enabled = f'`event`.enable = :enable'
elif enabled == 'disabled':
data['enable'] = False
sql_enabled = f'`event`.enable = :enable'
elif enabled == 'all':
sql_enabled = ''
else:
sql_enabled = f'`event`.enable = :enable'
sql = f"""
SELECT `event`.id AS 'event_id', `event`.id_random AS 'event_id_random'
FROM `event` AS `event`
INNER JOIN `event_person` ON event.id = event_person.event_id
/*INNER JOIN `person` ON event_person.person_id = person.id*/
INNER JOIN {sql_inner_join}
WHERE
WHERE 1=1
{sql_enabled}
{sql_archived}
{sql_conference}
ORDER BY `event`.created_on DESC, `event`.updated_on DESC
{sql_limit};