modify

trans2es/models/group.py

@@ -9,9 +9,6 @@ from libs.es import ESPerform
 from django.db import models
 import datetime
 
-# duan add,need modify
-#from .topic import Topic
-
 class Group(models.Model):
     class Meta:
         verbose_name = u'小组'
@@ -36,8 +33,9 @@ class Group(models.Model):
         yesterday_begin_time = "%s-%s-%s 00:00:00" % (yesterday.year, yesterday.month, yesterday.day)
         yesterday_end_time = "%s-%s-%s 23:59:59" % (yesterday.year, yesterday.month, yesterday.day)
 
-        return 0
-        #return Topic.objects.filter(content_level__in=("4", "5"), group_id=self.id,create_time__gte=yesterday_begin_time,create_time__lte=yesterday_end_time).count()
+        topic_num = self.group_topics.filter(content_level__in=("4","5"),create_time__gte=yesterday_begin_time,create_time__lte=yesterday_end_time).count()
+        
+        return topic_num
 
     def detail(self):
         result = {

trans2es/models/topic.py

@@ -35,7 +35,9 @@ class Topic(models.Model):
 
     id = models.IntegerField(verbose_name='日记ID',primary_key=True)
     name = models.CharField(verbose_name='日记名称',max_length=100)
-    group_id = models.IntegerField(verbose_name='用户所在组ID',default=-1)
+    #group_id = models.IntegerField(verbose_name='用户所在组ID',default=-1)
+    group = models.ForeignKey(
+        Group, verbose_name=u"关联的小组", related_name=u"group_topics",null=True, blank=True, default=None, on_delete=models.CASCADE)
     user_id = models.IntegerField(verbose_name='用户ID')
     description = models.CharField(verbose_name='日记本描述',max_length=200)
     content = models.CharField(verbose_name='日记本内容',max_length=1000)
@@ -88,11 +90,16 @@ class Topic(models.Model):
                 elif user_query_results[0].is_shadow:
                     user_is_shadow = True
 
-            #是否官方推荐小组
+            # 是否官方推荐小组
+            if self.group.is_recommend:
+                offline_score += 4.0
+
+            """
             group_query_results = Group.objects.filter(id=self.group_id)
             if group_query_results.count() > 0:
                 if group_query_results[0].is_recommend:
-                    offline_score += 4.0
+                    offline_score += 4.0            
+            """
 
             #帖子等级
             if self.content_level == '5':