feat(subject-mappings): refactor to meet db schema

cmd/start.go

@@ -18,8 +18,9 @@ import (
 	"github.com/opentdf/opentdf-v2-poc/internal/server"
 
 	// "github.com/opentdf/opentdf-v2-poc/services/acre"
-	// "github.com/opentdf/opentdf-v2-poc/services/acse"
 	"github.com/opentdf/opentdf-v2-poc/services/attributes"
+	"github.com/opentdf/opentdf-v2-poc/services/subjectmapping"
+
 	// "github.com/opentdf/opentdf-v2-poc/services/keyaccessgrants"
 	"github.com/spf13/cobra"
 )
@@ -142,11 +143,11 @@ func RegisterServices(_ config.Config, otdf *server.OpenTDFServer, dbClient *db.
 		return fmt.Errorf("could not register attributes service: %w", err)
 	}
 
-	// slog.Info("registering acse server")
-	// err = acse.NewSubjectEncodingServer(dbClient, otdf.GrpcServer, otdf.GrpcInProcess.GetGrpcServer(), otdf.Mux)
-	// if err != nil {
-	// 	return fmt.Errorf("could not register acse service: %w", err)
-	// }
+	slog.Info("registering subject mapping service")
+	err = subjectmapping.NewSubjectMappingServer(dbClient, otdf.GrpcServer, otdf.GrpcInProcess.GetGrpcServer(), otdf.Mux)
+	if err != nil {
+		return fmt.Errorf("could not register subject mapping service: %w", err)
+	}
 
 	// slog.Info("registering key access grants service")
 	// err = keyaccessgrants.NewKeyAccessGrantsServer(dbClient, otdf.GrpcServer, otdf.Mux)

internal/db/subject_mappings.go

