fix(attribute value): fixes attribute value crud

internal/db/attribute_values.go

@@ -51,10 +51,10 @@ func createAttributeValueSql(
 	return newStatementBuilder().
 		Insert(AttributeValueTable).
 		Columns(
-			tableField(AttributeValueTable, "attribute_id"),
-			tableField(AttributeValueTable, "value"),
-			tableField(AttributeValueTable, "members"),
-			tableField(AttributeValueTable, "metadata"),
+			"attribute_definition_id",
+			"value",
+			"members",
+			"metadata",
 		).
 		Values(
 			attribute_id,
@@ -133,7 +133,7 @@ func listAttributeValuesSql(attribute_id string) (string, []interface{}, error)
 			tableField(AttributeValueTable, "metadata"),
 		).
 		From(AttributeValueTable).
-		Where(sq.Eq{tableField(AttributeValueTable, "attribute_id"): attribute_id}).
+		Where(sq.Eq{tableField(AttributeValueTable, "attribute_definition_id"): attribute_id}).
 		ToSql()
 }
 func (c Client) ListAttributeValues(ctx context.Context, attribute_id string) ([]*attributes.Value, error) {
@@ -165,15 +165,15 @@ func updateAttributeValueSql(
 		Update(AttributeValueTable)
 
 	if value != "" {
-		sb = sb.Set(tableField(AttributeValueTable, "value"), value)
+		sb = sb.Set("value", value)
 	}
 	if members != nil {
-		sb = sb.Set(tableField(AttributeValueTable, "members"), members)
+		sb = sb.Set("members", members)
 	}
-	sb.Set(tableField(AttributeValueTable, "metadata"), metadata)
+	sb.Set("metadata", metadata)
 
 	return sb.
-		Where(sq.Eq{tableField(AttributeValueTable, "id"): id}).
+		Where(sq.Eq{"id": id}).
 		ToSql()
 }
 func (c Client) UpdateAttributeValue(ctx context.Context, id string, v *attributes.ValueUpdate) (*attributes.Value, error) {

migrations/20240118000000_create_new_tables.sql

@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS opentdf.attribute_values
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
     attribute_definition_id UUID NOT NULL REFERENCES opentdf.attribute_definitions(id),
     value VARCHAR NOT NULL,
-    members UUID[] NOT NULL,
+    members UUID[],
     metadata JSONB,
     UNIQUE (attribute_definition_id, value)
 );

proto/attributes/attributes.proto

@@ -145,40 +145,40 @@ message DeleteAttributeResponse {
 ///
 /// Value RPC messages
 ///
-message GetValueRequest {
+message GetAttributeValueRequest {
   string id = 1 [(buf.validate.field).required = true];
 }
-message GetValueResponse {
+message GetAttributeValueResponse {
   Value value = 1;
 }
 
-message ListValuesRequest {
+message ListAttributeValuesRequest {
   string attribute_id = 1 [(buf.validate.field).required = true];
 }
-message ListValuesResponse {
+message ListAttributeValuesResponse {
   repeated Value values = 1;
 }
 
-message CreateValueRequest {
+message CreateAttributeValueRequest {
   string attribute_id = 1 [(buf.validate.field).required = true];
   ValueCreate value = 2 [(buf.validate.field).required = true];
 }
-message CreateValueResponse {
+message CreateAttributeValueResponse {
   Value value = 1;
 }
 
-message UpdateValueRequest {
+message UpdateAttributeValueRequest {
   string id = 1 [(buf.validate.field).required = true];
   ValueUpdate value = 2 [(buf.validate.field).required = true];
 }
-message UpdateValueResponse {
+message UpdateAttributeValueResponse {
   Value value = 1;
 }
 
-message DeleteValueRequest {
+message DeleteAttributeValueRequest {
   string id = 1 [(buf.validate.field).required = true];
 }
-message DeleteValueResponse {
+message DeleteAttributeValueResponse {
   Value value = 1;
 }
 
@@ -198,7 +198,7 @@ service AttributesService {
      Example:
       grpcurl -plaintext -d '{"attribute_id": "attribute_id"}' localhost:8080 attributes.AttributesService/ListValues
   */
-  rpc ListAttributeValues(ListValuesRequest) returns (ListValuesResponse) {}
+  rpc ListAttributeValues(ListAttributeValuesRequest) returns (ListAttributeValuesResponse) {}
 
   rpc GetAttribute(GetAttributeRequest) returns (GetAttributeResponse) {
     option (google.api.http) = {get: "/attributes/{id}"};
@@ -226,28 +226,28 @@ service AttributesService {
   }
 
   /** Attribute Value **/
-  rpc GetValue(GetValueRequest) returns (GetValueResponse) {
+  rpc GetAttributeValue(GetAttributeValueRequest) returns (GetAttributeValueResponse) {
     option (google.api.http) = {get: "/attributes/_/values/{id}"};
   }
 
   // Create Attribute Value
   // Example:
   //  grpcurl -plaintext -d '{"attribute_id": "attribute_id", "value": {"value": "value"}}' localhost:8080 attributes.AttributesService/CreateValue
-  rpc CreateValue(CreateValueRequest) returns (CreateValueResponse) {
+  rpc CreateAttributeValue(CreateAttributeValueRequest) returns (CreateAttributeValueResponse) {
     option (google.api.http) = {
       post: "/attributes/{attribute_id}/values"
       body: "value"
     };
   }
 
-  rpc UpdateValue(UpdateValueRequest) returns (UpdateValueResponse) {
+  rpc UpdateAttributeValue(UpdateAttributeValueRequest) returns (UpdateAttributeValueResponse) {
     option (google.api.http) = {
       post: "/attributes/_/values/{id}"
       body: "value"
     };
   }
 
-  rpc DeleteValue(DeleteValueRequest) returns (DeleteValueResponse) {
+  rpc DeleteAttributeValue(DeleteAttributeValueRequest) returns (DeleteAttributeValueResponse) {
     option (google.api.http) = {delete: "/attributes/_/values/{id}"};
   }
 }