Skip to content

Commit 2edade0

Browse files
committed
Fix lint errors
1 parent 8d97f9a commit 2edade0

2 files changed

Lines changed: 38 additions & 22 deletions

File tree

api/src/api/models/engagement_translation.py

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ class EngagementTranslation(BaseModel):
1717

1818
__tablename__ = 'engagement_translation'
1919
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
20-
engagement_id = db.Column(db.Integer, db.ForeignKey('engagement.id', ondelete='CASCADE'), nullable=False)
21-
language_id = db.Column(db.Integer, db.ForeignKey('language.id', ondelete='CASCADE'), nullable=False)
20+
engagement_id = db.Column(db.Integer, db.ForeignKey(
21+
'engagement.id', ondelete='CASCADE'), nullable=False)
22+
language_id = db.Column(db.Integer, db.ForeignKey(
23+
'language.id', ondelete='CASCADE'), nullable=False)
2224
name = db.Column(db.String(50))
2325
description = db.Column(db.Text())
2426
rich_description = db.Column(JSON, unique=False, nullable=True)
@@ -30,13 +32,17 @@ class EngagementTranslation(BaseModel):
3032
upcoming_status_block_text = db.Column(JSON, unique=False, nullable=True)
3133
open_status_block_text = db.Column(JSON, unique=False, nullable=True)
3234
closed_status_block_text = db.Column(JSON, unique=False, nullable=True)
33-
open_status_block_button_text = db.Column(db.String(20), unique=False, nullable=True)
34-
view_results_status_block_button_text = db.Column(db.String(20), unique=False, nullable=True)
35+
open_status_block_button_text = db.Column(
36+
db.String(20), unique=False, nullable=True)
37+
view_results_status_block_button_text = db.Column(
38+
db.String(20), unique=False, nullable=True)
3539
sponsor_name = db.Column(db.String(50))
3640
feedback_heading = db.Column(db.String(60), unique=False, nullable=True)
3741
feedback_body = db.Column(JSON, unique=False, nullable=True)
38-
subscribe_section_heading = db.Column(db.String(60), unique=False, nullable=True)
39-
subscribe_section_description = db.Column(JSON, unique=False, nullable=True)
42+
subscribe_section_heading = db.Column(
43+
db.String(60), unique=False, nullable=True)
44+
subscribe_section_description = db.Column(
45+
JSON, unique=False, nullable=True)
4046
subscribe_consent_message = db.Column(JSON, unique=False, nullable=True)
4147
more_engagements_heading = db.Column(db.String(60), nullable=True)
4248

@@ -65,7 +71,8 @@ def get_engagement_translation_by_engagement_and_language(
6571
@classmethod
6672
def create_engagement_translation(cls, data):
6773
"""Create a new engagement translation."""
68-
engagement_translation = cls.__create_new_engagement_translation_entity(data)
74+
engagement_translation = cls.__create_new_engagement_translation_entity(
75+
data)
6976
db.session.add(engagement_translation)
7077
db.session.commit()
7178
return engagement_translation
@@ -83,24 +90,33 @@ def __create_new_engagement_translation_entity(data):
8390
rich_content=data.get('rich_content', None),
8491
consent_message=data.get('consent_message', None),
8592
slug=data.get('slug', None),
86-
upcoming_status_block_text=data.get('upcoming_status_block_text', None),
93+
upcoming_status_block_text=data.get(
94+
'upcoming_status_block_text', None),
8795
open_status_block_text=data.get('open_status_block_text', None),
88-
closed_status_block_text=data.get('closed_status_block_text', None),
89-
open_status_block_button_text=data.get('open_status_block_button_text', None),
90-
view_results_status_block_button_text=data.get('view_results_status_block_button_text', None),
96+
closed_status_block_text=data.get(
97+
'closed_status_block_text', None),
98+
open_status_block_button_text=data.get(
99+
'open_status_block_button_text', None),
100+
view_results_status_block_button_text=data.get(
101+
'view_results_status_block_button_text', None),
91102
sponsor_name=data.get('sponsor_name', None),
92103
feedback_heading=data.get('feedback_heading', None),
93104
feedback_body=data.get('feedback_body', None),
94-
subscribe_section_heading=data.get('subscribe_section_heading', None),
95-
subscribe_section_description=data.get('subscribe_section_description', None),
96-
subscribe_consent_message=data.get('subscribe_consent_message', None),
97-
more_engagements_heading=data.get('more_engagements_heading', None),
105+
subscribe_section_heading=data.get(
106+
'subscribe_section_heading', None),
107+
subscribe_section_description=data.get(
108+
'subscribe_section_description', None),
109+
subscribe_consent_message=data.get(
110+
'subscribe_consent_message', None),
111+
more_engagements_heading=data.get(
112+
'more_engagements_heading', None),
98113
)
99114

100115
@staticmethod
101116
def update_engagement_translation(engagement_translation_id, data: dict) -> Optional[EngagementTranslation]:
102117
"""Update an existing engagement translation."""
103-
query = EngagementTranslation.query.filter_by(id=engagement_translation_id)
118+
query = EngagementTranslation.query.filter_by(
119+
id=engagement_translation_id)
104120
engagement_translation: EngagementTranslation = query.first()
105121
if not engagement_translation:
106122
return None
@@ -111,15 +127,16 @@ def update_engagement_translation(engagement_translation_id, data: dict) -> Opti
111127
@staticmethod
112128
def delete_engagement_translation(engagement_translation_id):
113129
"""Delete a engagement translation."""
114-
engagement_translation = EngagementTranslation.query.get(engagement_translation_id)
130+
engagement_translation = EngagementTranslation.query.get(
131+
engagement_translation_id)
115132
if engagement_translation:
116133
db.session.delete(engagement_translation)
117134
db.session.commit()
118135
return True
119136
return False
120137

121138
@staticmethod
122-
def get_available_translation_languages(engagement_id):
139+
def get_available_translations(engagement_id):
123140
"""Get the list of translations for this engagement, then tally the languages that are used."""
124141
available_translations_query = db.session.query(EngagementTranslation.language_id)\
125142
.filter_by(engagement_id=engagement_id)

api/src/api/services/engagement_service.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -504,10 +504,9 @@ def _normalize_language_codes(language_codes: object) -> list[str]:
504504
@staticmethod
505505
def _get_default_language_code() -> str:
506506
default_language = (
507-
(current_app.config.get('DEFAULT_LANGUAGE')
508-
if has_app_context() else None)
509-
or os.getenv('DEFAULT_LANGUAGE')
510-
or 'en'
507+
(current_app.config.get('DEFAULT_LANGUAGE') if has_app_context() else None) or
508+
os.getenv('DEFAULT_LANGUAGE') or
509+
'en'
511510
)
512511
return default_language.strip().lower()
513512

0 commit comments

Comments
 (0)