Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

search refactor: Extract add_narrow_conditions(). 

This code was basically pulled from two near-to-each-other
sections of get_messages_backend, and it does an early
return for narrow-is-None.
This commit is contained in:
Steve Howell 2018-04-05 14:42:37 -04:00 committed by Tim Abbott
parent 3ac660d972
commit d521906fb6
1 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
zerver/views/messages.py
View File

@ -557,6 +557,40 @@ def exclude_muting_conditions(user_profile: UserProfile,
return conditions
def add_narrow_conditions(user_profile: UserProfile,
inner_msg_id_col: ColumnElement,
query: Query,
narrow: List[Dict[str, Any]]) -> Tuple[Query, bool]:
first_visible_message_id = get_first_visible_message_id(user_profile.realm)
if first_visible_message_id > 0:
query = query.where(inner_msg_id_col >= first_visible_message_id)
is_search = False
if narrow is None:
return (query, is_search)
# Build the query for the narrow
builder = NarrowBuilder(user_profile, inner_msg_id_col)
search_term = {} # type: Dict[str, Any]
for term in narrow:
if term['operator'] == 'search':
if not is_search:
search_term = term
query = query.column(column("subject")).column(column("rendered_content"))
is_search = True
else:
# Join the search operators if there are multiple of them
search_term['operand'] += ' ' + term['operand']
else:
query = builder.add_term(query, term)
if is_search:
query = builder.add_term(query, search_term)
return (query, is_search)
def find_first_unread_anchor(sa_conn: Any,
inner_msg_id_col: ColumnElement,
user_profile: UserProfile,
@ -631,11 +665,12 @@ def get_messages_backend(request: HttpRequest, user_profile: UserProfile,
literal_column("zerver_message.id")))
inner_msg_id_col = column("message_id")
first_visible_message_id = get_first_visible_message_id(user_profile.realm)
if first_visible_message_id > 0:
query = query.where(inner_msg_id_col >= first_visible_message_id)
is_search = False
query, is_search = add_narrow_conditions(
user_profile=user_profile,
inner_msg_id_col=inner_msg_id_col,
query=query,
narrow=narrow,
)
if narrow is not None:
# Add some metadata to our logging data for narrows
@ -647,23 +682,6 @@ def get_messages_backend(request: HttpRequest, user_profile: UserProfile,
verbose_operators.append(term['operator'])
request._log_data['extra'] = "[%s]" % (",".join(verbose_operators),)
# Build the query for the narrow
builder = NarrowBuilder(user_profile, inner_msg_id_col)
search_term = {} # type: Dict[str, Any]
for term in narrow:
if term['operator'] == 'search':
if not is_search:
search_term = term
query = query.column(column("subject")).column(column("rendered_content"))
is_search = True
else:
# Join the search operators if there are multiple of them
search_term['operand'] += ' ' + term['operand']
else:
query = builder.add_term(query, term)
if is_search:
query = builder.add_term(query, search_term)
sa_conn = get_sqlalchemy_connection()
if use_first_unread_anchor: