Merge branch 'root-v1.21-and-main' into release/dcs/v1.21

unfoldingWord · Jan 19, 2024 · 10288e4 · 10288e4
2 parents 3b112dc + 4e8a031
commit 10288e4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/models/door43metadata/search.go b/models/door43metadata/search.go
@@ -65,7 +65,7 @@ type SearchCatalogOptions struct {
 	ContentFormats   []string
 	CheckingLevels   []string
 	Books            []string
-	IsRepoDM         bool
+	IsRepoMetadata   bool
 	IncludeHistory   bool
 	MetadataTypes    []string
 	MetadataVersions []string
@@ -112,9 +112,9 @@ func SearchCatalogCondition(opts *SearchCatalogOptions) builder.Cond {
 		langIsGLCond = builder.Eq{"`door43_metadata`.language_is_gl": opts.LanguageIsGL.IsTrue()}
 	}
 
-	isRepoDMCond := builder.NewCond()
-	if opts.IsRepoDM {
-		isRepoDMCond = builder.Eq(builder.Eq{"`door43_metadata`.is_repo_metadata": true})
+	isRepoMetadataCond := builder.NewCond()
+	if opts.IsRepoMetadata {
+		isRepoMetadataCond = builder.Eq(builder.Eq{"`door43_metadata`.is_repo_metadata": true})
 	}
 
 	cond := builder.NewCond().And(
@@ -134,7 +134,7 @@ func SearchCatalogCondition(opts *SearchCatalogOptions) builder.Cond {
 		historyCond,
 		langIsGLCond,
 		keywordCond,
-		isRepoDMCond,
+		isRepoMetadataCond,
 		builder.Eq{"`repository`.is_private": false},
 		builder.Eq{"`repository`.is_archived": false},
 		builder.IsNull{"`door43_metadata`.validation_error"})

diff --git a/models/user_dcs.go b/models/user_dcs.go
@@ -13,26 +13,26 @@ import (
 // GetRepoLanguages gets the languages of the user's repos and returns alphabetized list
 func GetRepoLanguages(ctx context.Context, u *user_model.User) []string {
 	fields, _ := SearchDoor43MetadataField(ctx, &door43metadata.SearchCatalogOptions{
-		Owners:   []string{u.LowerName},
-		IsRepoDM: true,
+		Owners:         []string{u.LowerName},
+		IsRepoMetadata: true,
 	}, "language")
 	return fields
 }
 
 // GetRepoSubjects gets the subjects of the user's repos and returns alphabetized list
 func GetRepoSubjects(ctx context.Context, u *user_model.User) []string {
 	fields, _ := SearchDoor43MetadataField(ctx, &door43metadata.SearchCatalogOptions{
-		Owners:   []string{u.LowerName},
-		IsRepoDM: true,
+		Owners:         []string{u.LowerName},
+		IsRepoMetadata: true,
 	}, "subject")
 	return fields
 }
 
 // GetRepoMetadataTypes gets the metadata types of the user's repos and returns alphabetized list
 func GetRepoMetadataTypes(ctx context.Context, u *user_model.User) []string {
 	fields, _ := SearchDoor43MetadataField(ctx, &door43metadata.SearchCatalogOptions{
-		Owners:   []string{u.LowerName},
-		IsRepoDM: true,
+		Owners:         []string{u.LowerName},
+		IsRepoMetadata: true,
 	}, "metadata_type")
 	return fields
 }