Skip to content

Commit

Permalink
api: Rename get_old_messages to get_messages in the backend.
Browse files Browse the repository at this point in the history
Fixes zulip#1315.
  • Loading branch information
timabbott committed Mar 24, 2017
1 parent 95789eb commit 3617ebf
Show file tree
Hide file tree
Showing 10 changed files with 94 additions and 94 deletions.
6 changes: 3 additions & 3 deletions tools/deprecated/stress-test/stress-test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ZulipSession extends Session
anchor: @pointer
num_before: 200
num_after: 200
}, get_old_messages_time.cbTimer cb
}, get_messages_time.cbTimer cb

reload: (cb) ->
@get '/', =>
Expand Down Expand Up @@ -105,7 +105,7 @@ class ZulipSession extends Session
setTimeout(@random_sends, @rand_time())

# TODO: update_message_flags
# TODO: get_old_messages
# TODO: get_messages

run_message_test: =>
@login =>
Expand Down Expand Up @@ -158,7 +158,7 @@ stats = [
message_send_time = new Stat("Message Send Time")
update_status_time = new Stat("/json/update_status_time Time")
total_reload_time = new Stat("Total reload time")
get_old_messages_time = new Stat("/json/get_old_messages Time")
get_messages_time = new Stat("/json/get_messages Time")
]

# Reset message latency stat after everyone logs in
Expand Down
2 changes: 1 addition & 1 deletion zerver/lib/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def fetch_initial_state_data(user_profile, event_types, queue_id,
state['attachments'] = user_attachments(user_profile)

if want('message'):
# The client should use get_old_messages() to fetch messages
# The client should use get_messages() to fetch messages
# starting with the max_message_id. They will get messages
# newer than that ID via get_events()
messages = Message.objects.filter(usermessage__user_profile=user_profile).order_by('-id')[:1]
Expand Down
2 changes: 1 addition & 1 deletion zerver/lib/test_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ def send_message(self, sender_name, raw_recipients, message_type,
content, forged=False, forged_timestamp=None,
forwarder_user_profile=sender, realm=sender.realm, **kwargs)

def get_old_messages(self, anchor=1, num_before=100, num_after=100):
def get_messages(self, anchor=1, num_before=100, num_after=100):
# type: (int, int, int) -> List[Dict[str, Any]]
post_params = {"anchor": anchor, "num_before": num_before,
"num_after": num_after}
Expand Down
2 changes: 1 addition & 1 deletion zerver/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ def to_log_dict(self):
def get_raw_db_rows(needed_ids):
# type: (List[int]) -> List[Dict[str, Any]]
# This is a special purpose function optimized for
# callers like get_old_messages_backend().
# callers like get_messages_backend().
fields = [
'id',
'subject',
Expand Down
6 changes: 3 additions & 3 deletions zerver/tests/test_messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -1679,7 +1679,7 @@ def test_change_star(self):
result = self.change_star(message_ids)
self.assert_json_success(result)

for msg in self.get_old_messages():
for msg in self.get_messages():
if msg['id'] in message_ids:
self.assertEqual(msg['flags'], ['starred'])
else:
Expand All @@ -1689,7 +1689,7 @@ def test_change_star(self):
self.assert_json_success(result)

# Remove the stars.
for msg in self.get_old_messages():
for msg in self.get_messages():
if msg['id'] in message_ids:
self.assertEqual(msg['flags'], [])

Expand Down Expand Up @@ -1726,7 +1726,7 @@ def test_change_star_public_stream_historical(self):
result = self.change_star(message_ids)
self.assert_json_success(result)

for msg in self.get_old_messages():
for msg in self.get_messages():
if msg['id'] in message_ids + other_message_ids:
self.assertEqual(set(msg['flags']), {'starred', 'historical', 'read'})
else:
Expand Down
138 changes: 69 additions & 69 deletions zerver/tests/test_narrow.py

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions zerver/tests/test_unread.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def test_update_flags(self):

# Ensure we properly set the flags
found = 0
for msg in self.get_old_messages():
for msg in self.get_messages():
if msg['id'] in self.unread_msg_ids:
self.assertEqual(msg['flags'], ['read'])
found += 1
Expand All @@ -123,7 +123,7 @@ def test_update_flags(self):
self.assert_json_success(result)

# Ensure we properly remove just one flag
for msg in self.get_old_messages():
for msg in self.get_messages():
if msg['id'] == self.unread_msg_ids[0]:
self.assertEqual(msg['flags'], ['read'])
elif msg['id'] == self.unread_msg_ids[1]:
Expand All @@ -149,7 +149,7 @@ def test_update_all_flags(self):
"all": ujson.dumps(True)})
self.assert_json_success(result)

