解决bug

UESTCByteDance · Aug 30, 2023 · aa0f4fa · aa0f4fa
1 parent 1b9ab26
commit aa0f4fa
Showing 1 changed file with 16 additions and 53 deletions.
diff --git a/app/video/service/video.go b/app/video/service/video.go
@@ -20,11 +20,6 @@ import (
 type VideoSrv struct {
 }
 
-type VideoData struct {
-	Id           int
-	VideoPbModel *videoPb.Video
-}
-
 var VideoSrvIns *VideoSrv
 var VideoSrvOnce sync.Once
 
@@ -40,10 +35,9 @@ func (v *VideoSrv) Feed(ctx context.Context, req *videoPb.FeedRequest, res *vide
 	latestTimeStamp := time.Now().Unix()
 	latestTime := time.Unix(latestTimeStamp, 0)
 	token := req.Token
-	uid, _ := util.GetUserIdFromToken(token)
-	pattern := fmt.Sprintf("%d:*", uid)
+
 	// 使用Keys命令获取所有键
-	keys, err := dao.RedisClient.Keys(ctx, pattern).Result()
+	keys, err := dao.RedisClient.Keys(ctx, "*").Result()
 	if err != nil {
 		FeedResponseData(res, 1, "获取视频流失败")
 		return err
@@ -66,6 +60,13 @@ func (v *VideoSrv) Feed(ctx context.Context, req *videoPb.FeedRequest, res *vide
 				FeedResponseData(res, 1, "获取视频流失败")
 				return err
 			}
+			if token == "" {
+				video.IsFavorite = false
+				video.Author.IsFollow = false
+			} else {
+				video.IsFavorite, _ = dao.NewVideoDao(ctx).GetIsFavorite(int(video.Id), token)
+				video.Author.IsFollow, _ = dao.NewVideoDao(ctx).GetIsFollowed(int(video.Author.Id), token)
+			}
 			videoList = append(videoList, &video)
 		}
 	}
@@ -88,8 +89,7 @@ func (v *VideoSrv) Feed(ctx context.Context, req *videoPb.FeedRequest, res *vide
 		videoPbModel := BuildVideoPbModel(ctx, video, token)
 		videoList = append(videoList, videoPbModel)
 		//将视频存入缓存，加入消息队列
-		videoData := VideoData{uid, videoPbModel}
-		body, _ := json.Marshal(&videoData)
+		body, _ := json.Marshal(&videoPbModel)
 		err := mq.SendMessage2MQ(body, consts.Video2RedisQueue)
 		if err != nil {
 			return err
@@ -102,7 +102,6 @@ func (v *VideoSrv) Feed(ctx context.Context, req *videoPb.FeedRequest, res *vide
 
 func (v *VideoSrv) Publish(ctx context.Context, req *videoPb.PublishRequest, res *videoPb.PublishResponse) error {
 	//加入消息队列
-
 	body, _ := json.Marshal(&req)
 	err := mq.SendMessage2MQ(body, consts.CreateVideoQueue)
 	if err != nil {
@@ -116,47 +115,13 @@ func (v *VideoSrv) Publish(ctx context.Context, req *videoPb.PublishRequest, res
 func (v *VideoSrv) PublishList(ctx context.Context, req *videoPb.PublishListRequest, res *videoPb.PublishListResponse) error {
 	token := req.Token
 	uid := int(req.UserId)
-	//先从缓存取
-	pattern := fmt.Sprintf("%d:*", uid)
-	// 使用Keys命令获取所有键
-	keys, err := dao.RedisClient.Keys(ctx, pattern).Result()
+
+	videos, err := dao.NewVideoDao(ctx).GetVideoListByUserId(uid)
 	if err != nil {
 		PublishListResponseData(res, 1, "获取失败")
 		return err
 	}
-	keys = util.SortKeys(keys)
-	var trueKeys []string
 	var videoList []*videoPb.Video
-	//从缓存取对应的视频
-	for _, key := range keys {
-		redisResult, err := dao.RedisClient.Get(ctx, key).Result()
-		if err != nil && err != redis.Nil {
-			PublishListResponseData(res, 1, "获取视频流失败")
-			return err
-		}
-		if err != redis.Nil {
-			var video videoPb.Video
-			err = json.Unmarshal([]byte(redisResult), &video)
-			if err != nil {
-				PublishListResponseData(res, 1, "获取视频流失败")
-				return err
-			}
-			if video.Author.Id == int64(uid) {
-				videoList = append(videoList, &video)
-				trueKeys = append(trueKeys, key)
-			}
-		}
-	}
-	videos, err := dao.NewVideoDao(ctx).GetVideoListByUserId(uid, util.StringArray2IntArray(trueKeys))
-	if err != nil {
-		PublishListResponseData(res, 1, "获取失败")
-		return err
-	}
-	if len(videos) == 0 {
-		PublishListResponseData(res, 0, "获取成功", videoList)
-		return nil
-	}
-	//var videoList []*videoPb.Video
 	for _, video := range videos {
 		videoList = append(videoList, BuildVideoPbModel(ctx, video, token))
 	}
@@ -251,14 +216,12 @@ func VideoMQ2DB(ctx context.Context, req *videoPb.PublishRequest) error {
 	var videoCache *videoPb.Video
 	videoCache = BuildVideoPbModel(ctx, &video, token)
 	videoJson, _ := json.Marshal(&videoCache)
-	dao.RedisClient.Set(ctx, fmt.Sprintf("%d:%d", uid, video.ID), videoJson, time.Hour)
+	dao.RedisClient.Set(ctx, fmt.Sprintf("%d", video.ID), videoJson, time.Hour)
 	return nil
 }
 
-func VideoMQ2Redis(ctx context.Context, req *VideoData) error {
-	uid := req.Id
-	data := req.VideoPbModel
-	videoJson, _ := json.Marshal(&data)
-	dao.RedisClient.Set(ctx, fmt.Sprintf("%d:%d", uid, data.Id), videoJson, time.Hour)
+func VideoMQ2Redis(ctx context.Context, req *videoPb.Video) error {
+	videoJson, _ := json.Marshal(&req)
+	dao.RedisClient.Set(ctx, fmt.Sprintf("%d", req.Id), videoJson, time.Hour)
 	return nil
 }