Skip to content

Commit 3667cbf

Browse files
linting
1 parent f801835 commit 3667cbf

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

analytics-api/src/analytics_api/models/request_type_option.py

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ def get_survey_result(
5555
if result:
5656
# Get all the available responses for each question within the survey.
5757
available_response = (db.session.query(AvailableResponseOptionModel.request_key,
58-
AvailableResponseOptionModel.value)
59-
.filter(and_(AvailableResponseOptionModel.survey_id.in_(
60-
analytics_survey_id), AvailableResponseOptionModel.is_active == true()))
61-
.subquery())
58+
AvailableResponseOptionModel.value)
59+
.filter(and_(AvailableResponseOptionModel.survey_id.in_(
60+
analytics_survey_id), AvailableResponseOptionModel.is_active == true()))
61+
.subquery())
6262
# Get all the survey responses with the counts for each response specific to a survey id which
6363
# are in active status.
6464
survey_response = (db.session.query(ResponseTypeOptionModel.request_key, ResponseTypeOptionModel.value,
6565
func.count(ResponseTypeOptionModel.request_key).label('response'))
66-
.filter(and_(ResponseTypeOptionModel.survey_id.in_(analytics_survey_id),
66+
.filter(and_(ResponseTypeOptionModel.survey_id.in_(analytics_survey_id),
6767
ResponseTypeOptionModel.is_active == true()))
68-
.group_by(ResponseTypeOptionModel.request_key, ResponseTypeOptionModel.value)
69-
.subquery())
68+
.group_by(ResponseTypeOptionModel.request_key, ResponseTypeOptionModel.value)
69+
.subquery())
7070

7171
survey_response_exists = db.session.query(survey_response.c.request_key).first()
7272
available_response_exists = db.session.query(available_response.c.request_key).first()
@@ -81,33 +81,33 @@ def get_survey_result(
8181
# which fetches all the available responses along with the corresponding reponses.
8282
if survey_response_exists and available_response_exists:
8383
survey_result = (db.session.query((survey_question.c.position).label('position'),
84-
(survey_question.c.label).label('question'),
85-
func.json_agg(func.json_build_object(
86-
'value', available_response.c.value,
87-
'count', func.coalesce(survey_response.c.response, 0)))
88-
.label('result'))
89-
.outerjoin(available_response, survey_question.c.key == available_response.c.request_key)
90-
.outerjoin(survey_response,
84+
(survey_question.c.label).label('question'),
85+
func.json_agg(func.json_build_object(
86+
'value', available_response.c.value,
87+
'count', func.coalesce(survey_response.c.response, 0)))
88+
.label('result'))
89+
.outerjoin(available_response, survey_question.c.key == available_response.c.request_key)
90+
.outerjoin(survey_response,
9191
(available_response.c.value == survey_response.c.value) &
9292
(available_response.c.request_key == survey_response.c.request_key),
9393
full=True)
94-
.filter(survey_question.c.position.isnot(None))
95-
.filter(survey_question.c.label.isnot(None))
96-
.group_by(survey_question.c.position, survey_question.c.label))
94+
.filter(survey_question.c.position.isnot(None))
95+
.filter(survey_question.c.label.isnot(None))
96+
.group_by(survey_question.c.position, survey_question.c.label))
9797

9898
return survey_result.all()
9999
# Check if there are records in survey_response before executing the final query which fetches reponses
100100
# even if the available_response table is not yet populated.
101101
if survey_response_exists:
102102
survey_result = (db.session.query((survey_question.c.position).label('position'),
103-
(survey_question.c.label).label('question'),
104-
func.json_agg(func.json_build_object('value',
105-
survey_response.c.value,
106-
'count',
107-
survey_response.c.response))
108-
.label('result'))
109-
.join(survey_response, survey_response.c.request_key == survey_question.c.key)
110-
.group_by(survey_question.c.position, survey_question.c.label))
103+
(survey_question.c.label).label('question'),
104+
func.json_agg(func.json_build_object('value',
105+
survey_response.c.value,
106+
'count',
107+
survey_response.c.response))
108+
.label('result'))
109+
.join(survey_response, survey_response.c.request_key == survey_question.c.key)
110+
.group_by(survey_question.c.position, survey_question.c.label))
111111

112112
return survey_result.all()
113113

analytics-api/src/analytics_api/utils/engagement_access_validator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def check_engagement_access(engagement_id):
1818
EngagementModel.is_active == true(),
1919
or_(
2020
EngagementModel.status_name == Status.Unpublished.value,
21-
EngagementModel.send_report == False
21+
EngagementModel.send_report.is_(False)
2222
)
2323
)
2424
)

0 commit comments

Comments
 (0)