foomo/gocontentful
1
0
Fork 0
mirror of https://github.com/foomo/gocontentful.git synced 2025-10-16 12:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: GetOrInheritFieldValue, inheritFieldValueRecursive support for forceContinueFunc

Browse Source
This commit is contained in:
Cristian Vidmar 2025-10-09 17:53:39 +02:00
parent 7c5f3787dd
commit 6bec24eb95
3 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
erm/templates/contentful_vo_lib.gotmpl
View File

@ -570,46 +570,53 @@ func (ref EntryReference) GetParents(ctx context.Context, contentType ...string)
}
}
func GetOrInheritFieldValue(ctx context.Context, contentfulShop *ContentfulClient, entryID string, field string, parentContentTypes []string, locale Locale) (any, error) {
func GetOrInheritFieldValue(ctx context.Context, contentfulShop *ContentfulClient, entryID string, field string,
parentContentTypes []string, forceContinueFunc func(val any) bool, locale Locale,
) (any, error) {
entry, err := contentfulShop.GetGenericEntry(entryID)
if err != nil {
return nil, fmt.Errorf("failed to get entry %s: %v", entryID, err)
}
// Try to get the field value from the current entry first
val, err := entry.FieldAsAny(field, locale)
if err == nil {
val, _ := entry.FieldAsAny(field, locale)
if forceContinueFunc == nil || !forceContinueFunc(val) {
return val, nil
}
return inheritFieldValueRecursive(ctx, contentfulShop, entry, field, parentContentTypes, locale, make(map[string]bool))
if val == nil || forceContinueFunc(val) {
return inheritFieldValueRecursive(ctx, contentfulShop, entry, field, parentContentTypes, forceContinueFunc, make(map[string]bool), locale)
}
return val, nil
}
func inheritFieldValueRecursive(ctx context.Context, contentfulShop *ContentfulClient, entry *GenericEntry, field string, parentContentTypes []string, locale Locale, visited map[string]bool) (any, error) {
func inheritFieldValueRecursive(ctx context.Context, contentfulShop *ContentfulClient, entry *GenericEntry, field string, parentContentTypes []string,
forceContinueFunc func(val any) bool, visited map[string]bool, locale Locale,
) (any, error) {
if visited[entry.Sys.ID] {
return nil, fmt.Errorf("circular reference detected for entry %s", entry.Sys.ID)
return nil, fmt.Errorf("inheritFieldValueRecursive: circular reference detected for entry %s", entry.Sys.ID)
}
visited[entry.Sys.ID] = true
parentRefs, err := commonGetParents(ctx, entry.CC, entry.Sys.ID, parentContentTypes)
if err != nil {
return nil, fmt.Errorf("failed to get parents for entry %s: %v", entry.Sys.ID, err)
return nil, fmt.Errorf("inheritFieldValueRecursive: failed to get parents for entry %s: %v", entry.Sys.ID, err)
}
for _, parentRef := range parentRefs {
parentEntry, err := entry.CC.GetGenericEntry(parentRef.ID)
if err != nil {
return nil, fmt.Errorf("failed to get parent entry %s: %v", parentRef.ID, err)
return nil, fmt.Errorf("inheritFieldValueRecursive: failed to get parent entry %s: %v", parentRef.ID, err)
}
val, err := parentEntry.FieldAsAny(field, locale)
if err == nil {
val, _ := parentEntry.FieldAsAny(field, locale)
if forceContinueFunc == nil || !forceContinueFunc(val) {
return val, nil
}
inheritedVal, err := inheritFieldValueRecursive(ctx, contentfulShop, parentEntry, field, parentContentTypes, locale, visited)
if err == nil {
return inheritedVal, nil
if val == nil || forceContinueFunc(val) {
val, _ = inheritFieldValueRecursive(ctx, contentfulShop, parentEntry, field, parentContentTypes, forceContinueFunc, visited, locale)
}
if val != nil {
return val, nil
}
}

37
test/testapi/gocontentfulvolib.go
View File

@ -599,46 +599,53 @@ func (ref EntryReference) GetParents(ctx context.Context, contentType ...string)
}
}
func GetOrInheritFieldValue(ctx context.Context, contentfulShop *ContentfulClient, entryID string, field string, parentContentTypes []string, locale Locale) (any, error) {
func GetOrInheritFieldValue(ctx context.Context, contentfulShop *ContentfulClient, entryID string, field string,
parentContentTypes []string, forceContinueFunc func(val any) bool, locale Locale,
) (any, error) {
entry, err := contentfulShop.GetGenericEntry(entryID)
if err != nil {
return nil, fmt.Errorf("failed to get entry %s: %v", entryID, err)
}
// Try to get the field value from the current entry first
val, err := entry.FieldAsAny(field, locale)
if err == nil {
val, _ := entry.FieldAsAny(field, locale)
if forceContinueFunc == nil || !forceContinueFunc(val) {
return val, nil
}
return inheritFieldValueRecursive(ctx, contentfulShop, entry, field, parentContentTypes, locale, make(map[string]bool))
if val == nil || forceContinueFunc(val) {
return inheritFieldValueRecursive(ctx, contentfulShop, entry, field, parentContentTypes, forceContinueFunc, make(map[string]bool), locale)
}
return val, nil
}
func inheritFieldValueRecursive(ctx context.Context, contentfulShop *ContentfulClient, entry *GenericEntry, field string, parentContentTypes []string, locale Locale, visited map[string]bool) (any, error) {
func inheritFieldValueRecursive(ctx context.Context, contentfulShop *ContentfulClient, entry *GenericEntry, field string, parentContentTypes []string,
forceContinueFunc func(val any) bool, visited map[string]bool, locale Locale,
) (any, error) {
if visited[entry.Sys.ID] {
return nil, fmt.Errorf("circular reference detected for entry %s", entry.Sys.ID)
return nil, fmt.Errorf("inheritFieldValueRecursive: circular reference detected for entry %s", entry.Sys.ID)
}
visited[entry.Sys.ID] = true
parentRefs, err := commonGetParents(ctx, entry.CC, entry.Sys.ID, parentContentTypes)
if err != nil {
return nil, fmt.Errorf("failed to get parents for entry %s: %v", entry.Sys.ID, err)
return nil, fmt.Errorf("inheritFieldValueRecursive: failed to get parents for entry %s: %v", entry.Sys.ID, err)
}
for _, parentRef := range parentRefs {
parentEntry, err := entry.CC.GetGenericEntry(parentRef.ID)
if err != nil {
return nil, fmt.Errorf("failed to get parent entry %s: %v", parentRef.ID, err)
return nil, fmt.Errorf("inheritFieldValueRecursive: failed to get parent entry %s: %v", parentRef.ID, err)
}
val, err := parentEntry.FieldAsAny(field, locale)
if err == nil {
val, _ := parentEntry.FieldAsAny(field, locale)
if forceContinueFunc == nil || !forceContinueFunc(val) {
return val, nil
}
inheritedVal, err := inheritFieldValueRecursive(ctx, contentfulShop, parentEntry, field, parentContentTypes, locale, visited)
if err == nil {
return inheritedVal, nil
if val == nil || forceContinueFunc(val) {
val, _ = inheritFieldValueRecursive(ctx, contentfulShop, parentEntry, field, parentContentTypes, forceContinueFunc, visited, locale)
}
if val != nil {
return val, nil
}
}

2
test/testapi/meta.go
View File

@ -1,2 +1,2 @@
// gocontentful version: 1.1.5
// gocontentful version: 1.1.7
package testapi