Model's embedded fields Done

pelusa-v · May 15, 2024 · 4441059 · 4441059
1 parent af1a1e4
commit 4441059
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 12 deletions.
diff --git a/src/main.go b/src/main.go
@@ -16,6 +16,7 @@ func main() {
 	admin.RegisterModel(samples.User{})
 	admin.RegisterModel(samples.Product{})
 	admin.RegisterModel(samples.Car{})
+	admin.RegisterModel(samples.Blog{})
 
 	// db := samples.NewDbInstance()
 	// samples.TestListHandler(db)

diff --git a/src/pkg/data/forms_data.go b/src/pkg/data/forms_data.go
@@ -34,5 +34,11 @@ func (form *FormData) SetFormInputs(model *DbModel) {
 		// input.Disabled = IsPkField(f)
 		input.Type = GetHtmlInputType(f)
 		form.SimpleInputs = append(form.SimpleInputs, input)
+
+		// fmt.Println(f.Tag)
+		// fmt.Println(f.Name)
+		// fmt.Println(f.Index)
+		// fmt.Println(f.Type)
+		// fmt.Println("---------------")
 	}
 }
diff --git a/src/pkg/data/utils.go b/src/pkg/data/utils.go
@@ -2,7 +2,10 @@ package data
 
 import (
 	"encoding/json"
+	"fmt"
 	"reflect"
+	"regexp"
+	"strings"
 	"time"
 
 	"gorm.io/gorm"
@@ -15,17 +18,31 @@ const HTML_INPUT_DATETIME_TYPE = "datetime-local"
 const HTML_INPUT_BOOL_TYPE = "checkbox"
 const HTML_INPUT_NUMBER_TYPE = "number"
 
-const GORM_PK_DEFAULT_TAG_NAME string = "gorm"
+const GORM_DEFAULT_TAG_NAME string = "gorm"
 const GORM_PK_DEFAULT_TAG_VALUE string = "primaryKey"
 const GORM_PK_DEFAULT_NAME string = "ID"
+const GORM_EMBEDDED_DEFAULT_TAG_VALUE string = "embedded"
+const GORM_EMBEDDED_PREFIX_DEFAULT_TAG_VALUE string = "embeddedPrefix"
 
 func FieldHasEmbeddedStructs(f reflect.StructField) bool {
-	// return f.Anonymous || f.Type == reflect.TypeOf(gorm.DeletedAt{})
-	return f.Anonymous
+	return f.Anonymous ||
+		strings.Contains(f.Tag.Get(GORM_DEFAULT_TAG_NAME), GORM_EMBEDDED_DEFAULT_TAG_VALUE)
+}
+
+func FieldHasEmbeddedPrefix(f reflect.StructField) bool {
+	return strings.Contains(f.Tag.Get(GORM_DEFAULT_TAG_NAME), GORM_EMBEDDED_PREFIX_DEFAULT_TAG_VALUE)
 }
 
 func IsPkField(f reflect.StructField) bool {
-	return f.Tag.Get(GORM_PK_DEFAULT_TAG_NAME) == GORM_PK_DEFAULT_TAG_VALUE || f.Name == GORM_PK_DEFAULT_NAME
+	return f.Tag.Get(GORM_DEFAULT_TAG_NAME) == GORM_PK_DEFAULT_TAG_VALUE || f.Name == GORM_PK_DEFAULT_NAME
+}
+
+func AddEmbeddedPrefixToField(f *reflect.StructField) {
+	re := regexp.MustCompile(fmt.Sprintf(`%s:([^";]+)`, GORM_EMBEDDED_PREFIX_DEFAULT_TAG_VALUE))
+	matches := re.FindStringSubmatch(f.Tag.Get(GORM_DEFAULT_TAG_NAME))
+	if len(matches) > 1 {
+		f.Name = matches[1]
+	}
 }
 
 func GetHtmlInputType(f reflect.StructField) string {
@@ -84,6 +101,10 @@ func GetObjectFields(objectType reflect.Type) []reflect.StructField {
 	for i := 0; i < objectType.NumField(); i++ {
 		fieldType := objectType.Field(i)
 
+		// if FieldHasEmbeddedPrefix(fieldType) {
+		// 	AddEmbeddedPrefixToField(&fieldType)
+		// }
+
 		if FieldHasEmbeddedStructs(fieldType) {
 			embeddedFields := GetObjectFields(fieldType.Type)
 			objectFields = append(objectFields, embeddedFields...)
@@ -95,14 +116,6 @@ func GetObjectFields(objectType reflect.Type) []reflect.StructField {
 	return objectFields
 }
 
-// func GetTypesNames(objectsTypes *[]reflect.Type) []string {
-// 	var names []string
-// 	for _, objectType := range *objectsTypes {
-// 		names = append(names, objectType.Name())
-// 	}
-// 	return names
-// }
-
 func GetObjectInstanceFromBytes(data []byte, typ reflect.Type) (interface{}, error) {
 	instancePtr := reflect.New(typ).Interface() // Create a new pointer to a type instance
 

diff --git a/src/samples/models.go b/src/samples/models.go
@@ -22,3 +22,20 @@ type Car struct {
 	Number     string
 	Passengers int
 }
+
+type Hint struct {
+	Test string
+}
+
+type Author struct {
+	Name  string
+	Email string
+	// Hint  Hint `gorm:"embedded;embeddedPrefix:hint_"`
+	Hint Hint `gorm:"embedded"`
+}
+
+type Blog struct {
+	ID      int
+	Author  Author `gorm:"embedded"`
+	Upvotes int32
+}