Refactor recommendation page cache handling and configuration
continuous-integration/drone/push Build is passing
continuous-integration/drone/push Build is passing
- Removed the `RecommendationPageCacheLanguages` configuration from `AISummarizerConfig` to streamline cache management. - Updated the `companyService` and `tenderService` to utilize the new `InvalidateRecommendedTendersPageCache` method for cache invalidation, enhancing clarity and efficiency. - Refactored the `invalidateRecommendedTendersPageCache` method to eliminate unnecessary context parameters, simplifying the function signature. - Improved the handling of page cache refresh logic by consolidating language handling within the `tenderService`, ensuring consistent behavior across services. - Cleaned up related tests and removed deprecated functions to maintain code quality and readability. This update enhances the maintainability of the recommendation caching system by simplifying configuration and improving cache invalidation logic.
This commit is contained in:
@@ -35,29 +35,40 @@ func recommendedTendersPageCacheKey(companyID, language string) string {
|
||||
strings.ToLower(strings.TrimSpace(language))
|
||||
}
|
||||
|
||||
// ScheduleRefreshRecommendedTendersPageCache rebuilds resolved recommendation pages asynchronously.
|
||||
// ScheduleRefreshRecommendedTendersPageCache rebuilds the page cache for the service default language.
|
||||
func (s *tenderService) ScheduleRefreshRecommendedTendersPageCache(companyID string) {
|
||||
s.schedulePageCacheRefreshForLanguage(companyID, s.defaultLanguage)
|
||||
}
|
||||
|
||||
// InvalidateRecommendedTendersPageCache drops the cached page for the service default language.
|
||||
func (s *tenderService) InvalidateRecommendedTendersPageCache(companyID string) {
|
||||
companyID = strings.TrimSpace(companyID)
|
||||
if companyID == "" || s.redisClient == nil {
|
||||
return
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), recommendationPageCacheReadTimeout)
|
||||
defer cancel()
|
||||
s.deleteRecommendedTendersPageCache(ctx, companyID, s.defaultLanguage)
|
||||
}
|
||||
|
||||
func (s *tenderService) schedulePageCacheRefreshForLanguage(companyID, language string) {
|
||||
companyID = strings.TrimSpace(companyID)
|
||||
language = strings.ToLower(strings.TrimSpace(language))
|
||||
if companyID == "" || language == "" || s.redisClient == nil {
|
||||
return
|
||||
}
|
||||
|
||||
go func() {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), recommendationPageCacheBuildTimeout)
|
||||
defer cancel()
|
||||
|
||||
for _, language := range s.pageCacheLanguages {
|
||||
lang := strings.ToLower(strings.TrimSpace(language))
|
||||
if lang == "" {
|
||||
continue
|
||||
}
|
||||
if err := s.buildRecommendedTendersPageCache(ctx, companyID, lang); err != nil {
|
||||
s.logger.Warn("Failed to refresh recommended tenders page cache", map[string]interface{}{
|
||||
"company_id": companyID,
|
||||
"language": lang,
|
||||
"error": err.Error(),
|
||||
})
|
||||
}
|
||||
if err := s.buildRecommendedTendersPageCache(ctx, companyID, language); err != nil {
|
||||
s.logger.Warn("Failed to refresh recommended tenders page cache", map[string]interface{}{
|
||||
"company_id": companyID,
|
||||
"language": language,
|
||||
"error": err.Error(),
|
||||
})
|
||||
}
|
||||
}()
|
||||
}
|
||||
@@ -380,40 +391,6 @@ func tenderFromRecommendationResponse(item TenderResponse) Tender {
|
||||
return tender
|
||||
}
|
||||
|
||||
func normalizePageCacheLanguages(defaultLanguage string, languages []string) []string {
|
||||
seen := make(map[string]struct{})
|
||||
out := make([]string, 0, len(languages)+1)
|
||||
|
||||
add := func(lang string) {
|
||||
lang = strings.ToLower(strings.TrimSpace(lang))
|
||||
if lang == "" {
|
||||
return
|
||||
}
|
||||
if _, ok := seen[lang]; ok {
|
||||
return
|
||||
}
|
||||
seen[lang] = struct{}{}
|
||||
out = append(out, lang)
|
||||
}
|
||||
|
||||
add(defaultLanguage)
|
||||
for _, lang := range languages {
|
||||
add(lang)
|
||||
}
|
||||
if len(out) == 0 {
|
||||
out = append(out, "en")
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// ParsePageCacheLanguagesConfig splits a comma-separated language list for cache prewarm.
|
||||
func ParsePageCacheLanguagesConfig(raw string) []string {
|
||||
if strings.TrimSpace(raw) == "" {
|
||||
return normalizePageCacheLanguages("en", nil)
|
||||
}
|
||||
return normalizePageCacheLanguages("", strings.Split(raw, ","))
|
||||
}
|
||||
|
||||
// RecommendedTendersPageCacheKeyPrefix is shared with company invalidation logic.
|
||||
const RecommendedTendersPageCacheKeyPrefix = recommendedTendersPageCacheKeyPrefix
|
||||
|
||||
|
||||
@@ -42,13 +42,3 @@ func TestFilterCachedRecommendedTendersAppliesActiveAndRejectedFilters(t *testin
|
||||
t.Fatalf("got ID %q, want active tender", got[0].ID)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParsePageCacheLanguagesConfig(t *testing.T) {
|
||||
got := ParsePageCacheLanguagesConfig("en,fr, en")
|
||||
if len(got) != 2 {
|
||||
t.Fatalf("len = %d, want 2", len(got))
|
||||
}
|
||||
if got[0] != "en" || got[1] != "fr" {
|
||||
t.Fatalf("got %v, want [en fr]", got)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,7 +92,6 @@ type tenderService struct {
|
||||
aiSummarizerStorage AISummarizerStorage
|
||||
redisClient redis.Client
|
||||
pageCacheTTL time.Duration
|
||||
pageCacheLanguages []string
|
||||
defaultLanguage string
|
||||
}
|
||||
|
||||
@@ -117,7 +116,6 @@ func NewService(
|
||||
aiStorage AISummarizerStorage,
|
||||
redisClient redis.Client,
|
||||
recommendationPageCacheTTL time.Duration,
|
||||
recommendationPageCacheLanguages []string,
|
||||
defaultLanguage string,
|
||||
) Service {
|
||||
if strings.TrimSpace(defaultLanguage) == "" {
|
||||
@@ -134,7 +132,6 @@ func NewService(
|
||||
aiSummarizerStorage: aiStorage,
|
||||
redisClient: redisClient,
|
||||
pageCacheTTL: recommendationPageCacheTTL,
|
||||
pageCacheLanguages: normalizePageCacheLanguages(defaultLanguage, recommendationPageCacheLanguages),
|
||||
defaultLanguage: strings.ToLower(defaultLanguage),
|
||||
}
|
||||
}
|
||||
@@ -999,7 +996,7 @@ func (s *tenderService) Recommend(ctx context.Context, form *SearchForm, paginat
|
||||
}
|
||||
|
||||
if len(companyIDs) == 0 && companyID != "" {
|
||||
s.ScheduleRefreshRecommendedTendersPageCache(companyID)
|
||||
s.schedulePageCacheRefreshForLanguage(companyID, lang)
|
||||
}
|
||||
|
||||
excluded, excludedByCompany, err := s.loadRecommendationExclusions(ctx, form, companyID, companyIDs)
|
||||
@@ -1030,7 +1027,7 @@ func (s *tenderService) Recommend(ctx context.Context, form *SearchForm, paginat
|
||||
return nil, err
|
||||
}
|
||||
|
||||
paged := s.buildRecommendedTenderListResponses(pageResult.items, lang)
|
||||
paged := s.buildRecommendedTenderResponsesParallel(ctx, pageResult.items, lang)
|
||||
|
||||
return &SearchResponse{
|
||||
Tenders: paged,
|
||||
|
||||
Reference in New Issue
Block a user