paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename recipient.user_or_class to type.id.

Browse Source 
(imported from commit 74639cd08d0f53ae39624fc793f6fe55325b6d45)
This commit is contained in:
Tim Abbott
2012-09-04 16:22:06 -04:00
parent 974b560659
commit 8f058937a0
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zephyr/management/commands/populate_db.py
View File

@@ -35,7 +35,7 @@ class Command(BaseCommand):
new_class = ZephyrClass(name=name) new_class = ZephyrClass(name=name)
new_class.save() new_class.save()
recipient = Recipient(user_or_class=new_class.pk, type="class") recipient = Recipient(type_id=new_class.pk, type="class")
recipient.save() recipient.save()
# Create some test zephyrs, including: # Create some test zephyrs, including:
@@ -56,7 +56,7 @@ class Command(BaseCommand):
offset += length offset += length
offset = offset % len(texts) offset = offset % len(texts)
new_zephyr.recipient = Recipient.objects.get(id=random.choice(recipient_classes)) new_zephyr.recipient = Recipient.objects.get(id=random.choice(recipient_classes))
zephyr_class = ZephyrClass.objects.get(pk=new_zephyr.recipient.user_or_class) zephyr_class = ZephyrClass.objects.get(pk=new_zephyr.recipient.type_id)
new_zephyr.instance = zephyr_class.name + str(random.randint(1, 3)) new_zephyr.instance = zephyr_class.name + str(random.randint(1, 3))
new_zephyr.pub_date = datetime.datetime.utcnow().replace(tzinfo=utc) new_zephyr.pub_date = datetime.datetime.utcnow().replace(tzinfo=utc)
new_zephyr.save() new_zephyr.save()

12
zephyr/models.py
View File

@@ -11,10 +11,10 @@ def get_display_recipient(recipient):
name, for a class, or the username, for a user). name, for a class, or the username, for a user).
""" """
if recipient.type == "class": if recipient.type == "class":
zephyr_class = ZephyrClass.objects.get(pk=recipient.user_or_class) zephyr_class = ZephyrClass.objects.get(pk=recipient.type_id)
return zephyr_class.name return zephyr_class.name
else: else:
user = User.objects.get(pk=recipient.user_or_class) user = User.objects.get(pk=recipient.type_id)
return user.username return user.username
callback_table = {} callback_table = {}
@@ -52,7 +52,7 @@ def create_user_profile(**kwargs):
profile = UserProfile(user=u, pointer=-1) profile = UserProfile(user=u, pointer=-1)
profile.save() profile.save()
# Auto-sub to the ability to receive personals. # Auto-sub to the ability to receive personals.
recipient = Recipient(user_or_class=profile.pk, type="personal") recipient = Recipient(type_id=profile.pk, type="personal")
recipient.save() recipient.save()
Subscription(userprofile_id=profile, recipient_id=recipient).save() Subscription(userprofile_id=profile, recipient_id=recipient).save()
post_save.connect(create_user_profile, sender=User) post_save.connect(create_user_profile, sender=User)
@@ -64,12 +64,12 @@ class ZephyrClass(models.Model):
return "<ZephyrClass: %s>" % (self.name,) return "<ZephyrClass: %s>" % (self.name,)
class Recipient(models.Model): class Recipient(models.Model):
user_or_class = models.IntegerField() type_id = models.IntegerField()
type = models.CharField(max_length=30) type = models.CharField(max_length=30)
def __repr__(self): def __repr__(self):
display_recipient = get_display_recipient(self) display_recipient = get_display_recipient(self)
return "<Recipient: %s (%d, %s)>" % (display_recipient, self.user_or_class, self.type) return "<Recipient: %s (%d, %s)>" % (display_recipient, self.type_id, self.type)
class Zephyr(models.Model): class Zephyr(models.Model):
sender = models.ForeignKey(UserProfile) sender = models.ForeignKey(UserProfile)
@@ -93,7 +93,7 @@ class Zephyr(models.Model):
def send_zephyr(**kwargs): def send_zephyr(**kwargs):
zephyr = kwargs["instance"] zephyr = kwargs["instance"]
if zephyr.recipient.type == "personal": if zephyr.recipient.type == "personal":
recipients = UserProfile.objects.filter(Q(user=zephyr.recipient.user_or_class) | Q(user=zephyr.sender)) recipients = UserProfile.objects.filter(Q(user=zephyr.recipient.type_id) | Q(user=zephyr.sender))
# For personals, you send out either 1 or 2 copies of the zephyr, for # For personals, you send out either 1 or 2 copies of the zephyr, for
# personals to yourself or to someone else, respectively. # personals to yourself or to someone else, respectively.
assert((len(recipients) == 1) or (len(recipients) == 2)) assert((len(recipients) == 1) or (len(recipients) == 2))

