remove caching from inveniordm search by slug

Author: mfenner

commonmeta/reader.go

@@ -21,7 +21,7 @@ func NewReader(r io.Reader) *Reader {
 	}
 }
 
-const Version = "v0.32.0"
+const Version = "v0.32.1"
 
 // ContributorRoles list of contributor roles defined in commonmeta schema.
 //

inveniordm/reader.go

@@ -15,8 +15,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/muesli/cache2go"
-
 	"github.com/front-matter/commonmeta/authorutils"
 	"github.com/front-matter/commonmeta/commonmeta"
 	"github.com/front-matter/commonmeta/doiutils"
@@ -784,17 +782,10 @@ func SearchByDOI(doi string, client *InvenioRDMClient) (string, error) {
 }
 
 // SearchBySlug searches InvenioRDM communities by slug.
-// Specify type of community (blog, topic or subject) in query, subject area communities are always queried.
-func SearchBySlug(slug string, type_ string, client *InvenioRDMClient, cache *cache2go.CacheTable) (string, error) {
-	// first check for cached community ID
-	res, _ := cache.Value(slug)
-	if res != nil {
-		id := fmt.Sprintf("%v", res.Data())
-		return id, nil
-	}
-
+// Specify type of community (blog, topic or subject) in query.
+func SearchBySlug(slug string, type_ string, client *InvenioRDMClient) (string, error) {
 	var query Query
-	requestURL := fmt.Sprintf("https://%s/api/communities?q=slug:%s&type=%s&type=subject", client.Host, slug, type_)
+	requestURL := fmt.Sprintf("https://%s/api/communities?q=slug:%s&type=%s", client.Host, slug, type_)
 	req, _ := http.NewRequest(http.MethodGet, requestURL, nil)
 	req.Header = http.Header{
 		"Content-Type": {"application/json"},
@@ -814,7 +805,6 @@ func SearchBySlug(slug string, type_ string, client *InvenioRDMClient, cache *ca
 		return "", nil
 	} else {
 		id := utils.ParseString(query.Hits.Hits[0].ID)
-		cache.Add(slug, 1*time.Hour, id)
 		return id, nil
 	}
 }

inveniordm/reader_test.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/front-matter/commonmeta/inveniordm"
-	"github.com/muesli/cache2go"
 	"golang.org/x/time/rate"
 )
 
@@ -106,8 +105,7 @@ func ExampleSearchBySlug() {
 	host := "rogue-scholar.org"
 	rl := rate.NewLimiter(rate.Every(10*time.Second), 100)
 	client := inveniordm.NewClient(rl, host)
-	cache := cache2go.Cache("communities")
-	s, _ := inveniordm.SearchBySlug("naturalSciences", "subject", client, cache)
+	s, _ := inveniordm.SearchBySlug("naturalSciences", "subject", client)
 	fmt.Println(s)
 	// Output:
 	// f04b2ef6-257d-4aa1-8fcb-83039a3a9471

inveniordm/writer.go

@@ -453,7 +453,7 @@ func Upsert(record commonmeta.APIResponse, client *InvenioRDMClient, cache *cach
 	for i, v := range data.Relations {
 		if v.Type == "IsPartOf" && strings.HasPrefix(v.ID, "https://rogue-scholar.org/api/communities/") {
 			slug := strings.Split(v.ID, "/")[5]
-			communityID, _ := SearchBySlug(slug, "blog", client, cache)
+			communityID, _ := SearchBySlug(slug, "blog", client)
 			if communityID != "" {
 				record.Community = slug
 				record.CommunityID = communityID
@@ -522,7 +522,7 @@ func Upsert(record commonmeta.APIResponse, client *InvenioRDMClient, cache *cach
 			if synonym := CommunityTranslations[slug]; synonym != "" {
 				slug = synonym
 			}
-			communityID, err = SearchBySlug(slug, "topic", client, cache)
+			communityID, err = SearchBySlug(slug, "topic", client)
 			if err != nil {
 				fmt.Println(err)
 			}
@@ -860,7 +860,7 @@ func UpsertCommunity(community Community, client *InvenioRDMClient, apiKey strin
 	var communityID string
 
 	// check if community already exists
-	communityID, _ = SearchBySlug(community.Slug, community.Metadata.Type.ID, client, cache)
+	communityID, _ = SearchBySlug(community.Slug, community.Metadata.Type.ID, client)
 	if communityID != "" {
 		community.ID = communityID
 		communityID, err = UpdateCommunity(community, client, apiKey)