From e703b4f70d57088a2f68417da2843921bbc19d20 Mon Sep 17 00:00:00 2001
From: Steven <stevenlgtm@gmail.com>
Date: Sun, 24 Mar 2024 22:35:10 +0800
Subject: [PATCH] fix: resource v1 definition

---
 server/route/api/v1/resource.go              | 4 +++-
 server/route/api/v2/memo_resource_service.go | 2 +-
 server/route/api/v2/resource_service.go      | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/route/api/v1/resource.go b/server/route/api/v1/resource.go
index edbe943d..eb1eeb4b 100644
--- a/server/route/api/v1/resource.go
+++ b/server/route/api/v1/resource.go
@@ -26,6 +26,7 @@ import (
 type Resource struct {
 	ID   int32  `json:"id"`
 	Name string `json:"name"`
+	UID  string `json:"uid"`
 
 	// Standard fields
 	CreatorID int32 `json:"creatorId"`
@@ -371,7 +372,8 @@ func replacePathTemplate(path, filename string) string {
 func convertResourceFromStore(resource *store.Resource) *Resource {
 	return &Resource{
 		ID:           resource.ID,
-		Name:         resource.UID,
+		Name:         fmt.Sprintf("resources/%d", resource.ID),
+		UID:          resource.UID,
 		CreatorID:    resource.CreatorID,
 		CreatedTs:    resource.CreatedTs,
 		UpdatedTs:    resource.UpdatedTs,
diff --git a/server/route/api/v2/memo_resource_service.go b/server/route/api/v2/memo_resource_service.go
index 42ab0a4b..fd7b518c 100644
--- a/server/route/api/v2/memo_resource_service.go
+++ b/server/route/api/v2/memo_resource_service.go
@@ -46,7 +46,7 @@ func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.Se
 	slices.Reverse(request.Resources)
 	// Update resources' memo_id in the request.
 	for index, resource := range request.Resources {
-		id, err := ExtractMemoIDFromName(resource.Name)
+		id, err := ExtractResourceIDFromName(resource.Name)
 		if err != nil {
 			return nil, status.Errorf(codes.InvalidArgument, "invalid resource name: %v", err)
 		}
diff --git a/server/route/api/v2/resource_service.go b/server/route/api/v2/resource_service.go
index f27f7212..1187f2f3 100644
--- a/server/route/api/v2/resource_service.go
+++ b/server/route/api/v2/resource_service.go
@@ -105,7 +105,7 @@ func (s *APIV2Service) SearchResources(ctx context.Context, request *apiv2pb.Sea
 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)
+		return nil, status.Errorf(codes.InvalidArgument, "invalid resource id: %v", err)
 	}
 	resource, err := s.Store.GetResource(ctx, &store.FindResource{
 		ID: &id,
@@ -125,7 +125,7 @@ func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetReso
 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)
+		return nil, status.Errorf(codes.InvalidArgument, "invalid resource id: %v", err)
 	}
 	if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
 		return nil, status.Errorf(codes.InvalidArgument, "update mask is required")
@@ -156,7 +156,7 @@ 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)
+		return nil, status.Errorf(codes.InvalidArgument, "invalid resource id: %v", err)
 	}
 	user, err := getCurrentUser(ctx, s.Store)
 	if err != nil {