order metaattribute when serializing the model

Signed-off-by: Doug Davis <[email protected]>
duglin · Jan 1, 2025 · 9e9f306 · 9e9f306
1 parent 40d13de
commit 9e9f306
Show file tree

Hide file tree

Showing 3 changed files with 140 additions and 129 deletions.
diff --git a/registry/model.go b/registry/model.go
@@ -256,7 +256,7 @@ func (m *Model) SetSingular() {
 	m.Attributes["$type"] = &Attribute{
 		Name:        "$type",
 		Type:        STRING,
-		Description: "0",
+		Description: string([]rune{'0' + ENTITY_REGISTRY}),
 	}
 
 	for _, gm := range m.Groups {
@@ -268,7 +268,7 @@ func (m *Model) SetSingular() {
 		gm.Attributes["$type"] = &Attribute{
 			Name:        "$type",
 			Type:        STRING,
-			Description: "1",
+			Description: string([]rune{'0' + ENTITY_GROUP}),
 		}
 
 		for _, rm := range gm.Resources {
@@ -280,7 +280,18 @@ func (m *Model) SetSingular() {
 			rm.Attributes["$type"] = &Attribute{
 				Name:        "$type",
 				Type:        STRING,
-				Description: "2",
+				Description: string([]rune{'0' + ENTITY_RESOURCE}),
+			}
+
+			rm.MetaAttributes["$singular"] = &Attribute{
+				Name:        "$singular",
+				Type:        STRING,
+				Description: rm.Singular,
+			}
+			rm.MetaAttributes["$type"] = &Attribute{
+				Name:        "$type",
+				Type:        STRING,
+				Description: string([]rune{'0' + ENTITY_META}),
 			}
 		}
 	}

diff --git a/tests/http_test.go b/tests/http_test.go
@@ -500,6 +500,12 @@ func TestHTTPModel(t *testing.T) {
             }
           },
           "metaattributes": {
+            "fileid": {
+              "name": "fileid",
+              "type": "string",
+              "immutable": true,
+              "serverrequired": true
+            },
             "self": {
               "name": "self",
               "type": "url",
@@ -546,12 +552,6 @@ func TestHTTPModel(t *testing.T) {
               "name": "defaultversionsticky",
               "type": "boolean",
               "readonly": true
-            },
-            "fileid": {
-              "name": "fileid",
-              "type": "string",
-              "immutable": true,
-              "serverrequired": true
             }
           }
         }
@@ -786,6 +786,12 @@ func TestHTTPModel(t *testing.T) {
             }
           },
           "metaattributes": {
+            "fileid": {
+              "name": "fileid",
+              "type": "string",
+              "immutable": true,
+              "serverrequired": true
+            },
             "self": {
               "name": "self",
               "type": "url",
@@ -832,12 +838,6 @@ func TestHTTPModel(t *testing.T) {
               "name": "defaultversionsticky",
               "type": "boolean",
               "readonly": true
-            },
-            "fileid": {
-              "name": "fileid",
-              "type": "string",
-              "immutable": true,
-              "serverrequired": true
             }
           }
         }
@@ -1079,6 +1079,12 @@ func TestHTTPModel(t *testing.T) {
             }
           },
           "metaattributes": {
+            "fileid": {
+              "name": "fileid",
+              "type": "string",
+              "immutable": true,
+              "serverrequired": true
+            },
             "self": {
               "name": "self",
               "type": "url",
@@ -1125,12 +1131,6 @@ func TestHTTPModel(t *testing.T) {
               "name": "defaultversionsticky",
               "type": "boolean",
               "readonly": true
-            },
-            "fileid": {
-              "name": "fileid",
-              "type": "string",
-              "immutable": true,
-              "serverrequired": true
             }
           }
         }