10
zephyr/tests.py
View File

@@ -22,13 +22,13 @@ class AuthedTestCase(TestCase):
recipient = UserProfile.objects.get(user=User.objects.get(username=recipient_name)) recipient = UserProfile.objects.get(user=User.objects.get(username=recipient_name))
else: else:
recipient = ZephyrClass.objects.get(name=recipient_name) recipient = ZephyrClass.objects.get(name=recipient_name)
recipient = Recipient.objects.get(user_or_class=recipient.id, type=zephyr_type) recipient = Recipient.objects.get(type_id=recipient.id, type=zephyr_type)
pub_date = datetime.datetime.utcnow().replace(tzinfo=utc) pub_date = datetime.datetime.utcnow().replace(tzinfo=utc)
Zephyr(sender=sender, recipient=recipient, instance="test", pub_date=pub_date).save() Zephyr(sender=sender, recipient=recipient, instance="test", pub_date=pub_date).save()
def users_subscribed_to_class(self, class_name): def users_subscribed_to_class(self, class_name):
zephyr_class = ZephyrClass.objects.get(name=class_name) zephyr_class = ZephyrClass.objects.get(name=class_name)
recipient = Recipient.objects.get(user_or_class=zephyr_class.id, type="class") recipient = Recipient.objects.get(type_id=zephyr_class.id, type="class")
subscriptions = Subscription.objects.filter(recipient_id=recipient) subscriptions = Subscription.objects.filter(recipient_id=recipient)
return [subscription.userprofile_id.user for subscription in subscriptions] return [subscription.userprofile_id.user for subscription in subscriptions]
@@ -103,7 +103,7 @@ class PersonalZephyrsTest(AuthedTestCase):
new_zephyrs = self.zephyr_stream(user) new_zephyrs = self.zephyr_stream(user)
self.assertEqual(len(new_zephyrs) - len(old_zephyrs), 1) self.assertEqual(len(new_zephyrs) - len(old_zephyrs), 1)
recipient = Recipient.objects.get(user_or_class=user.pk, type="personal") recipient = Recipient.objects.get(type_id=user.pk, type="personal")
self.assertEqual(new_zephyrs[-1].recipient, recipient) self.assertEqual(new_zephyrs[-1].recipient, recipient)
def test_personal_to_self(self): def test_personal_to_self(self):
@@ -126,7 +126,7 @@ class PersonalZephyrsTest(AuthedTestCase):
self.assertEqual(old_zephyrs, new_zephyrs) self.assertEqual(old_zephyrs, new_zephyrs)
user = User.objects.get(username="test1") user = User.objects.get(username="test1")
recipient = Recipient.objects.get(user_or_class=user.pk, type="personal") recipient = Recipient.objects.get(type_id=user.pk, type="personal")
self.assertEqual(self.zephyr_stream(user)[-1].recipient, recipient) self.assertEqual(self.zephyr_stream(user)[-1].recipient, recipient)
def test_personal(self): def test_personal(self):
@@ -163,7 +163,7 @@ class PersonalZephyrsTest(AuthedTestCase):
sender = User.objects.get(username="hamlet") sender = User.objects.get(username="hamlet")
receiver = User.objects.get(username="othello") receiver = User.objects.get(username="othello")
recipient = Recipient.objects.get(user_or_class=receiver.pk, type="personal") recipient = Recipient.objects.get(type_id=receiver.pk, type="personal")
self.assertEqual(self.zephyr_stream(sender)[-1].recipient, recipient) self.assertEqual(self.zephyr_stream(sender)[-1].recipient, recipient)
self.assertEqual(self.zephyr_stream(receiver)[-1].recipient, recipient) self.assertEqual(self.zephyr_stream(receiver)[-1].recipient, recipient)

