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

unfoldingWord · Aug 29, 2023 · fbe1d0e · fbe1d0e
2 parents 0e42e80 + ee17893
commit fbe1d0e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go
@@ -508,9 +508,9 @@ func SearchRepositoryCondition(opts *SearchRepoOptions) builder.Cond {
 		door43metadata.GetOwnerCond(opts.Owners, false),
 		door43metadata.GetSubjectCond(opts.Subjects, false),
 		door43metadata.GetResourceCond(opts.Resources),
-		door43metadata.GetContentFormatCond(opts.ContentFormats, true),
+		door43metadata.GetContentFormatCond(opts.ContentFormats, false),
 		door43metadata.GetBookCond(opts.Books),
-		door43metadata.GetLanguageCond(opts.Languages, true),
+		door43metadata.GetLanguageCond(opts.Languages, false),
 		door43metadata.GetMetadataTypeCond(opts.MetadataTypes, false),
 		door43metadata.GetMetadataVersionCond(opts.MetadataVersions, false))
 	/*** EMD DCS Customizations ***/

diff --git a/services/convert/repository.go b/services/convert/repository.go
@@ -161,7 +161,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR
 
 	repoAPIURL := repo.APIURL()
 
-	return ToRepoDCS(ctx, repo, isParent, &api.Repository{
+	return ToRepoDCS(ctx, repo, &api.Repository{
 		ID:                            repo.ID,
 		Owner:                         ToUserWithAccessMode(ctx, repo.Owner, permissionInRepo.AccessMode),
 		Name:                          repo.Name,

diff --git a/services/convert/repository_dcs.go b/services/convert/repository_dcs.go
@@ -11,13 +11,11 @@ import (
 )
 
 // ToRepoDCS adds Door43 metadata properties to the API Repo object
-func ToRepoDCS(ctx context.Context, repo *repo_model.Repository, isParent bool, apiRepo *api.Repository) *api.Repository {
+func ToRepoDCS(ctx context.Context, repo *repo_model.Repository, apiRepo *api.Repository) *api.Repository {
 	if err := repo.LoadLatestDMs(ctx); err != nil {
 		return apiRepo
 	}
-
 	dm := repo.RepoDM
-
 	apiRepo.Title = dm.Title
 	apiRepo.Subject = dm.Subject
 	apiRepo.Language = dm.Language
@@ -28,14 +26,10 @@ func ToRepoDCS(ctx context.Context, repo *repo_model.Repository, isParent bool,
 	apiRepo.MetadataType = dm.MetadataType
 	apiRepo.MetadataVersion = dm.MetadataVersion
 	apiRepo.Ingredients = dm.Ingredients
-
-	if isParent {
-		apiRepo.CatalogStages = &api.CatalogStages{
-			Production:    ToCatalogStage(ctx, repo.LatestProdDM),
-			PreProduction: ToCatalogStage(ctx, repo.LatestPreprodDM),
-			Latest:        ToCatalogStage(ctx, repo.DefaultBranchDM),
-		}
+	apiRepo.CatalogStages = &api.CatalogStages{
+		Production:    ToCatalogStage(ctx, repo.LatestProdDM),
+		PreProduction: ToCatalogStage(ctx, repo.LatestPreprodDM),
+		Latest:        ToCatalogStage(ctx, repo.DefaultBranchDM),
 	}
-
 	return apiRepo
 }