Merge branch 'gyz_fix' into gyz_es

linucb/views/collect_data.py

@@ -463,6 +463,10 @@ class CollectData(object):
                                     is_click = 1
                                     is_vote = 0
                                     reward = 1 if is_click or is_vote else 0
+
+                                    # 移植老用户的lin信息到ctr特征策略
+                                    self.transfer_old_info2ctr_feature_key(device_id)
+
                                     for tag_id in tag_query_results:
                                         self.update_user_linucb_tag_info(reward, device_id, tag_id, user_feature,
                                                                          self.linucb_matrix_redis_prefix)
@@ -502,6 +506,9 @@ class CollectData(object):
                                     is_vote = 0
 
                                     reward = 1 if is_click or is_vote else 0
+                                    # 移植老用户的lin信息到ctr特征策略
+                                    self.transfer_old_info2ctr_feature_key(device_id)
+
                                     for i in range(5):
                                         for tag_id in tag_query_results_multi:
                                             self.update_user_linucb_tag_info(reward, device_id, tag_id, user_feature,
@@ -526,6 +533,52 @@ class CollectData(object):
                                                                    linucb_pictorial_ids_prefix=self.ctr_linucb_recommend_pictorial_id_prefix)
                                     logging.info("skin_check topic type:%s, device_id:%s, tag_query_results:%s" %
                                                  (str(data['SYS']['action']), str(device_id), str(tag_query_results)))
+                            # 品牌问卷进linucb
+                            elif b'content' in raw_val_dict:
+                              data = json.loads(raw_val_dict[b'content'])
+                              if 'SYS' in data and 'APP' in data and 'action' in data['SYS'] and data['SYS']['action'] == "venus/community/survey_question/submit":
+                                device_id = data['SYS']['cl_id']
+                                tagid_list = list(data['APP'].get('answer_tag', []))
+                                user_id = data['SYS'].get('user_id', None)
+                                logging.info("skin_check topic type:%s, device_id:%s, answer_tag:%s" %
+                                             (str(data['SYS']['action']), str(device_id), str(tagid_list)))
+                                if len(tagid_list) > 0:
+                                    tag_query_results = list(Tag.objects.using(settings.SLAVE1_DB_NAME).filter(
+                                        id__in=tagid_list, is_online=True, is_deleted=False,
+                                        is_category=False).values_list("id", flat=True))
+                                    tag_query_results_multi = [i for i in tagid_list if i in tag_query_results]
+                                    is_click = 1
+                                    is_vote = 0
+
+                                    reward = 1 if is_click or is_vote else 0
+
+                                    # 移植老用户的lin信息到ctr特征策略
+                                    self.transfer_old_info2ctr_feature_key(device_id)
+
+                                    for i in range(5):
+                                        for tag_id in tag_query_results_multi:
+                                            self.update_user_linucb_tag_info(reward, device_id, tag_id, user_feature,
+                                                                             self.linucb_matrix_redis_prefix)
+                                            # 获取tag的ctr信息
+                                            device_tag_ctr = self.get_device_tag_ctr(device_id, tag_id)
+                                            user_feature_ctr = [device_tag_ctr, device_tag_ctr]
+                                            self.update_user_linucb_tag_info(reward, device_id, tag_id,
+                                                                             user_feature_ctr,
+                                                                             self.ctr_linucb_matrix_redis_prefix)
+
+                                    # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
+                                    self.update_recommend_tag_list(device_id, user_feature, user_id,
+                                                                   linucb_matrix_prefix=self.linucb_matrix_redis_prefix,
+                                                                   linucb_recommend_tag_prefix=self.linucb_recommend_redis_prefix,
+                                                                   linucb_topic_ids_prefix=self.linucb_recommend_topic_id_prefix,
+                                                                   linucb_pictorial_ids_prefix=self.linucb_recommend_pictorial_id_prefix)
+                                    self.update_recommend_tag_list(device_id, user_feature, user_id,
+                                                                   linucb_matrix_prefix=self.ctr_linucb_matrix_redis_prefix,
+                                                                   linucb_recommend_tag_prefix=self.ctr_linucb_recommend_redis_prefix,
+                                                                   linucb_topic_ids_prefix=self.ctr_linucb_recommend_topic_id_prefix,
+                                                                   linucb_pictorial_ids_prefix=self.ctr_linucb_recommend_pictorial_id_prefix)
+                                    logging.info("survey_question type:%s, device_id:%s, tagid_list:%s" %
+                                                 (str(data['SYS']['action']), str(device_id), str(tag_query_results)))
                             else:
                                 if msg:
                                   logging.warning("unknown type msg:%s" % raw_val_dict.get("type", "missing type"))