refactor: nest reaction resource names under memos

Author: johnnyjoygh

proto/api/v1/memo_service.proto

@@ -100,7 +100,7 @@ service MemoService {
   }
   // DeleteMemoReaction deletes a reaction for a memo.
   rpc DeleteMemoReaction(DeleteMemoReactionRequest) returns (google.protobuf.Empty) {
-    option (google.api.http) = {delete: "/api/v1/{name=reactions/*}"};
+    option (google.api.http) = {delete: "/api/v1/{name=memos/*/reactions/*}"};
     option (google.api.method_signature) = "name";
   }
 }
@@ -115,14 +115,14 @@ enum Visibility {
 message Reaction {
   option (google.api.resource) = {
     type: "memos.api.v1/Reaction"
-    pattern: "reactions/{reaction}"
+    pattern: "memos/{memo}/reactions/{reaction}"
     name_field: "name"
     singular: "reaction"
     plural: "reactions"
   };
 
   // The resource name of the reaction.
-  // Format: reactions/{reaction}
+  // Format: memos/{memo}/reactions/{reaction}
   string name = 1 [
     (google.api.field_behavior) = OUTPUT_ONLY,
     (google.api.field_behavior) = IDENTIFIER
@@ -501,7 +501,7 @@ message UpsertMemoReactionRequest {
 
 message DeleteMemoReactionRequest {
   // Required. The resource name of the reaction to delete.
-  // Format: reactions/{reaction}
+  // Format: memos/{memo}/reactions/{reaction}
   string name = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = {type: "memos.api.v1/Reaction"}

proto/gen/api/v1/memo_service.pb.go

@@ -960,6 +960,35 @@ paths:
                         application/json:
                             schema:
                                 $ref: '#/components/schemas/Status'
+    /api/v1/memos/{memo}/reactions/{reaction}:
+        delete:
+            tags:
+                - MemoService
+            description: DeleteMemoReaction deletes a reaction for a memo.
+            operationId: MemoService_DeleteMemoReaction
+            parameters:
+                - name: memo
+                  in: path
+                  description: The memo id.
+                  required: true
+                  schema:
+                    type: string
+                - name: reaction
+                  in: path
+                  description: The reaction id.
+                  required: true
+                  schema:
+                    type: string
+            responses:
+                "200":
+                    description: OK
+                    content: {}
+                default:
+                    description: Default error response
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/Status'
     /api/v1/memos/{memo}/relations:
         get:
             tags:
@@ -1025,29 +1054,6 @@ paths:
                         application/json:
                             schema:
                                 $ref: '#/components/schemas/Status'
-    /api/v1/reactions/{reaction}:
-        delete:
-            tags:
-                - MemoService
-            description: DeleteMemoReaction deletes a reaction for a memo.
-            operationId: MemoService_DeleteMemoReaction
-            parameters:
-                - name: reaction
-                  in: path
-                  description: The reaction id.
-                  required: true
-                  schema:
-                    type: string
-            responses:
-                "200":
-                    description: OK
-                    content: {}
-                default:
-                    description: Default error response
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/Status'
     /api/v1/users:
         get:
             tags:
@@ -2640,7 +2646,7 @@ components:
                     type: string
                     description: |-
                         The resource name of the reaction.
-                         Format: reactions/{reaction}
+                         Format: memos/{memo}/reactions/{reaction}
                 creator:
                     readOnly: true
                     type: string

proto/gen/api/v1/memo_service.pb.gw.go

@@ -63,7 +63,7 @@ func (s *APIV1Service) DeleteMemoReaction(ctx context.Context, request *v1pb.Del
 		return nil, status.Errorf(codes.Unauthenticated, "user not authenticated")
 	}
 
-	reactionID, err := ExtractReactionIDFromName(request.Name)
+	_, reactionID, err := ExtractMemoReactionIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid reaction name: %v", err)
 	}
@@ -95,8 +95,10 @@ func (s *APIV1Service) DeleteMemoReaction(ctx context.Context, request *v1pb.Del
 
 func convertReactionFromStore(reaction *store.Reaction) *v1pb.Reaction {
 	reactionUID := fmt.Sprintf("%d", reaction.ID)
+	// Generate nested resource name: memos/{memo}/reactions/{reaction}
+	// reaction.ContentID already contains "memos/{memo}"
 	return &v1pb.Reaction{
-		Name:         fmt.Sprintf("%s%s", ReactionNamePrefix, reactionUID),
+		Name:         fmt.Sprintf("%s/%s%s", reaction.ContentID, ReactionNamePrefix, reactionUID),
 		Creator:      fmt.Sprintf("%s%d", UserNamePrefix, reaction.CreatorID),
 		ContentId:    reaction.ContentID,
 		ReactionType: reaction.ReactionType,

proto/gen/openapi.yaml

@@ -105,18 +105,19 @@ func ExtractAttachmentUIDFromName(name string) (string, error) {
 	return id, nil
 }
 
-// ExtractReactionIDFromName returns the reaction ID from a resource name.
-// e.g., "reactions/123" -> 123.
-func ExtractReactionIDFromName(name string) (int32, error) {
-	tokens, err := GetNameParentTokens(name, ReactionNamePrefix)
+// ExtractMemoReactionIDFromName returns the memo UID and reaction ID from a resource name.
+// e.g., "memos/abc/reactions/123" -> ("abc", 123).
+func ExtractMemoReactionIDFromName(name string) (string, int32, error) {
+	tokens, err := GetNameParentTokens(name, MemoNamePrefix, ReactionNamePrefix)
 	if err != nil {
-		return 0, err
+		return "", 0, err
 	}
-	id, err := util.ConvertStringToInt32(tokens[0])
+	memoUID := tokens[0]
+	reactionID, err := util.ConvertStringToInt32(tokens[1])
 	if err != nil {
-		return 0, errors.Errorf("invalid reaction ID %q", tokens[0])
+		return "", 0, errors.Errorf("invalid reaction ID %q", tokens[1])
 	}
-	return id, nil
+	return memoUID, reactionID, nil
 }
 
 // ExtractInboxIDFromName returns the inbox ID from a resource name.

server/router/api/v1/reaction_service.go

@@ -183,8 +183,9 @@ func TestDeleteMemoReaction(t *testing.T) {
 
 		// Try to delete non-existent reaction - should fail with permission denied
 		// (not "not found" to avoid information disclosure)
+		// Use new nested resource format: memos/{memo}/reactions/{reaction}
 		_, err = ts.Service.DeleteMemoReaction(userCtx, &apiv1.DeleteMemoReactionRequest{
-			Name: "reactions/99999",
+			Name: "memos/nonexistent/reactions/99999",
 		})
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "permission denied")