Make RequestHolder thread-safe

[osqa.git] / forum / models / meta.py

diff --git a/forum/models/meta.py b/forum/models/meta.py
index 6465105d3d1f4d272b30583fc9c9cc7e0590c50c..2b790d8e574b5b7f7bbdbf51944b4bdd12e79387 100644 (file)
--- a/forum/models/meta.py
+++ b/forum/models/meta.py
@@ -1,86 +1,82 @@
-from django.utils.translation import ugettext as _\r
-from base import *\r
-\r
-class Vote(models.Model):\r
-    user = models.ForeignKey(User, related_name="votes")\r
-    node = models.ForeignKey(Node, related_name="votes")\r
-    value = models.SmallIntegerField()\r
-    action = models.ForeignKey(Action, unique=True, related_name="vote")\r
-    voted_at = models.DateTimeField(default=datetime.datetime.now)\r
-\r
-    class Meta:\r
-        app_label = 'forum'\r
-        unique_together = ('user', 'node')\r
-\r
-\r
-class Flag(models.Model):\r
-    user = models.ForeignKey(User, related_name="flags")\r
-    node = models.ForeignKey(Node, related_name="flags")\r
-    reason = models.CharField(max_length=300)\r
-    action = models.ForeignKey(Action, unique=True, related_name="flag")\r
-    flagged_at = models.DateTimeField(default=datetime.datetime.now)\r
-\r
-    class Meta:\r
-        app_label = 'forum'\r
-        unique_together = ('user', 'node')\r
-\r
-class BadgeManager(models.Manager):\r
-    use_for_related_fields = True\r
-    \r
-    def get(self, *args, **kwargs):\r
-        try:\r
-            pk = [v for (k,v) in kwargs.items() if k in ('pk', 'pk__exact', 'id', 'id__exact')][0]\r
-        except:\r
-            return super(BadgeManager, self).get(*args, **kwargs)\r
-\r
-        from forum.badges.base import BadgesMeta\r
-        badge = BadgesMeta.by_id.get(int(pk), None)\r
-        if not badge:\r
-            return super(BadgeManager, self).get(*args, **kwargs)\r
-        return badge.ondb\r
-\r
-class Badge(models.Model):\r
-    GOLD = 1\r
-    SILVER = 2\r
-    BRONZE = 3\r
-\r
-    type        = models.SmallIntegerField()\r
-    cls         = models.CharField(max_length=50, null=True)\r
-    awarded_count = models.PositiveIntegerField(default=0)\r
-    \r
-    awarded_to    = models.ManyToManyField(User, through='Award', related_name='badges')\r
-\r
-    objects = BadgeManager()\r
-\r
-    @property\r
-    def name(self):\r
-        cls = self.__dict__.get('_class', None)\r
-        return cls and cls.name or _("Unknown")\r
-\r
-    @property\r
-    def description(self):\r
-        cls = self.__dict__.get('_class', None)\r
-        return cls and cls.description or _("No description available")\r
-\r
-    @models.permalink\r
-    def get_absolute_url(self):\r
-        return ('badge', [], {'id': self.id, 'slug': slugify(self.name)})        \r
-\r
-    class Meta:\r
-        app_label = 'forum'\r
-\r
-\r
-class Award(models.Model):\r
-    user = models.ForeignKey(User)\r
-    badge = models.ForeignKey('Badge', related_name="awards")\r
-    node = models.ForeignKey(Node, null=True)\r
-\r
-    awarded_at = models.DateTimeField(default=datetime.datetime.now)\r
-\r
-    trigger = models.ForeignKey(Action, related_name="awards", null=True)\r
-    action = models.ForeignKey(Action, related_name="award", unique=True)\r
-\r
-\r
-    class Meta:\r
-        unique_together = ('user', 'badge', 'node')\r
+from django.utils.translation import ugettext as _
+from base import *
+
+class Vote(models.Model):
+    user = models.ForeignKey(User, related_name="votes")
+    node = models.ForeignKey(Node, related_name="votes")
+    value = models.SmallIntegerField()
+    action = models.OneToOneField(Action, related_name="vote")
+    voted_at = models.DateTimeField(default=datetime.datetime.now)
+
+    class Meta:
+        app_label = 'forum'
+        unique_together = ('user', 'node')
+
+
+class Flag(models.Model):
+    user = models.ForeignKey(User, related_name="flags")
+    node = models.ForeignKey(Node, related_name="flags")
+    reason = models.CharField(max_length=300)
+    action = models.OneToOneField(Action, related_name="flag")
+    flagged_at = models.DateTimeField(default=datetime.datetime.now)
+
+    class Meta:
+        app_label = 'forum'
+        unique_together = ('user', 'node')
+
+
+class Badge(BaseModel):
+    GOLD = 1
+    SILVER = 2
+    BRONZE = 3
+
+    type        = models.SmallIntegerField()
+    cls         = models.CharField(max_length=50, null=True)
+    awarded_count = models.PositiveIntegerField(default=0)
+    
+    awarded_to    = models.ManyToManyField(User, through='Award', related_name='badges')
+
+    def get_handler(self):
+        from forum.badges import BadgesMeta
+        return BadgesMeta.by_id.get(self.id, None)
+
+    @property
+    def name(self):
+        cls = self.get_handler()
+        return cls and cls.name or _("Unknown")
+
+    @property
+    def description(self):
+        cls = self.get_handler()
+        return cls and cls.description or _("No description available")
+
+    @models.permalink
+    def get_absolute_url(self):
+        return ('badge', [], {'id': self.id, 'slug': slugify(self.name)})
+
+    def save(self, *args, **kwargs):
+        if isinstance(self.awarded_count, models.expressions.ExpressionNode):
+            super(Badge, self).save(*args, **kwargs)
+            self.awarded_count = self.__class__.objects.filter(id=self.id).values_list('awarded_count', flat=True)[0]
+        else:
+            super(Badge, self).save(*args, **kwargs)
+
+
+    class Meta:
+        app_label = 'forum'
+
+
+class Award(models.Model):
+    user = models.ForeignKey(User)
+    badge = models.ForeignKey('Badge', related_name="awards")
+    node = models.ForeignKey(Node, null=True)
+
+    awarded_at = models.DateTimeField(default=datetime.datetime.now)
+
+    trigger = models.ForeignKey(Action, related_name="awards", null=True)
+    action = models.OneToOneField(Action, related_name="award")
+
+
+    class Meta:
+        unique_together = ('user', 'badge', 'node')
         app_label = 'forum'
\ No newline at end of file