chore: tweak resource definition

server/route/api/v2/resource_service.go

@@ -2,10 +2,14 @@ package v2
 
 import (
 	"context"
+	"fmt"
 	"net/url"
 	"time"
 
+	"github.com/google/cel-go/cel"
 	"github.com/lithammer/shortuuid/v4"
+	"github.com/pkg/errors"
+	expr "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -69,9 +73,42 @@ func (s *APIV2Service) ListResources(ctx context.Context, _ *apiv2pb.ListResourc
 	return response, nil
 }
 
+func (s *APIV2Service) SearchResources(ctx context.Context, request *apiv2pb.SearchResourcesRequest) (*apiv2pb.SearchResourcesResponse, error) {
+	if request.Filter == "" {
+		return nil, status.Errorf(codes.InvalidArgument, "filter is empty")
+	}
+	filter, err := parseSearchResourcesFilter(request.Filter)
+	if err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "failed to parse filter: %v", err)
+	}
+	resourceFind := &store.FindResource{}
+	if filter.UID != nil {
+		resourceFind.UID = filter.UID
+	}
+	user, err := getCurrentUser(ctx, s.Store)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err)
+	}
+	resourceFind.CreatorID = &user.ID
+	resources, err := s.Store.ListResources(ctx, resourceFind)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to search resources: %v", err)
+	}
+
+	response := &apiv2pb.SearchResourcesResponse{}
+	for _, resource := range resources {
+		response.Resources = append(response.Resources, s.convertResourceFromStore(ctx, resource))
+	}
+	return response, nil
+}
+
 func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetResourceRequest) (*apiv2pb.GetResourceResponse, error) {
+	id, err := ExtractResourceIDFromName(request.Name)
+	if err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "invalid resource name: %v", err)
+	}
 	resource, err := s.Store.GetResource(ctx, &store.FindResource{
-		ID: &request.Id,
+		ID: &id,
 	})
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to get resource: %v", err)
@@ -85,30 +122,18 @@ func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetReso
 	}, nil
 }
 
-func (s *APIV2Service) GetResourceByName(ctx context.Context, request *apiv2pb.GetResourceByNameRequest) (*apiv2pb.GetResourceByNameResponse, error) {
-	resource, err := s.Store.GetResource(ctx, &store.FindResource{
-		UID: &request.Name,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get resource: %v", err)
-	}
-	if resource == nil {
-		return nil, status.Errorf(codes.NotFound, "resource not found")
-	}
-
-	return &apiv2pb.GetResourceByNameResponse{
-		Resource: s.convertResourceFromStore(ctx, resource),
-	}, nil
-}
-
 func (s *APIV2Service) UpdateResource(ctx context.Context, request *apiv2pb.UpdateResourceRequest) (*apiv2pb.UpdateResourceResponse, error) {
+	id, err := ExtractResourceIDFromName(request.Resource.Name)
+	if err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "invalid resource name: %v", err)
+	}
 	if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
 		return nil, status.Errorf(codes.InvalidArgument, "update mask is required")
 	}
 
 	currentTs := time.Now().Unix()
 	update := &store.UpdateResource{
-		ID:        request.Resource.Id,
+		ID:        id,
 		UpdatedTs: &currentTs,
 	}
 	for _, field := range request.UpdateMask.Paths {
@@ -129,12 +154,16 @@ func (s *APIV2Service) UpdateResource(ctx context.Context, request *apiv2pb.Upda
 }
 
 func (s *APIV2Service) DeleteResource(ctx context.Context, request *apiv2pb.DeleteResourceRequest) (*apiv2pb.DeleteResourceResponse, error) {
+	id, err := ExtractResourceIDFromName(request.Name)
+	if err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "invalid resource name: %v", err)
+	}
 	user, err := getCurrentUser(ctx, s.Store)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err)
 	}
 	resource, err := s.Store.GetResource(ctx, &store.FindResource{
-		ID:        &request.Id,
+		ID:        &id,
 		CreatorID: &user.ID,
 	})
 	if err != nil {
@@ -164,8 +193,8 @@ func (s *APIV2Service) convertResourceFromStore(ctx context.Context, resource *s
 	}
 
 	return &apiv2pb.Resource{
-		Id:           resource.ID,
-		Name:         resource.UID,
+		Name:         fmt.Sprintf("%s%d", ResourceNamePrefix, resource.ID),
+		Uid:          resource.UID,
 		CreateTime:   timestamppb.New(time.Unix(resource.CreatedTs, 0)),
 		Filename:     resource.Filename,
 		ExternalLink: resource.ExternalLink,
@@ -174,3 +203,50 @@ func (s *APIV2Service) convertResourceFromStore(ctx context.Context, resource *s
 		MemoId:       memoID,
 	}
 }
+
+// SearchResourcesFilterCELAttributes are the CEL attributes for SearchResourcesFilter.
+var SearchResourcesFilterCELAttributes = []cel.EnvOption{
+	cel.Variable("uid", cel.StringType),
+}
+
+type SearchResourcesFilter struct {
+	UID *string
+}
+
+func parseSearchResourcesFilter(expression string) (*SearchResourcesFilter, error) {
+	e, err := cel.NewEnv(SearchResourcesFilterCELAttributes...)
+	if err != nil {
+		return nil, err
+	}
+	ast, issues := e.Compile(expression)
+	if issues != nil {
+		return nil, errors.Errorf("found issue %v", issues)
+	}
+	filter := &SearchResourcesFilter{}
+	expr, err := cel.AstToParsedExpr(ast)
+	if err != nil {
+		return nil, err
+	}
+	callExpr := expr.GetExpr().GetCallExpr()
+	findSearchResourcesField(callExpr, filter)
+	return filter, nil
+}
+
+func findSearchResourcesField(callExpr *expr.Expr_Call, filter *SearchResourcesFilter) {
+	if len(callExpr.Args) == 2 {
+		idExpr := callExpr.Args[0].GetIdentExpr()
+		if idExpr != nil {
+			if idExpr.Name == "uid" {
+				uid := callExpr.Args[1].GetConstExpr().GetStringValue()
+				filter.UID = &uid
+			}
+			return
+		}
+	}
+	for _, arg := range callExpr.Args {
+		callExpr := arg.GetCallExpr()
+		if callExpr != nil {
+			findSearchResourcesField(callExpr, filter)
+		}
+	}
+}