chore: update tag service creator

api/v2/tag_service.go

@@ -2,7 +2,9 @@ package v2
 
 import (
 	"context"
+	"fmt"
 
+	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -24,14 +26,31 @@ func (s *APIV2Service) UpsertTag(ctx context.Context, request *apiv2pb.UpsertTag
 		return nil, status.Errorf(codes.Internal, "failed to upsert tag: %v", err)
 	}
 
+	t, err := s.convertTagFromStore(ctx, tag)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to convert tag: %v", err)
+	}
 	return &apiv2pb.UpsertTagResponse{
-		Tag: convertTagFromStore(tag),
+		Tag: t,
 	}, nil
 }
 
 func (s *APIV2Service) ListTags(ctx context.Context, request *apiv2pb.ListTagsRequest) (*apiv2pb.ListTagsResponse, error) {
+	username, err := ExtractUsernameFromName(request.Creator)
+	if err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "invalid username: %v", err)
+	}
+	user, err := s.Store.GetUser(ctx, &store.FindUser{
+		Username: &username,
+	})
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to get user: %v", err)
+	}
+	if user == nil {
+		return nil, status.Errorf(codes.NotFound, "user not found")
+	}
 	tags, err := s.Store.ListTags(ctx, &store.FindTag{
-		CreatorID: request.CreatorId,
+		CreatorID: user.ID,
 	})
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to list tags: %v", err)
@@ -39,26 +58,48 @@ func (s *APIV2Service) ListTags(ctx context.Context, request *apiv2pb.ListTagsRe
 
 	response := &apiv2pb.ListTagsResponse{}
 	for _, tag := range tags {
-		response.Tags = append(response.Tags, convertTagFromStore(tag))
+		t, err := s.convertTagFromStore(ctx, tag)
+		if err != nil {
+			return nil, status.Errorf(codes.Internal, "failed to convert tag: %v", err)
+		}
+		response.Tags = append(response.Tags, t)
 	}
 	return response, nil
 }
 
 func (s *APIV2Service) DeleteTag(ctx context.Context, request *apiv2pb.DeleteTagRequest) (*apiv2pb.DeleteTagResponse, error) {
-	err := s.Store.DeleteTag(ctx, &store.DeleteTag{
-		Name:      request.Tag.Name,
-		CreatorID: request.Tag.CreatorId,
+	username, err := ExtractUsernameFromName(request.Tag.Creator)
+	if err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "invalid username: %v", err)
+	}
+	user, err := s.Store.GetUser(ctx, &store.FindUser{
+		Username: &username,
 	})
 	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to get user: %v", err)
+	}
+	if user == nil {
+		return nil, status.Errorf(codes.NotFound, "user not found")
+	}
+	if err := s.Store.DeleteTag(ctx, &store.DeleteTag{
+		Name:      request.Tag.Name,
+		CreatorID: user.ID,
+	}); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to delete tag: %v", err)
 	}
 
 	return &apiv2pb.DeleteTagResponse{}, nil
 }
 
-func convertTagFromStore(tag *store.Tag) *apiv2pb.Tag {
-	return &apiv2pb.Tag{
-		Name:      tag.Name,
-		CreatorId: int32(tag.CreatorID),
+func (s *APIV2Service) convertTagFromStore(ctx context.Context, tag *store.Tag) (*apiv2pb.Tag, error) {
+	user, err := s.Store.GetUser(ctx, &store.FindUser{
+		ID: &tag.CreatorID,
+	})
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get user")
 	}
+	return &apiv2pb.Tag{
+		Name:    tag.Name,
+		Creator: fmt.Sprintf("%s%s", UserNamePrefix, user.Username),
+	}, nil
 }

proto/api/v2/tag_service.proto

@@ -20,7 +20,9 @@ service TagService {
 
 message Tag {
   string name = 1;
-  int32 creator_id = 2;
+  // The creator of tags.
+  // Format: users/{username}
+  string creator = 2;
 }
 
 message UpsertTagRequest {
@@ -32,7 +34,9 @@ message UpsertTagResponse {
 }
 
 message ListTagsRequest {
-  int32 creator_id = 1;
+  // The creator of tags.
+  // Format: users/{username}
+  string creator = 1;
 }
 
 message ListTagsResponse {

proto/api/v2/user_service.proto

@@ -108,6 +108,13 @@ message UpdateUserResponse {
   User user = 1;
 }
 
+message UserAccessToken {
+  string access_token = 1;
+  string description = 2;
+  google.protobuf.Timestamp issued_at = 3;
+  google.protobuf.Timestamp expires_at = 4;
+}
+
 message ListUserAccessTokensRequest {
   // The name of the user.
   // Format: users/{username}
@@ -141,10 +148,3 @@ message DeleteUserAccessTokenRequest {
 }
 
 message DeleteUserAccessTokenResponse {}
-
-message UserAccessToken {
-  string access_token = 1;
-  string description = 2;
-  google.protobuf.Timestamp issued_at = 3;
-  google.protobuf.Timestamp expires_at = 4;
-}

proto/gen/api/v2/README.md

@@ -928,7 +928,7 @@
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| creator_id | [int32](#int32) |  |  |
+| creator | [string](#string) |  | The creator of tags. Format: users/{username} |
 
 
 
@@ -959,7 +959,7 @@
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | name | [string](#string) |  |  |
-| creator_id | [int32](#int32) |  |  |
+| creator | [string](#string) |  | The creator of tags. Format: users/{username} |
 
 
 

web/src/store/module/tag.ts

@@ -13,7 +13,7 @@ export const useTagStore = () => {
 
   const fetchTags = async () => {
     const { tags } = await tagServiceClient.listTags({
-      creatorId: currentUser.id,
+      creator: currentUser.name,
     });
     store.dispatch(setTags(tags.map((tag) => tag.name)));
   };
@@ -29,7 +29,7 @@ export const useTagStore = () => {
     await tagServiceClient.deleteTag({
       tag: {
         name: tagName,
-        creatorId: currentUser.id,
+        creator: currentUser.name,
       },
     });
     store.dispatch(deleteTagAction(tagName));