@@ -0,0 +1,285 @@
+package db
+
+import (
+	"context"
+	"strings"
+
+	sq "github.com/Masterminds/squirrel"
+	"github.com/jackc/pgx/v5"
+	"github.com/opentdf/opentdf-v2-poc/sdk/attributes"
+	"github.com/opentdf/opentdf-v2-poc/sdk/common"
+	"github.com/opentdf/opentdf-v2-poc/sdk/subjectmapping"
+	"google.golang.org/protobuf/encoding/protojson"
+)
+
+var SubjectMappingTable = tableName(TableSubjectMappings)
+var SubjectMappingOperatorEnumPrefix = "SUBJECT_MAPPINGS_OPERATOR_ENUM_"
+
+func subjectMappingOperatorEnumTransformIn(value string) string {
+	return strings.TrimPrefix(value, SubjectMappingOperatorEnumPrefix)
+}
+
+func subjectMappingOperatorEnumTransformOut(value string) subjectmapping.SubjectMappingOperatorEnum {
+	return subjectmapping.SubjectMappingOperatorEnum(subjectmapping.SubjectMappingOperatorEnum_value[SubjectMappingOperatorEnumPrefix+value])
+}
+
+func subjectMappingSelect() sq.SelectBuilder {
+	return newStatementBuilder().Select(
+		tableField(SubjectMappingTable, "id"),
+		tableField(SubjectMappingTable, "operator"),
+		tableField(SubjectMappingTable, "subject_attribute"),
+		tableField(SubjectMappingTable, "subject_attribute_values"),
+		tableField(SubjectMappingTable, "metadata"),
+		"JSON_AGG("+
+			"JSON_BUILD_OBJECT("+
+			"'id', "+tableField(AttributeValueTable, "id")+", "+
+			"'value', "+tableField(AttributeValueTable, "value")+","+
+			"'members', "+tableField(AttributeValueTable, "members")+
+			")"+
+			") AS attribute_value",
+	).
+		LeftJoin(AttributeValueTable + " ON " + tableField(AttributeValueTable, "id") + " = " + tableField(SubjectMappingTable, "id")).
+		GroupBy(tableField(SubjectMappingTable, "id"))
+}
+
+func subjectMappingHydrateItem(row pgx.Row) (*subjectmapping.SubjectMapping, error) {
+	var (
+		id                     string
+		operator               string
+		subjectAttribute       string
+		subjectAttributeValues []string
+		metadataJson           []byte
+		attributeValueJson     []byte
+	)
+
+	err := row.Scan(
+		&id,
+		&operator,
+		&subjectAttribute,
+		&subjectAttributeValues,
+		&metadataJson,
+		&attributeValueJson,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	m := &common.Metadata{}
+	if metadataJson != nil {
+		if err := protojson.Unmarshal(metadataJson, m); err != nil {
+			return nil, err
+		}
+	}
+
+	v := &attributes.Value{}
+	if metadataJson != nil {
+		if err := protojson.Unmarshal(metadataJson, v); err != nil {
+			return nil, err
+		}
+	}
+
+	s := &subjectmapping.SubjectMapping{
+		Id:               id,
+		Operator:         subjectMappingOperatorEnumTransformOut(operator),
+		SubjectAttribute: subjectAttribute,
+		SubjectValues:    subjectAttributeValues,
+		Metadata:         m,
+		AttributeValue:   v,
+	}
+	return s, nil
+}
+
+func subjectMappingHydrateList(rows pgx.Rows) ([]*subjectmapping.SubjectMapping, error) {
+	list := make([]*subjectmapping.SubjectMapping, 0)
+	for rows.Next() {
+		s, err := subjectMappingHydrateItem(rows)
+		if err != nil {
+			return nil, err
+		}
+		list = append(list, s)
+	}
+	return list, nil
+}
+
+///
+/// SubjectMapping CRUD
+///
+
+func createSubjectMappingSql(attribute_value_id string, operator string, subject_attribute string, subject_attribute_values []string, metadata []byte) (string, []interface{}, error) {
+	return newStatementBuilder().
+		Insert(SubjectMappingTable).
+		Columns(
+			"attribute_value_id",
+			"operator",
+			"subject_attribute",
+			"subject_attribute_values",
+			"metadata",
+		).
+		Values(
+			attribute_value_id,
+			operator,
+			subject_attribute,
+			subject_attribute_values,
+			metadata,
+		).
+		Suffix("RETURNING \"id\"").
+		ToSql()
+}
+func (c *Client) CreateSubjectMapping(ctx context.Context, s *subjectmapping.SubjectMappingCreateUpdate) (*subjectmapping.SubjectMapping, error) {
+	metadataJson, metadata, err := marshalCreateMetadata(s.Metadata)
+	if err != nil {
+		return nil, err
+	}
+
+	sql, args, err := createSubjectMappingSql(
+		s.AttributeValueId,
+		subjectMappingOperatorEnumTransformIn(s.Operator.String()),
+		s.SubjectAttribute,
+		s.SubjectValues,
+		metadataJson,
+	)
+
+	var id string
+	if r, err := c.queryRow(ctx, sql, args, err); err != nil {
+		return nil, err
+	} else if err := r.Scan(&id); err != nil {
+		return nil, err
+	}
+
+	// a, err := c.GetAttributeValue(ctx, s.AttributeValueId)
+
+	rS := &subjectmapping.SubjectMapping{
+		Id: id,
+		// Attribute:     a,
+		Operator:         s.Operator,
+		SubjectAttribute: s.SubjectAttribute,
+		SubjectValues:    s.SubjectValues,
+		Metadata:         metadata,
+	}
+	return rS, nil
+}
+
+func getSubjectMappingSql(id string) (string, []interface{}, error) {
+	return subjectMappingSelect().
+		From(SubjectMappingTable).
+		Where(sq.Eq{"id": id}).
+		ToSql()
+}
+func (c *Client) GetSubjectMapping(ctx context.Context, id string) (*subjectmapping.SubjectMapping, error) {
+	sql, args, err := getSubjectMappingSql(id)
+
+	row, err := c.queryRow(ctx, sql, args, err)
+	if err != nil {
+		return nil, err
+	}
+
+	s, err := subjectMappingHydrateItem(row)
+	if err != nil {
+		return nil, err
+	}
+
+	return s, nil
+}
+
+func listSubjectMappingsSql() (string, []interface{}, error) {
+	return subjectMappingSelect().
+		From(SubjectMappingTable).
+		ToSql()
+}
+func (c *Client) ListSubjectMappings(ctx context.Context) ([]*subjectmapping.SubjectMapping, error) {
+	sql, args, err := listSubjectMappingsSql()
+	if err != nil {
+		return nil, err
+	}
+
+	rows, err := c.query(ctx, sql, args, err)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	subjectMappings, err := subjectMappingHydrateList(rows)
+	if err != nil {
+		return nil, err
+	}
+
+	return subjectMappings, nil
+}
+
+func updateSubjectMappingSql(id string, attribute_value_id string, operator string, subject_attribute string, subject_attribute_values []string, metadata []byte) (string, []interface{}, error) {
+	sb := newStatementBuilder().
+		Update(SubjectMappingTable)
+
+	if attribute_value_id != "" {
+		sb.Set("attribute_value_id", attribute_value_id)
+	}
+	if operator != "" {
+		sb.Set("operator", operator)
+	}
+	if subject_attribute != "" {
+		sb.Set("subject_attribute", subject_attribute)
+	}
+	if subject_attribute_values != nil {
+		sb.Set("subject_attribute_values", subject_attribute_values)
+	}
+	if metadata != nil {
+		sb.Set("metadata", metadata)
+	}
+
+	return sb.
+		Where(sq.Eq{"id": id}).
+		ToSql()
+}
+func (c *Client) UpdateSubjectMapping(ctx context.Context, id string, s *subjectmapping.SubjectMappingCreateUpdate) (*subjectmapping.SubjectMapping, error) {
+	prev, err := c.GetSubjectMapping(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+
+	metadataJson, _, err := marshalUpdateMetadata(prev.Metadata, s.Metadata)
+	if err != nil {
+		return nil, err
+	}
+
+	sql, args, err := updateSubjectMappingSql(
+		id,
+		s.AttributeValueId,
+		subjectMappingOperatorEnumTransformIn(s.Operator.String()),
+		s.SubjectAttribute,
+		s.SubjectValues,
+		metadataJson,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := c.exec(ctx, sql, args, err); err != nil {
+		return nil, err
+	}
+
+	return prev, nil
+}
+
+func deleteSubjectMappingSql(id string) (string, []interface{}, error) {
+	return newStatementBuilder().
+		Delete(SubjectMappingTable).
+		Where(sq.Eq{"id": id}).
+		ToSql()
+}
+func (c *Client) DeleteSubjectMapping(ctx context.Context, id string) (*subjectmapping.SubjectMapping, error) {
+	prev, err := c.GetSubjectMapping(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+
+	sql, args, err := deleteSubjectMappingSql(id)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := c.exec(ctx, sql, args, err); err != nil {
+		return nil, err
+	}
+
+	return prev, nil
+}