for msg in self.get_old_messages():
for msg in self.get_messages():
self.assertEqual(msg['flags'], [])

def test_mark_all_in_stream_read(self):
Expand Down
18 changes: 9 additions & 9 deletions zerver/views/messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -528,14 +528,14 @@ def mute_cond(muted):
return conditions

@has_request_variables
def get_old_messages_backend(request, user_profile,
anchor = REQ(converter=int),
num_before = REQ(converter=to_non_negative_int),
num_after = REQ(converter=to_non_negative_int),
narrow = REQ('narrow', converter=narrow_parameter, default=None),
use_first_unread_anchor = REQ(default=False, converter=ujson.loads),
apply_markdown=REQ(default=True,
converter=ujson.loads)):
def get_messages_backend(request, user_profile,
anchor = REQ(converter=int),
num_before = REQ(converter=to_non_negative_int),
num_after = REQ(converter=to_non_negative_int),
narrow = REQ('narrow', converter=narrow_parameter, default=None),
use_first_unread_anchor = REQ(default=False, converter=ujson.loads),
apply_markdown=REQ(default=True,
converter=ujson.loads)):
# type: (HttpRequest, UserProfile, int, int, int, Optional[List[Dict[str, Any]]], bool, bool) -> HttpResponse
include_history = ok_to_include_history(narrow, user_profile.realm)

Expand Down Expand Up @@ -645,7 +645,7 @@ def get_old_messages_backend(request, user_profile,
main_query = alias(query)
query = select(main_query.c, None, main_query).order_by(column("message_id").asc())
# This is a hack to tag the query we use for testing
query = query.prefix_with("/* get_old_messages */")
query = query.prefix_with("/* get_messages */")
query_result = list(sa_conn.execute(query).fetchall())

# The following is a little messy, but ensures that the code paths
Expand Down
6 changes: 3 additions & 3 deletions zilencer/management/commands/profile_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from optparse import make_option
from django.core.management.base import BaseCommand, CommandParser
from zerver.models import get_user_profile_by_email, UserMessage
from zerver.views.messages import get_old_messages_backend
from zerver.views.messages import get_messages_backend
import cProfile
import logging
from zerver.middleware import LogRequests
Expand Down Expand Up @@ -41,8 +41,8 @@ def profile_request(request):
request_logger.process_request(request)
prof = cProfile.Profile()
prof.enable()
ret = get_old_messages_backend(request, request.user,
apply_markdown=True)
ret = get_messages_backend(request, request.user,
apply_markdown=True)
prof.disable()
prof.dump_stats("/tmp/profile.data")
request_logger.process_response(request, ret)
Expand Down
2 changes: 1 addition & 1 deletion zproject/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
# messages -> zerver.views.messages
# GET returns messages, possibly filtered, POST sends a message
url(r'^messages$', rest_dispatch,
{'GET': 'zerver.views.messages.get_old_messages_backend',
{'GET': 'zerver.views.messages.get_messages_backend',
'POST': 'zerver.views.messages.send_message_backend'}),
url(r'^messages/(?P<message_id>[0-9]+)$', rest_dispatch,
{'GET': 'zerver.views.messages.json_fetch_raw_message',
Expand Down

0 comments on commit 3617ebf

Please sign in to comment.