update

linucb/views/collect_data.py

@@ -164,11 +164,16 @@ class CollectData(object):
                                     user_id = raw_val_dict["user_id"] if "user_id" in raw_val_dict else None
 
                                     logging.info("consume topic_id:%s,device_id:%s" % (str(topic_id), str(device_id)))
-                                    topic_tag_list = list(TopicTag.objects.using(settings.SLAVE_DB_NAME).filter(topic_id=topic_id,is_online=True,is_collection=1).values_list("tag_id",flat=True))
-                                    tag_query_results = Tag.objects.using(settings.SLAVE_DB_NAME).filter(id__in=topic_tag_list,is_online=True,is_deleted=False).values_list("id")
-                                    # for id,collection,is_ai in tag_query_results:
-                                    #     if collection and is_ai:
-                                    for id in tag_query_results:
+                                    # topic_tag_list = list(TopicTag.objects.using(settings.SLAVE_DB_NAME).filter(topic_id=topic_id,is_online=True).values_list("tag_id",flat=True))
+                                    topic_tag_list = list()
+                                    click_results = TopicTag.objects.using(settings.SLAVE_DB_NAME).filter(topic_id=topic_id,is_online=True).values_list("tag_id","is_collection",flat=True)
+                                    for tag_id,is_collection in click_results:
+                                        topic_tag_list.append(tag_id)
+                                        if is_collection:
+                                            click_topic_tag_list.append(tag_id)
+                                    tag_query_results = Tag.objects.using(settings.SLAVE_DB_NAME).filter(id__in=topic_tag_list,is_online=True,is_deleted=False).values_list("id","is_ai")
+                                    for id,is_ai in tag_query_results:
+                                        if is_ai:
                                             click_topic_tag_list.append(id)
 
                                     logging.info("positive tag_list,device_id:%s,topic_id:%s,tag_list:%s" % (