feature/vote

datastore/dsmodels/builder.go

@@ -9,6 +9,7 @@ import (
 
 type builderWrapperI interface {
 	SetIds(ids []int)
+	SetFqids(fqids []string)
 	setChild(builder builderWrapperI) builderWrapperI
 	getParent() builderWrapperI
 	getIDField() string
@@ -19,27 +20,34 @@ type builderWrapperI interface {
 	lazyAll(ctx context.Context) []any
 }
 
-type builderPtr[T any, M any] interface {
-	lazy(ds *Fetch, id int) *M
+type builderPtr[T any, M any, R any] interface {
+	lazy(ds *Fetch, id any) R
 	*T
 }
 
-type builder[C any, T builderPtr[C, M], M any] struct {
+type builder[C any, T builderPtr[C, M, R], M any, R any] struct {
 	ids      []int
+	fqids    []string
 	value    T
 	parent   builderWrapperI
 	children map[string]builderWrapperI
 	idField  string
 	relField string
 	many     bool
 	fetch    *Fetch
+
+	conv func(R) M
 }
 
-func (b *builder[C, T, M]) SetIds(ids []int) {
+func (b *builder[C, T, M, R]) SetIds(ids []int) {
 	b.ids = ids
 }
 
-func (b *builder[C, T, M]) setChild(builder builderWrapperI) builderWrapperI {
+func (b *builder[C, T, M, R]) SetFqids(fqids []string) {
+	b.fqids = fqids
+}
+
+func (b *builder[C, T, M, R]) setChild(builder builderWrapperI) builderWrapperI {
 	if b.children == nil {
 		b.children = map[string]builderWrapperI{}
 	}
@@ -51,31 +59,36 @@ func (b *builder[C, T, M]) setChild(builder builderWrapperI) builderWrapperI {
 	return b.children[builder.getRelField()]
 }
 
-func (b *builder[C, T, M]) getRelField() string {
+func (b *builder[C, T, M, R]) getRelField() string {
 	return b.relField
 }
 
-func (b *builder[C, T, M]) getIDField() string {
+func (b *builder[C, T, M, R]) getIDField() string {
 	return b.idField
 }
 
-func (b *builder[C, T, M]) getMany() bool {
+func (b *builder[C, T, M, R]) getMany() bool {
 	return b.many
 }
 
-func (b *builder[C, T, M]) getParent() builderWrapperI {
+func (b *builder[C, T, M, R]) getParent() builderWrapperI {
 	return b.parent
 }
 
-func (b *builder[C, T, M]) lazyAll(ctx context.Context) []any {
+func (b *builder[C, T, M, R]) lazyAll(ctx context.Context) []any {
 	items := []any{}
 	for _, id := range b.ids {
 		items = append(items, b.value.lazy(b.fetch, id))
 	}
+
+	for _, id := range b.fqids {
+		items = append(items, b.value.lazy(b.fetch, id))
+	}
+
 	return items
 }
 
-func (b *builder[C, T, M]) Preload(rel builderWrapperI) {
+func (b *builder[C, T, M, R]) Preload(rel builderWrapperI) {
 	children := []builderWrapperI{}
 	for rel != b && rel != nil && rel.getRelField() != "" {
 		children = append([]builderWrapperI{rel}, children...)
@@ -89,12 +102,15 @@ func (b *builder[C, T, M]) Preload(rel builderWrapperI) {
 	}
 }
 
-func getRelationIds(idField reflect.Value, targetField reflect.Value, many bool) []int {
+func getRelationIds(idField reflect.Value, targetField reflect.Value, many bool) ([]int, []string) {
 	ids := []int{}
+	fqids := []string{}
 	if many {
 		ids = idField.Interface().([]int)
 	} else if idField.Kind() == reflect.Int {
 		ids = append(ids, int(idField.Int()))
+	} else if idField.Kind() == reflect.String {
+		fqids = append(fqids, string(idField.String()))
 	} else if idField.Type().Name() == "Maybe[int]" {
 		relMaybeType := targetField.Type().Elem()
 		relValue := reflect.New(relMaybeType)
@@ -107,7 +123,7 @@ func getRelationIds(idField reflect.Value, targetField reflect.Value, many bool)
 		}
 	}
 
-	return ids
+	return ids, fqids
 }
 
 func setRelationField(idField reflect.Value, targetField reflect.Value, item any, many bool) {
@@ -127,15 +143,16 @@ type childInfo struct {
 	targetField reflect.Value
 }
 
-func (b *builder[C, T, M]) prepareChildren(ctx context.Context, parents ...any) []childInfo {
+func (b *builder[C, T, M, R]) prepareChildren(ctx context.Context, parents ...any) []childInfo {
 	childInfos := make([]childInfo, 0, len(b.children))
 	for _, parent := range parents {
 		rParent := reflect.ValueOf(parent).Elem()
 		for _, child := range b.children {
 			idField := rParent.FieldByName(child.getIDField())
 			targetField := rParent.FieldByName(child.getRelField())
-			ids := getRelationIds(idField, targetField, child.getMany())
+			ids, fqids := getRelationIds(idField, targetField, child.getMany())
 			child.SetIds(ids)
+			child.SetFqids(fqids)
 			items := child.lazyAll(ctx)
 			childInfos = append(childInfos, childInfo{
 				child:       child,
@@ -196,7 +213,7 @@ func bulkLoadChildren(ctx context.Context, fetch *Fetch, requests []loadRequest)
 	return nil
 }
 
-func (b *builder[C, T, M]) loadChildren(ctx context.Context, parents ...any) error {
+func (b *builder[C, T, M, R]) loadChildren(ctx context.Context, parents ...any) error {
 	if b.children == nil {
 		return nil
 	}
@@ -207,7 +224,7 @@ func (b *builder[C, T, M]) loadChildren(ctx context.Context, parents ...any) err
 	}})
 }
 
-func (b *builder[C, T, M]) First(ctx context.Context) (M, error) {
+func (b *builder[C, T, M, R]) First(ctx context.Context) (M, error) {
 	c := b.value.lazy(b.fetch, b.ids[0])
 
 	if err := b.fetch.Execute(ctx); err != nil {
@@ -220,11 +237,11 @@ func (b *builder[C, T, M]) First(ctx context.Context) (M, error) {
 		return zero, err
 	}
 
-	return *c, nil
+	return b.conv(c), nil
 }
 
-func (b *builder[C, T, M]) Get(ctx context.Context) ([]M, error) {
-	itemPtrs := make([]*M, len(b.ids))
+func (b *builder[C, T, M, R]) Get(ctx context.Context) ([]M, error) {
+	itemPtrs := make([]R, len(b.ids))
 	for i, id := range b.ids {
 		itemPtrs[i] = b.value.lazy(b.fetch, id)
 	}
@@ -238,7 +255,7 @@ func (b *builder[C, T, M]) Get(ctx context.Context) ([]M, error) {
 		if err := b.loadChildren(ctx, el); err != nil {
 			return []M{}, err
 		}
-		items[i] = *el
+		items[i] = b.conv(el)
 	}
 
 	return items, nil

datastore/dsmodels/fetch_test.go

@@ -1,6 +1,7 @@
 package dsmodels_test
 
 import (
+	"reflect"
 	"testing"
 
 	"github.com/OpenSlides/openslides-go/datastore/dsmock"
@@ -246,3 +247,35 @@ func TestRequestSinglePreloadMulti(t *testing.T) {
 		t.Errorf("res.ListOfSpeakers.ContentObjectID = %s, expected topic/1", res.ListOfSpeakers.ContentObjectID)
 	}
 }
+
+func TestPolymorphicPreload(t *testing.T) {
+	ds := dsmodels.New(dsmock.Stub(dsmock.YAMLData(`---
+	topic/1:
+		sequential_number: 1
+		title: foo
+		meeting_id: 1
+		agenda_item_id: 1
+		list_of_speakers_id: 1
+	agenda_item/1/content_object_id: topic/1
+	agenda_item/1/meeting_id: 1
+	list_of_speakers/1:
+		sequential_number: 1
+		content_object_id: topic/1
+		meeting_id: 1
+	`)))
+
+	tQ := ds.AgendaItem(1)
+	res, err := tQ.Preload(tQ.ContentObject()).First(t.Context())
+	if err != nil {
+		t.Errorf("Topic 1 with agenda item returned unexpected error: %v", err)
+	}
+
+	topic, isTopic := res.ContentObject.(*dsmodels.Topic)
+	if !isTopic {
+		t.Errorf("type of res.ContentObject = %s, expected *dsmodels.Topic", reflect.TypeOf(res.ContentObject))
+	}
+
+	if topic.Title != "foo" {
+		t.Errorf("res.ContentObject.Title = %s, expected 'foo'", topic.Title)
+	}
+}

datastore/dsmodels/gen_models/collection.go.tmpl

@@ -9,10 +9,11 @@ type {{.GoName}} struct{
 }
 
 type {{.GoNameLc}}Builder struct{
-    builder[{{.GoNameLc}}Builder, *{{.GoNameLc}}Builder, {{.GoName}}]
+  builder[{{.GoNameLc}}Builder, *{{.GoNameLc}}Builder, {{.GoName}}, *{{.GoName}}]
 }
 
-func (b *{{.GoNameLc}}Builder)lazy(ds *Fetch, id int) *{{.GoName}} {
+func (b *{{.GoNameLc}}Builder)lazy(ds *Fetch, idI any) *{{.GoName}} {
+		id := idI.(int)
     c := {{.GoName}}{}
     {{- range .Fields}}
     ds.{{.FetchName}}(id).Lazy(&c.{{.Name}})
@@ -25,27 +26,87 @@ func (b *{{.GoNameLc}}Builder) Preload(rel builderWrapperI) *{{.GoNameLc}}Builde
     return b
 }
 
-{{ range .Relations}}
-func (b *{{$.GoNameLc}}Builder) {{.MethodName}}() *{{.TypeLc}}Builder {
-	return &{{.TypeLc}}Builder{
-		builder: builder[{{.TypeLc}}Builder, *{{.TypeLc}}Builder, {{.Type}}]{
-			fetch: b.fetch,
-			parent: b,
-			idField: "{{.FieldName}}",
-			relField: "{{.MethodName}}",
-            {{- if .IsList}}
-            many: true,
-	        {{- end}}
-		},
+{{ range .Relations }}
+	func (b *{{$.GoNameLc}}Builder) {{.MethodName}}() *{{.TypeLc}}Builder {
+		return &{{.TypeLc}}Builder{
+			builder: builder[{{.TypeLc}}Builder, *{{.TypeLc}}Builder, {{.Type}}, {{ if not .IsGeneric }}*{{ end }}{{.Type}}]{
+				fetch: b.fetch,
+				parent: b,
+				idField: "{{.FieldName}}",
+				relField: "{{.MethodName}}",
+        {{- if .IsList}}
+          many: true,
+	      {{- end}}
+				{{- if .IsGeneric }}
+	      	conv: func(u {{.Type}}) {{.Type}} { return u },
+				{{- else }}
+	      	conv: func(p *{{.Type}}) {{.Type}} { return *p },
+				{{- end }}
+			},
+		}
 	}
-}
-{{end}}
+
+	{{ if .IsGeneric }}
+		type {{ .Type }} interface {
+    		is{{ .Type }}()
+		}
+
+		{{ $type := .Type }}
+		{{ range $index, $element := .GenericTypes }}
+		func (*{{ $element }}) is{{ $type }}() {}{{ end }}
+
+		type {{.TypeLc}}Builder struct {
+			builder[{{.TypeLc}}Builder, *{{.TypeLc}}Builder, {{.Type}}, {{.Type}}]
+		}
+
+		func (b *{{.TypeLc}}Builder) lazy(ds *Fetch, id any) {{.Type}} {
+			fqid, ok := id.(string)
+			if !ok {
+				return nil
+			}
+
+			collection, idStr, ok := strings.Cut(fqid, "/")
+			if !ok {
+				return nil
+			}
+
+			intId, err := strconv.Atoi(idStr)
+			if err != nil {
+				return nil
+			}
+
+			switch collection {
+			{{- $genericTypesLc := .GenericTypesLc }}
+			{{- $genericTypesCc := .GenericTypesCc }}
+			{{- range $i, $gType := .GenericTypes }}
+			case "{{ index $genericTypesCc $i }}":
+				{{- $typeLc := index $genericTypesLc $i }}
+				builder := &{{$typeLc}}Builder{
+					builder: builder[{{$typeLc}}Builder, *{{$typeLc}}Builder, {{$gType}}, *{{$gType}}]{
+						fetch: ds,
+	    			conv: func(p *{{$gType}}) {{$gType}} { return *p },
+					},
+				}
+				return builder.lazy(ds, intId)
+			{{- end }}
+			}
+
+			return nil
+		}
+
+		func (b *{{.TypeLc}}Builder) Preload(rel builderWrapperI) *{{.TypeLc}}Builder {
+			b.builder.Preload(rel)
+			return b
+		}
+	{{ end }}
+{{ end }}
 
 func (r *Fetch){{.GoName}}(ids... int) *{{.GoNameLc}}Builder {
 	return &{{.GoNameLc}}Builder{
-		builder: builder[{{.GoNameLc}}Builder, *{{.GoNameLc}}Builder, {{.GoName}}]{
+		builder: builder[{{.GoNameLc}}Builder, *{{.GoNameLc}}Builder, {{.GoName}}, *{{.GoName}}]{
 			ids: ids,
 			fetch: r,
+	    conv: func(p *{{.GoName}}) {{.GoName}} { return *p },
 		},
 	}
 }

datastore/dsmodels/gen_models/header.go.tmpl

@@ -3,6 +3,9 @@ package dsmodels
 
 import (
 	"encoding/json"
+	"strconv"
+	"strings"
+
   "github.com/OpenSlides/openslides-go/datastore/dsfetch"
 	"github.com/shopspring/decimal"
 )