fix advert with no auth

go-park-mail-ru · May 26, 2024 · e56166a · e56166a
1 parent 1b823e6
commit e56166a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/internal/pkg/adverts/delivery/grpc/grpc.go b/internal/pkg/adverts/delivery/grpc/grpc.go
@@ -35,7 +35,7 @@ func (h *AdvertsServerHandler) GetAdvertById(ctx context.Context, reqAdv *genAdv
 
 	if err != nil {
 
-		h.logger.Error(ctx.Value("requestId").(string) + " " + err.Error())
+		// h.logger.Error(ctx.Value("requestId").(string) + " " + err.Error())
 		// utils.LogErrorResponse(h.logger, ctx.Value("requestId").(string), utils.DeliveryLayer, SignUpMethod, err, http.StatusBadRequest)
 		return &genAdverts.GetAdvertByIdResponse{RespCode: StatusBadRequest}, err
 	}

diff --git a/internal/pkg/adverts/delivery/http/http.go b/internal/pkg/adverts/delivery/http/http.go
@@ -313,8 +313,13 @@ func (h *AdvertsClientHandler) GetAdvertById(w http.ResponseWriter, r *http.Requ
 		utils.WriteError(w, http.StatusBadRequest, "invalid id parameter")
 		return
 	}
-
-	md := metadata.New(map[string]string{"userid": strconv.FormatInt(r.Context().Value(middleware.CookieName).(int64), 10)})
+	userId := r.Context().Value(middleware.CookieName)
+	var md metadata.MD
+	if userId == nil {
+		md = metadata.New(map[string]string{"userid": "0"})
+	} else {
+		md = metadata.New(map[string]string{"userid": strconv.FormatInt(r.Context().Value(middleware.CookieName).(int64), 10)})
+	}
 	ctx := metadata.NewOutgoingContext(context.Background(), md)
 
 	advertDataResponse, err := h.client.GetAdvertById(ctx, &genAdverts.GetAdvertByIdRequest{Id: advertId})

diff --git a/internal/pkg/adverts/repo/postgres.go b/internal/pkg/adverts/repo/postgres.go
@@ -1923,7 +1923,7 @@ func (r *AdvertRepo) LikeAdvert(ctx context.Context, advertId int64, userId int6
 		return err
 	}
 
-	if _, err = r.UpdatePriority(ctx, tx, adId, 100); err != nil {
+	if _, err = r.UpdatePriority(ctx, tx, advertId, 100); err != nil {
 		return err
 	}
 
@@ -2022,7 +2022,6 @@ func (r *AdvertRepo) GetRectangleAdvertsLikedByUserId(ctx context.Context, pageS
             )
             AND i.is_deleted = FALSE
             AND a.is_deleted = FALSE
-            AND a.user_id = $1
 			ORDER BY a.created_at DESC
 			LIMIT $2
 			OFFSET $3`