Fixes for schema v2 conversion (#2777)

Author: josephschorr

pkg/schema/v2/tocorev1.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	core "github.com/authzed/spicedb/pkg/proto/core/v1"
+	"github.com/authzed/spicedb/pkg/schemadsl/compiler"
 )
 
 // ToDefinitions converts a Schema to the full set of namespace and caveat definitions.
@@ -61,8 +62,17 @@ func defToRelations(def *Definition) ([]*core.Relation, error) {
 
 	// Convert relations
 	for _, rel := range def.relations {
+		// Ensure metadata has RelationKind set to RELATION
+		relMetadata := rel.metadata
+		if relMetadata == nil {
+			relMetadata = NewMetadata()
+		}
+		if relMetadata.RelationKind() == RelationKindUnknown {
+			relMetadata = relMetadata.WithRelationKind(RelationKindRelation)
+		}
+
 		// Encode metadata
-		metadata, err := encodeMetadata(rel.metadata)
+		metadata, err := encodeMetadata(relMetadata)
 		if err != nil {
 			return nil, fmt.Errorf("failed to encode relation metadata for %s: %w", rel.name, err)
 		}
@@ -81,9 +91,17 @@ func defToRelations(def *Definition) ([]*core.Relation, error) {
 			return nil, fmt.Errorf("failed to convert permission %s: %w", perm.name, err)
 		}
 
+		// Create metadata marking this as a permission
+		permMetadata := NewMetadata().WithRelationKind(RelationKindPermission)
+		encodedMetadata, err := encodeMetadata(permMetadata)
+		if err != nil {
+			return nil, fmt.Errorf("failed to encode permission metadata for %s: %w", perm.name, err)
+		}
+
 		relations = append(relations, &core.Relation{
 			Name:           perm.name,
 			UsersetRewrite: rewrite,
+			Metadata:       encodedMetadata,
 		})
 	}
 
@@ -460,3 +478,27 @@ func functionTypeToCore(ft FunctionType) core.FunctionedTupleToUserset_Function
 		return core.FunctionedTupleToUserset_FUNCTION_ANY
 	}
 }
+
+// AsCompiledSchema converts a Schema to a CompiledSchema by calling ToDefinitions
+// and creating a compiled schema structure.
+func (s *Schema) AsCompiledSchema() (*compiler.CompiledSchema, error) {
+	namespaces, caveats, err := s.ToDefinitions()
+	if err != nil {
+		return nil, err
+	}
+
+	// Build ordered definitions by combining namespaces and caveats
+	orderedDefinitions := make([]compiler.SchemaDefinition, 0, len(namespaces)+len(caveats))
+	for _, ns := range namespaces {
+		orderedDefinitions = append(orderedDefinitions, ns)
+	}
+	for _, caveat := range caveats {
+		orderedDefinitions = append(orderedDefinitions, caveat)
+	}
+
+	return &compiler.CompiledSchema{
+		ObjectDefinitions:  namespaces,
+		CaveatDefinitions:  caveats,
+		OrderedDefinitions: orderedDefinitions,
+	}, nil
+}