types: fixup and test tag JSON marshalling

Signed-off-by: Ali Dowair <[email protected]>

types/entity_map_test.go

@@ -60,8 +60,8 @@ func TestEntitiesJSON(t *testing.T) {
 			t,
 			e,
 			`[
-				{"uid": {"type": "Type", "id": "id"}, "parents": [], "attrs": {"key": 42}},
-				{"uid": {"type": "Type" ,"id" :"id2"}, "parents": [{"type":"Type","id":"id"}], "attrs": {"key": 42}}
+				{"uid": {"type": "Type", "id": "id"}, "parents": [], "attrs": {"key": 42}, "tags": {}},
+				{"uid": {"type": "Type" ,"id" :"id2"}, "parents": [{"type":"Type","id":"id"}], "attrs": {"key": 42}, "tags":{}}
 			]`)
 	})
 

types/entity_tag_test.go

@@ -0,0 +1,46 @@
+package types_test
+
+import (
+	"testing"
+	"time"
+
+	"github.com/cedar-policy/cedar-go"
+	"github.com/cedar-policy/cedar-go/internal/testutil"
+	"github.com/cedar-policy/cedar-go/types"
+)
+
+func TestEntityTagMarshalJSON(t *testing.T) {
+	t.Parallel()
+	e := types.Entity{
+		UID:        types.NewEntityUID("FooType", "1"),
+		Parents:    types.NewEntityUIDSet(),
+		Attributes: types.Record{},
+		Tags: cedar.NewRecord(types.RecordMap{
+			"key":      types.String("value"),
+			"entity":   types.NewEntityUID("FootType", "1"),
+			"datetime": types.NewDatetime(time.Unix(0, 0)),
+		}),
+	}
+
+	testutil.JSONMarshalsTo(t, e,
+		`{
+			"uid": {"type":"FooType","id":"1"},
+			"parents": [],
+			"attrs":{},
+            "tags": {
+        		"datetime": {
+        			"__extn": {
+        				"fn": "datetime",
+        				"arg": "1970-01-01T00:00:00.000Z"
+        			}
+        		},
+        		"entity": {
+        			"__entity": {
+        				"type": "FootType",
+        				"id": "1"
+        			}
+        		},
+        		"key": "value"
+            }
+		}`)
+}

types/entity_test.go

@@ -40,6 +40,7 @@ func TestEntityMarshalJSON(t *testing.T) {
 			types.NewEntityUID("QuuxType", "3"),
 		),
 		Attributes: types.Record{},
+		Tags:       types.Record{},
 	}
 
 	testutil.JSONMarshalsTo(t, e,
@@ -52,6 +53,7 @@ func TestEntityMarshalJSON(t *testing.T) {
 				{"type":"QuuxType","id":"3"},
 				{"type":"QuuxType","id":"30"}
 			],
-			"attrs":{}
+			"attrs":{},
+			"tags":{}
 		}`)
 }