10
zephyr/views.py
View File

@@ -122,7 +122,7 @@ def personal_zephyr(request):
# Right now, you can't make recipients on the fly by sending zephyrs to new # Right now, you can't make recipients on the fly by sending zephyrs to new
# classes or people. # classes or people.
recipient_user_profile = UserProfile.objects.get(user=recipient_user) recipient_user_profile = UserProfile.objects.get(user=recipient_user)
recipient = Recipient.objects.get(user_or_class=recipient_user_profile.id, type="personal") recipient = Recipient.objects.get(type_id=recipient_user_profile.id, type="personal")
sender = UserProfile.objects.get(user=request.user) sender = UserProfile.objects.get(user=request.user)
content = request.POST['new_personal_zephyr'] content = request.POST['new_personal_zephyr']
pub_date = datetime.datetime.utcnow().replace(tzinfo=utc) pub_date = datetime.datetime.utcnow().replace(tzinfo=utc)
@@ -145,7 +145,7 @@ def zephyr(request):
# Right now, you can't make recipients on the fly by sending zephyrs to new # Right now, you can't make recipients on the fly by sending zephyrs to new
# classes or people. # classes or people.
recipient = Recipient.objects.get(user_or_class=my_class.id, type="class") recipient = Recipient.objects.get(type_id=my_class.id, type="class")
new_zephyr = Zephyr() new_zephyr = Zephyr()
new_zephyr.sender = UserProfile.objects.get(user=request.user) new_zephyr.sender = UserProfile.objects.get(user=request.user)
@@ -178,7 +178,7 @@ def manage_subscriptions(request):
unsubs = request.POST.getlist('subscription') unsubs = request.POST.getlist('subscription')
for sub_name in unsubs: for sub_name in unsubs:
zephyr_class = ZephyrClass.objects.get(name=sub_name) zephyr_class = ZephyrClass.objects.get(name=sub_name)
recipient = Recipient.objects.get(user_or_class=zephyr_class.id, type="class") recipient = Recipient.objects.get(type_id=zephyr_class.id, type="class")
subscription = Subscription.objects.get( subscription = Subscription.objects.get(
userprofile_id=user_profile.id, recipient_id=recipient) userprofile_id=user_profile.id, recipient_id=recipient)
subscription.active = False subscription.active = False
@@ -205,11 +205,11 @@ def add_subscriptions(request):
zephyr_class = ZephyrClass(name=sub_name) zephyr_class = ZephyrClass(name=sub_name)
zephyr_class.save() zephyr_class.save()
recipient = Recipient.objects.filter(user_or_class=zephyr_class.pk, type="class") recipient = Recipient.objects.filter(type_id=zephyr_class.pk, type="class")
if recipient: if recipient:
recipient = recipient[0] recipient = recipient[0]
else: else:
recipient = Recipient(user_or_class=zephyr_class.pk, type="class") recipient = Recipient(type_id=zephyr_class.pk, type="class")
recipient.save() recipient.save()
subscription = Subscription.objects.filter(userprofile_id=user_profile, subscription = Subscription.objects.filter(userprofile_id=user_profile,