Merge branch '2.3_relaces' into 'master'

rm click push

See merge request !466

linucb/views/collect_data.py

@@ -331,29 +331,29 @@ class CollectData(object):
                                 else:
                                     logging.warning("unknown type msg:%s" % raw_val_dict.get("type", "missing type"))
                             # 用户点击个性化push进linucb
-                            elif "type" in raw_val_dict and raw_val_dict["type"] == "on_click_push":
-                                if isinstance(raw_val_dict["params"]["tag_ids"], str):
-                                    tagid_list = json.loads(raw_val_dict["params"]["tag_ids"])
-                                elif isinstance(raw_val_dict["params"]["tag_ids"], list):
-                                    tagid_list = raw_val_dict["params"]["tag_ids"]
-                                else:
-                                    tagid_list = list()
-                                device_id = raw_val_dict["device"]["device_id"]
-                                user_id = raw_val_dict["user_id"] if "user_id" in raw_val_dict else None
-                                if len(tagid_list) > 0:
-                                    tag_query_results = Tag.objects.using(settings.SLAVE_DB_NAME).filter(
-                                        id__in=tagid_list, is_online=True, is_deleted=False,
-                                        is_category=False).values_list("id", flat=True)
-                                    is_click = 1
-                                    is_vote = 0
-                                    reward = 1 if is_click or is_vote else 0
-                                    for tag_id in tag_query_results:
-                                        self.update_user_linucb_tag_info(reward, device_id, tag_id, user_feature)
-                                    self.update_recommend_tag_list(device_id, user_feature, user_id,
-                                                                   new_user_click_tag_list=tag_query_results)
-                                    logging.info("on_click_push topic type:%s, device_id:%s, answer_tag:%s" %
-                                                 (raw_val_dict.get("type", "missing type"), str(device_id),
-                                                  str(tagid_list)))
+                            # elif "type" in raw_val_dict and raw_val_dict["type"] == "on_click_push":
+                            #     if isinstance(raw_val_dict["params"]["tag_ids"], str):
+                            #         tagid_list = json.loads(raw_val_dict["params"]["tag_ids"])
+                            #     elif isinstance(raw_val_dict["params"]["tag_ids"], list):
+                            #         tagid_list = raw_val_dict["params"]["tag_ids"]
+                            #     else:
+                            #         tagid_list = list()
+                            #     device_id = raw_val_dict["device"]["device_id"]
+                            #     user_id = raw_val_dict["user_id"] if "user_id" in raw_val_dict else None
+                            #     if len(tagid_list) > 0:
+                            #         tag_query_results = Tag.objects.using(settings.SLAVE_DB_NAME).filter(
+                            #             id__in=tagid_list, is_online=True, is_deleted=False,
+                            #             is_category=False).values_list("id", flat=True)
+                            #         is_click = 1
+                            #         is_vote = 0
+                            #         reward = 1 if is_click or is_vote else 0
+                            #         for tag_id in tag_query_results:
+                            #             self.update_user_linucb_tag_info(reward, device_id, tag_id, user_feature)
+                            #         self.update_recommend_tag_list(device_id, user_feature, user_id,
+                            #                                        new_user_click_tag_list=tag_query_results)
+                            #         logging.info("on_click_push topic type:%s, device_id:%s, answer_tag:%s" %
+                            #                      (raw_val_dict.get("type", "missing type"), str(device_id),
+                            #                       str(tagid_list)))
                             # 用户点击问题清单进linucb
                             elif b'content' in raw_val_dict:
                               data = json.loads(raw_val_dict[b'content'])