No longer using singleton proxy in datatable_rows

MyPureCloud · Oct 10, 2024 · 2f8b775 · 2f8b775
1 parent ebfbd52
commit 2f8b775
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row_proxy.go b/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row_proxy.go
@@ -12,9 +12,6 @@ import (
 	"github.com/mypurecloud/platform-client-sdk-go/v133/platformclientv2"
 )
 
-// internalProxy holds a proxy instance that can be used throughout the package
-var internalProxy *architectDatatableRowProxy
-
 // Type definitions for each func on our proxy so we can easily mock them out later
 type getArchitectDatatableFunc func(ctx context.Context, p *architectDatatableRowProxy, datatableId string, expanded string) (*Datatable, *platformclientv2.APIResponse, error)
 type getAllArchitectDatatableFunc func(ctx context.Context, p *architectDatatableRowProxy) (*[]platformclientv2.Datatable, *platformclientv2.APIResponse, error)
@@ -38,10 +35,13 @@ type architectDatatableRowProxy struct {
 	dataTableCache                   rc.CacheInterface[Datatable]
 }
 
+var (
+	dataTableRowCache = rc.NewResourceCache[map[string]interface{}]()
+	dataTableCache    = rc.NewResourceCache[Datatable]()
+)
+
 func newArchitectDatatableRowProxy(clientConfig *platformclientv2.Configuration) *architectDatatableRowProxy {
 	api := platformclientv2.NewArchitectApiWithConfig(clientConfig)
-	dataTableRowCache := rc.NewResourceCache[map[string]interface{}]()
-	dataTableCache := rc.NewResourceCache[Datatable]()
 	return &architectDatatableRowProxy{
 		clientConfig:                     clientConfig,
 		architectApi:                     api,
@@ -58,10 +58,7 @@ func newArchitectDatatableRowProxy(clientConfig *platformclientv2.Configuration)
 }
 
 func getArchitectDatatableRowProxy(clientConfig *platformclientv2.Configuration) *architectDatatableRowProxy {
-	if internalProxy == nil {
-		internalProxy = newArchitectDatatableRowProxy(clientConfig)
-	}
-	return internalProxy
+	return newArchitectDatatableRowProxy(clientConfig)
 }
 
 func (p *architectDatatableRowProxy) getArchitectDatatable(ctx context.Context, id string, expanded string) (*Datatable, *platformclientv2.APIResponse, error) {
@@ -237,5 +234,10 @@ func updateArchitectDatatableRowFn(_ context.Context, p *architectDatatableRowPr
 }
 
 func deleteArchitectDatatableRowFn(_ context.Context, p *architectDatatableRowProxy, tableId string, rowId string) (*platformclientv2.APIResponse, error) {
-	return p.architectApi.DeleteFlowsDatatableRow(tableId, rowId)
+	resp, err := p.architectApi.DeleteFlowsDatatableRow(tableId, rowId)
+	if err != nil {
+		return resp, err
+	}
+	rc.DeleteCacheItem(p.dataTableRowCache, tableId+"_"+rowId)
+	return nil, nil
 }
diff --git a/genesyscloud/routing_skill/genesyscloud_routing_skill_proxy.go b/genesyscloud/routing_skill/genesyscloud_routing_skill_proxy.go
@@ -138,5 +138,10 @@ func getRoutingSkillIdByNameFn(ctx context.Context, p *routingSkillProxy, name s
 }
 
 func deleteRoutingSkillFn(ctx context.Context, p *routingSkillProxy, id string) (*platformclientv2.APIResponse, error) {
-	return p.routingApi.DeleteRoutingSkill(id)
+	resp, err := p.routingApi.DeleteRoutingSkill(id)
+	if err != nil {
+		return resp, err
+	}
+	rc.DeleteCacheItem(p.routingSkillCache, id)
+	return nil, nil
 }