@@ -1020,44 +1020,6 @@ def get_user_submissions_and_logs(user):
1020
1020
if conn is not None :
1021
1021
conn .close ()
1022
1022
1023
-
1024
- def get_all_submissions ():
1025
- cur = None
1026
- conn = None
1027
- try :
1028
- conn = psycopg2 .connect (
1029
- host = APCD_DB ['host' ],
1030
- dbname = APCD_DB ['database' ],
1031
- user = APCD_DB ['user' ],
1032
- password = APCD_DB ['password' ],
1033
- port = APCD_DB ['port' ],
1034
- sslmode = 'require'
1035
- )
1036
- query = """
1037
- SELECT
1038
- submissions.submission_id,
1039
- submissions.apcd_id,
1040
- submissions.submitter_id,
1041
- submissions.zip_file_name,
1042
- submissions.status,
1043
- submissions.outcome,
1044
- submissions.received_timestamp,
1045
- submissions.updated_at,
1046
- apcd_orgs.official_name
1047
- FROM submissions
1048
- JOIN apcd_orgs
1049
- ON submissions.apcd_id = apcd_orgs.apcd_id
1050
- ORDER BY submissions.received_timestamp DESC
1051
- """
1052
- cur = conn .cursor ()
1053
- cur .execute (query )
1054
- return cur .fetchall ()
1055
- finally :
1056
- if cur is not None :
1057
- cur .close ()
1058
- if conn is not None :
1059
- conn .close ()
1060
-
1061
1023
def get_all_submissions_and_logs ():
1062
1024
cur = None
1063
1025
conn = None
@@ -1073,14 +1035,13 @@ def get_all_submissions_and_logs():
1073
1035
query = """
1074
1036
SELECT json_build_object(
1075
1037
'submission_id', submissions.submission_id,
1076
- 'apcd_id ', submissions.apcd_id ,
1038
+ 'entity_name ', submitters.entity_name ,
1077
1039
'submitter_id', submissions.submitter_id,
1078
1040
'file_name', submissions.zip_file_name,
1079
1041
'status', submissions.status,
1080
1042
'outcome', submissions.outcome,
1081
1043
'received_timestamp', submissions.received_timestamp,
1082
1044
'updated_at', submissions.updated_at,
1083
- 'org_name', submitters.org_name,
1084
1045
'view_modal_content', (
1085
1046
SELECT COALESCE(json_agg(json_build_object(
1086
1047
'log_id', submission_logs.log_id,
@@ -1101,7 +1062,7 @@ def get_all_submissions_and_logs():
1101
1062
ON submitters.submitter_id = submissions.submitter_id
1102
1063
LEFT JOIN submission_logs
1103
1064
ON submissions.submission_id = submission_logs.submission_id
1104
- GROUP BY (submissions.submission_id, submitters.org_name )
1065
+ GROUP BY (submissions.submission_id, submitters.entity_name )
1105
1066
ORDER BY submissions.received_timestamp DESC
1106
1067
"""
1107
1068
cur = conn .cursor ()
0 commit comments