Merge branch 'similar_sort' into 'master'

modify

See merge request alpha/physical!160

linucb/views/collect_data.py

@@ -119,30 +119,38 @@ class CollectData(object):
                         else:
                             exposure_cards_list = list()
                         device_id = raw_val_dict["device"]["device_id"]
+
+                        exposure_topic_id_list = list()
                         for item in exposure_cards_list:
                             if "card_id" not in item:
                                 continue
                             exposure_topic_id = item["card_id"]
                             logging.info(
                                 "consume exposure topic_id:%s,device_id:%s" % (str(exposure_topic_id), str(device_id)))
+                            exposure_topic_id_list.extend(exposure_topic_id)
 
-                            tag_list = list()
-                            sql_query_results = TopicTag.objects.filter(is_online=True, topic_id=exposure_topic_id)
-                            for sql_item in sql_query_results:
-                                tag_list.append(sql_item.tag_id)
+                        topic_tag_id_dict = dict()
+                        tag_list = list()
+                        sql_query_results = TopicTag.objects.filter(is_online=True, topic_id__in=exposure_topic_id_list)
+                        for sql_item in sql_query_results:
+                            tag_list.append(sql_item.tag_id)
 
-                            is_click = 0
-                            is_vote = 0
+                            if sql_item.topic_id not in topic_tag_id_dict:
+                                topic_tag_id_dict[sql_item.topic_id] = list()
+                            topic_tag_id_dict[sql_item.topic_id].append(sql_item.tag_id)
 
-                            reward = 1 if is_click or is_vote else 0
+                        is_click = 0
+                        is_vote = 0
 
-                            logging.info("negative tag_list,device_id:%s,topic_id:%s,tag_list:%s" % (
-                            str(device_id), str(exposure_topic_id), str(tag_list)))
-                            for tag_id in tag_list:
-                                self.update_user_linucb_tag_info(reward, device_id, tag_id, user_feature)
+                        reward = 1 if is_click or is_vote else 0
 
-                            # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
-                            self.update_recommend_tag_list(device_id, user_feature)
+                        logging.info("negative tag_list,device_id:%s,topic_tag_id_dict:%s" % (
+                        str(device_id), str(topic_tag_id_dict)))
+                        for tag_id in tag_list:
+                            self.update_user_linucb_tag_info(reward, device_id, tag_id, user_feature)
+
+                        # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
+                        self.update_recommend_tag_list(device_id, user_feature)
                     else:
                         logging.warning("unknown type msg:%s" % raw_val_dict.get("type", "missing type"))
                 except: