fakz9/Sipro-Marketplaces
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: implement HashArray utility and refactor product key generation for Redis

Browse Source
This commit is contained in:
admin
2025-08-17 11:46:44 +03:00
parent e35d44dacb
commit fb1be5ddc3
6 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/ozon/products/repository_api.go
View File

@@ -22,6 +22,10 @@ type apiRepository struct {
marketplaceRepository marketplace.Repository
}
func GetProductsKey(identifier string) string {
return fmt.Sprintf("ozon:products:%s", identifier)
}
func NewAPIRepository(marketplaceRepository marketplace.Repository) Repository {
return &apiRepository{
marketplaceRepository: marketplaceRepository,
@@ -136,7 +140,7 @@ func (a *apiRepository) StreamAllProductsCache(ctx context.Context, marketplaceI
errChan <- fmt.Errorf("getting marketplace identifier: %w", err)
return
}
key := fmt.Sprintf("ozon:products:%s", identifier)
key := GetProductsKey(identifier)
var cachedMessage pb.GetListOfProductsResponse
err = redis.ReadProtoMessage(ctx, key, &cachedMessage)
if err == nil && len(cachedMessage.Products) > 0 {

2
internal/tasks/ozon/ozon.go
View File

@@ -53,7 +53,7 @@ func (p *FetchProductsProcessor) ProcessTask(ctx context.Context, task *asynq.Ta
productsProto := lo.Map(productsRaw, func(item products.OzonProduct, _ int) *products.PbProduct {
return converter.ToProto(&item)
})
redisKey := fmt.Sprintf("ozon:products:%s", identifier)
redisKey := products.GetProductsKey(identifier)
err = redis.WriteProtoMessage(ctx, redisKey, &pb.GetListOfProductsResponse{Products: productsProto})
if err != nil {
fmt.Printf("Failed to write products to Redis for marketplace %s: %v\n", identifier, err)

2
internal/tasks/wb/wb.go
View File

@@ -46,7 +46,7 @@ func (p *FetchProductsProcessor) ProcessTask(ctx context.Context, task *asynq.Ta
defer cancel()
redisKey := fmt.Sprintf("wb:products:%s", sellerId)
redisKey := products.GetProductsKey(sellerId)
productsRaw, err := repo.GetAllProducts(ctx, payload.MarketplaceId)
if err != nil {
return fmt.Errorf("failed to fetch products for marketplace %d: %w", payload.MarketplaceId, err)

6
internal/wb/products/repository_api.go
View File

@@ -25,6 +25,10 @@ type apiRepository struct {
marketplaceRepository marketplace.Repository
}
func GetProductsKey(identifier string) string {
return fmt.Sprintf("wb:products:%s", identifier)
}
func (a apiRepository) ParseMarketplace(ctx context.Context, marketplaceId int) (*marketplace.Marketplace, string, error) {
marketplaceByID, err := a.marketplaceRepository.GetMarketplaceByID(ctx, marketplaceId)
if err != nil {
@@ -110,7 +114,7 @@ func (a apiRepository) StreamAllProductsCache(ctx context.Context, marketplaceId
converter := generated.ConverterImpl{}
key := fmt.Sprintf("wb:products:%s", identifier)
key := GetProductsKey(identifier)
var cachedMessage pb.GetProductsResponse
err = redis.ReadProtoMessage(ctx, key, &cachedMessage)
if err == nil && len(cachedMessage.Products) > 0 {

6
internal/ym/products/repository_api.go
View File

@@ -39,6 +39,10 @@ func NewAPIRepository(marketplaceRepository marketplace.Repository) Repository {
}
}
func GetProductKey(identifier string) string {
return fmt.Sprintf("ym:products:%s", identifier)
}
// getBusinessID retrieves the business ID for a given marketplace by looking up the campaign
func (r *apiRepository) getBusinessID(ctx context.Context, mp *marketplace.Marketplace) (int64, error) {
if mp.CampaignID == "" {
@@ -101,7 +105,7 @@ func (r *apiRepository) GetProducts(ctx context.Context, marketplaceID int, req
errChan <- err
return
}
key := fmt.Sprintf("ym:products:%d", businessID)
key := GetProductKey(strconv.Itoa(int(businessID)))
var cachedMessage pb.GetProductsResponse
err = redis.ReadProtoMessage(ctx, key, &cachedMessage)
if err == nil && len(cachedMessage.Offers) > 0 {