modify

trans2es/models/__init__.py

 from .user_follow import UserFollow
 from .topic import Topic
 from .user import User
-from .pickuserrecord import PickUserRecord
+from .pickuserrecord import PickUserRecord
\ No newline at end of file
+from .group import Group
\ No newline at end of file

trans2es/models/group.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from django.conf import settings
+from django.core.management.base import BaseCommand, CommandError
+import traceback
+import logging
+from libs.es import ESPerform
+from django.db import models
+import datetime
+from .user import User
+
+class Group(models.Model):
+    class Meta:
+        verbose_name = u'小组'
+        app_label = 'community'
+        db_table = 'group'
+
+    name = models.CharField(verbose_name=u'名称', max_length=100, default='')
+    description = models.CharField(verbose_name=u'描述', max_length=200, default='')
+    creator_id = models.IntegerField(verbose_name=u'创建者ID')
+    #icon = ImgUrlField('图标', max_length=255, img_type=IMG_TYPE.WATERMARK, default='')
+    icon = models.CharField(verbose_name=u'图标', max_length=128, default='')
+    topic_num = models.IntegerField(verbose_name=u'帖子数', default=0)
+    is_online = models.BooleanField(verbose_name=u"是否有效", default=True, db_index=True)
+    is_recommend = models.BooleanField(verbose_name=u"是否推荐", default=False, db_index=True)
+    create_time = models.DateTimeField(verbose_name=u'日记创建时间',default=datetime.datetime.fromtimestamp(0))
+    update_time = models.DateTimeField(verbose_name=u'日记更新时间', default=datetime.datetime.fromtimestamp(0))
+
+    def detail(self):
+        result = {
+            'id': self.id,
+            'name': self.name,
+            'description': self.description,
+            'creator_id': self.creator_id,
+            'icon': self.icon,
+            'topic_num': self.topic_num,
+            'create_time': self.create_time.timestamp(),
+            'update_time': self.update_time.timestamp(),
+        }
+        return result
\ No newline at end of file

trans2es/models/group_user_role.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from django.conf import settings
+from django.core.management.base import BaseCommand, CommandError
+import traceback
+import logging
+from libs.es import ESPerform
+from django.db import models
+import datetime
+from .user import User
+from .group import Group
+
+class GroupUserRole(models.Model):
+    class Meta:
+        verbose_name = u'group_user_role'
+        verbose_name_plural = u'group_user_role'
+        db_table = 'group_user_role'
+        app_label = 'api'
+
+    user_id = models.BigIntegerField(verbose_name=u'用户ID')
+    group = models.ForeignKey(
+        Group, verbose_name=u"关联的小组", null=True, blank=True, default=None, on_delete=models.CASCADE)
+    is_online = models.BooleanField(verbose_name=u"是否有效", default=True, db_index=True)
+    role_id = models.SmallIntegerField(verbose_name=u'角色ID')
+    invite_num = models.IntegerField(verbose_name=u'邀请数量', default=0)
\ No newline at end of file

trans2es/models/user.py

@@ -8,6 +8,7 @@ import logging
 from libs.es import ESPerform
 from django.db import models
 import datetime
+from .group_user_role import GroupUserRole
 
 
 class User(models.Model):
@@ -45,5 +46,15 @@ class User(models.Model):
 
         return pick_user_id_list
 
+    def get_same_group_user_id_list(self):
+        same_group_user_id_list = list()
+        group_items_list = GroupUserRole.objects.filter(user_id=self.user_id)
+        for group_item in group_items_list:
+            group_id = group_item.group_id
+            user_items_list = GroupUserRole.objects.filter(group_id=group_id)
+            for user_items_list in user_items_list:
+                same_group_user_id_list.append(user_items_list.user_id)
+
+        return same_group_user_id_list
 
 

trans2es/utils/user_transfer.py

@@ -27,7 +27,7 @@ class UserTransfer(object):
             res["tag_list"] = ""
             res["attention_user_id_list"] = instance.get_follow_user_id_list()
             res["pick_user_id_list"] = instance.get_pick_user_id_list()
-            res["same_group_user_id_list"] = ""
+            res["same_group_user_id_list"] = instance.get_same_group_user_id_list()
 
             return res
         except: