Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NOJIRA - Fix/outbound route cache #1457

Merged
merged 1 commit into from
Jan 14, 2025
Merged

NOJIRA - Fix/outbound route cache #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/resources/telephony_providers_edges_site_outbound_route.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ When exporting this resource, please be aware of the following behavior:

If the associated Genesys Cloud Telephony Site is configured as a `managed` resource:

- This resource will be exported as a data object
- This resource will be exported as a data resource
- Updates and modifications to this resource and its child dependencies will not be allowed through through this provider or the Genesys Cloud API
- This limitation is enforced by the Genesys Cloud API itself

Expand Down
2 changes: 1 addition & 1 deletion ...es/resources/genesyscloud_telephony_providers_edges_site_outbound_route/apis.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ When exporting this resource, please be aware of the following behavior:

If the associated Genesys Cloud Telephony Site is configured as a `managed` resource:

- This resource will be exported as a data object
- This resource will be exported as a data resource
- Updates and modifications to this resource and its child dependencies will not be allowed through through this provider or the Genesys Cloud API
- This limitation is enforced by the Genesys Cloud API itself

Expand Down
17 changes: 4 additions & 13 deletions ...s_site_outbound_route/genesyscloud_telephony_providers_edges_site_outbound_route_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,6 @@ func getAllSiteOutboundRoutesFn(ctx context.Context, p *siteOutboundRouteProxy,

allOutboundRoutes = append(allOutboundRoutes, *outboundRoutes.Entities...)

// Check if the site cache is populated with all the data, if it is, return that instead
// If the size of the cache is the same as the total number of sites, the cache is up-to-date
if rc.GetCacheSize(p.siteOutboundRouteCache) == *outboundRoutes.Total && rc.GetCacheSize(p.siteOutboundRouteCache) != 0 {
return rc.GetCache(p.siteOutboundRouteCache), nil, nil
} else if rc.GetCacheSize(p.siteOutboundRouteCache) != *outboundRoutes.Total && rc.GetCacheSize(p.siteOutboundRouteCache) != 0 {
// The cache is populated but not with the right data, clear the cache so it can be re populated
p.siteOutboundRouteCache = rc.NewResourceCache[platformclientv2.Outboundroutebase]()
}

for pageNum := 2; pageNum <= *outboundRoutes.PageCount; pageNum++ {
outboundRoutes, resp, err := p.edgesApi.GetTelephonyProvidersEdgesSiteOutboundroutes(siteId, pageSize, pageNum, "", "", "")
if err != nil {
Expand All @@ -149,7 +140,7 @@ func getAllSiteOutboundRoutesFn(ctx context.Context, p *siteOutboundRouteProxy,

// Populate the site cache
for _, outboundRoute := range allOutboundRoutes {
rc.SetCache(p.siteOutboundRouteCache, *outboundRoute.Id, outboundRoute)
rc.SetCache(p.siteOutboundRouteCache, buildSiteAndOutboundRouteId(siteId, *outboundRoute.Id), outboundRoute)
}

return &allOutboundRoutes, resp, nil
Expand All @@ -159,7 +150,7 @@ func getAllSiteOutboundRoutesFn(ctx context.Context, p *siteOutboundRouteProxy,
// getSiteOutboundRouteByIdFn is an implementation function for getting an outbound route for a Genesys Cloud Site
func getSiteOutboundRouteByIdFn(ctx context.Context, p *siteOutboundRouteProxy, siteId string, outboundRouteId string) (*platformclientv2.Outboundroutebase, *platformclientv2.APIResponse, error) {
// Check if site's outbound route exist in cache
route := rc.GetCacheItem(p.siteOutboundRouteCache, outboundRouteId)
route := rc.GetCacheItem(p.siteOutboundRouteCache, buildSiteAndOutboundRouteId(siteId, outboundRouteId))
if route != nil {
return route, nil, nil
}
Expand All @@ -169,7 +160,7 @@ func getSiteOutboundRouteByIdFn(ctx context.Context, p *siteOutboundRouteProxy,
return nil, resp, err
}

rc.SetCache(p.siteOutboundRouteCache, outboundRouteId, *outboundRoute)
rc.SetCache(p.siteOutboundRouteCache, buildSiteAndOutboundRouteId(siteId, outboundRouteId), *outboundRoute)

return outboundRoute, resp, nil
}
Expand Down Expand Up @@ -218,6 +209,6 @@ func deleteSiteOutboundRouteFn(ctx context.Context, p *siteOutboundRouteProxy, s
return resp, err
}

rc.DeleteCacheItem(p.siteOutboundRouteCache, outboundRouteId)
rc.DeleteCacheItem(p.siteOutboundRouteCache, buildSiteAndOutboundRouteId(siteId, outboundRouteId))
return resp, nil
}
Loading