fix: delete memo reaction

proto/api/v2/memo_service.proto

@@ -105,8 +105,8 @@ service MemoService {
   }
   // DeleteMemoReaction deletes a reaction for a memo.
   rpc DeleteMemoReaction(DeleteMemoReactionRequest) returns (DeleteMemoReactionResponse) {
-    option (google.api.http) = {delete: "/api/v2/{name=memos/*}/reactions/{reaction_id}"};
-    option (google.api.method_signature) = "name,reaction_id";
+    option (google.api.http) = {delete: "/api/v2/reactions/{reaction_id}"};
+    option (google.api.method_signature) = "reaction_id";
   }
 }
 
@@ -339,11 +339,7 @@ message UpsertMemoReactionResponse {
 }
 
 message DeleteMemoReactionRequest {
-  // The name of the memo.
-  // Format: memos/{id}
-  string name = 1;
-
-  int32 reaction_id = 2;
+  int32 reaction_id = 1;
 }
 
 message DeleteMemoReactionResponse {}

proto/gen/api/v2/README.md

@@ -1893,7 +1893,6 @@ Used internally for obfuscating the page token.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| name | [string](#string) |  | The name of the memo. Format: memos/{id} |
 | reaction_id | [int32](#int32) |  |  |
 
 

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

@@ -908,16 +908,6 @@ func request_MemoService_DeleteMemoReaction_0(ctx context.Context, marshaler run
 		_   = err
 	)
 
-	val, ok = pathParams["name"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
-	}
-
-	protoReq.Name, err = runtime.String(val)
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
-	}
-
 	val, ok = pathParams["reaction_id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "reaction_id")
@@ -944,16 +934,6 @@ func local_request_MemoService_DeleteMemoReaction_0(ctx context.Context, marshal
 		_   = err
 	)
 
-	val, ok = pathParams["name"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
-	}
-
-	protoReq.Name, err = runtime.String(val)
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
-	}
-
 	val, ok = pathParams["reaction_id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "reaction_id")
@@ -1383,7 +1363,7 @@ func RegisterMemoServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v2.MemoService/DeleteMemoReaction", runtime.WithHTTPPathPattern("/api/v2/{name=memos/*}/reactions/{reaction_id}"))
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v2.MemoService/DeleteMemoReaction", runtime.WithHTTPPathPattern("/api/v2/reactions/{reaction_id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1799,7 +1779,7 @@ func RegisterMemoServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/memos.api.v2.MemoService/DeleteMemoReaction", runtime.WithHTTPPathPattern("/api/v2/{name=memos/*}/reactions/{reaction_id}"))
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/memos.api.v2.MemoService/DeleteMemoReaction", runtime.WithHTTPPathPattern("/api/v2/reactions/{reaction_id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1851,7 +1831,7 @@ var (
 
 	pattern_MemoService_UpsertMemoReaction_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4}, []string{"api", "v2", "memos", "name", "reactions"}, ""))
 
-	pattern_MemoService_DeleteMemoReaction_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 2, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"api", "v2", "memos", "name", "reactions", "reaction_id"}, ""))
+	pattern_MemoService_DeleteMemoReaction_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v2", "reactions", "reaction_id"}, ""))
 )
 
 var (

server/route/api/v2/apidocs.swagger.yaml

@@ -397,6 +397,27 @@ paths:
           type: string
       tags:
         - MemoService
+  /api/v2/reactions/{reactionId}:
+    delete:
+      summary: DeleteMemoReaction deletes a reaction for a memo.
+      operationId: MemoService_DeleteMemoReaction
+      responses:
+        "200":
+          description: A successful response.
+          schema:
+            $ref: '#/definitions/v2DeleteMemoReactionResponse'
+        default:
+          description: An unexpected error response.
+          schema:
+            $ref: '#/definitions/googlerpcStatus'
+      parameters:
+        - name: reactionId
+          in: path
+          required: true
+          type: integer
+          format: int32
+      tags:
+        - MemoService
   /api/v2/resources:
     get:
       summary: ListResources lists all resources.
@@ -1452,35 +1473,6 @@ paths:
           default: TYPE_UNSPECIFIED
       tags:
         - MemoService
-  /api/v2/{name}/reactions/{reactionId}:
-    delete:
-      summary: DeleteMemoReaction deletes a reaction for a memo.
-      operationId: MemoService_DeleteMemoReaction
-      responses:
-        "200":
-          description: A successful response.
-          schema:
-            $ref: '#/definitions/v2DeleteMemoReactionResponse'
-        default:
-          description: An unexpected error response.
-          schema:
-            $ref: '#/definitions/googlerpcStatus'
-      parameters:
-        - name: name
-          description: |-
-            The name of the memo.
-            Format: memos/{id}
-          in: path
-          required: true
-          type: string
-          pattern: memos/[^/]+
-        - name: reactionId
-          in: path
-          required: true
-          type: integer
-          format: int32
-      tags:
-        - MemoService
   /api/v2/{name}/relations:
     get:
       summary: ListMemoRelations lists relations for a memo.

server/route/api/v2/reaction_service.go

@@ -57,12 +57,8 @@ func (s *APIV2Service) UpsertMemoReaction(ctx context.Context, request *apiv2pb.
 }
 
 func (s *APIV2Service) DeleteMemoReaction(ctx context.Context, request *apiv2pb.DeleteMemoReactionRequest) (*apiv2pb.DeleteMemoReactionResponse, error) {
-	id, err := ExtractMemoIDFromName(request.Name)
-	if err != nil {
-		return nil, status.Errorf(codes.InvalidArgument, "invalid memo name: %v", err)
-	}
 	if err := s.Store.DeleteReaction(ctx, &store.DeleteReaction{
-		ID: id,
+		ID: request.ReactionId,
 	}); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to delete reaction")
 	}