refactor(db): Rename Get -> CacheGet, Upsert -> CachePut

flowerLoader · May 20, 2024 · d7400ce · d7400ce
1 parent 06401d9
commit d7400ce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/cmd/flower/searchCmd.go b/cmd/flower/searchCmd.go
@@ -54,7 +54,7 @@ func searchPlugin(ctx context.Context, query string) error {
 	// Update our cache
 	records := make([]*types.PluginCacheRecord, 0)
 	for _, repo := range repos.Repositories {
-		cacheRecord, err := DB.Plugins.Get(*repo.FullName)
+		cacheRecord, err := DB.Plugins.CacheGet(*repo.FullName)
 		if err != nil || cacheRecord == nil {
 			// We have never encountered this repo before, we must interrogate it
 			analysis, err := githubRepoAnalyze(ctx, *repo.FullName)
@@ -91,7 +91,7 @@ func searchPlugin(ctx context.Context, query string) error {
 		cacheRecord.Summary = *repo.Description
 		cacheRecord.Tags = strings.Join(repo.Topics, ",")
 
-		if err := DB.Plugins.Upsert(cacheRecord); err != nil {
+		if err := DB.Plugins.CachePut(cacheRecord); err != nil {
 			return err
 		}
 

diff --git a/pkg/db/DB_test.go b/pkg/db/DB_test.go
@@ -36,19 +36,19 @@ func TestPluginRegistry(t *testing.T) {
 				Summary:    "A test plugin",
 			}
 
-			err = db.Plugins.Upsert(plugin)
+			err = db.Plugins.CachePut(plugin)
 			convey.So(err, convey.ShouldBeNil)
 
-			actualPlugin, err := db.Plugins.Get(plugin.ID)
+			actualPlugin, err := db.Plugins.CacheGet(plugin.ID)
 			convey.So(err, convey.ShouldBeNil)
 			convey.So(actualPlugin, convey.ShouldResemble, plugin)
 
 			convey.Convey("And when the plugin is updated", func() {
 				plugin.Name = "Updated Plugin"
-				err = db.Plugins.Upsert(plugin)
+				err = db.Plugins.CachePut(plugin)
 				convey.So(err, convey.ShouldBeNil)
 
-				actualPlugin, err := db.Plugins.Get(plugin.ID)
+				actualPlugin, err := db.Plugins.CacheGet(plugin.ID)
 				convey.So(err, convey.ShouldBeNil)
 				convey.So(actualPlugin.Name, convey.ShouldEqual, "Updated Plugin")
 			})

diff --git a/pkg/db/PluginRegistry.go b/pkg/db/PluginRegistry.go
@@ -6,8 +6,8 @@ import (
 )
 
 type IPluginRegistry interface {
-	Get(id string) (*types.PluginCacheRecord, error)
-	Upsert(record *types.PluginCacheRecord) error
+	CacheGet(id string) (*types.PluginCacheRecord, error)
+	CachePut(record *types.PluginCacheRecord) error
 }
 
 // Ensure PluginRegistry implements IPluginRegistry
@@ -23,7 +23,7 @@ const UPSERT_PLUGIN_CACHE = `INSERT OR REPLACE INTO plugin_cache (
 	id, updated_at, name, version, author, license, bugs_url, homepage, api_version, tags, summary
 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
 
-func (r *PluginRegistry) Get(id string) (*types.PluginCacheRecord, error) {
+func (r *PluginRegistry) CacheGet(id string) (*types.PluginCacheRecord, error) {
 	r.log.Debug("searching for plugin", "id", id)
 
 	stmt, err := r.db.conn.Prepare(SELECT_PLUGIN_CACHE)
@@ -36,7 +36,7 @@ func (r *PluginRegistry) Get(id string) (*types.PluginCacheRecord, error) {
 	return record, stmt.QueryRow(id).Scan(&record.ID, &record.UpdatedAt, &record.Name, &record.Version, &record.Author, &record.License, &record.BugsURL, &record.Homepage, &record.APIVersion, &record.Tags, &record.Summary)
 }
 
-func (reg *PluginRegistry) Upsert(record *types.PluginCacheRecord) error {
+func (reg *PluginRegistry) CachePut(record *types.PluginCacheRecord) error {
 	reg.log.Debug("upserting plugin", "id", record.ID)
 
 	stmt, err := reg.db.conn.Prepare(UPSERT_PLUGIN_CACHE)