Commit 97d12db3 authored by johnnyjoy's avatar johnnyjoy

refactor: renovate create memo

parent 98aa0b73
......@@ -21,7 +21,7 @@ service MemoService {
rpc CreateMemo(CreateMemoRequest) returns (Memo) {
option (google.api.http) = {
post: "/api/v1/memos"
body: "*"
body: "memo"
};
}
// ListMemos lists memos with pagination and filter.
......@@ -185,15 +185,8 @@ message Location {
}
message CreateMemoRequest {
string content = 1;
Visibility visibility = 2;
repeated Resource resources = 3;
repeated MemoRelation relations = 4;
optional Location location = 5;
// The memo to create.
Memo memo = 1 [(google.api.field_behavior) = REQUIRED];
}
message ListMemosRequest {
......@@ -223,7 +216,9 @@ message GetMemoRequest {
}
message UpdateMemoRequest {
Memo memo = 1;
// The memo to update.
// The `name` field is required.
Memo memo = 1 [(google.api.field_behavior) = REQUIRED];
google.protobuf.FieldMask update_mask = 2;
}
......@@ -285,7 +280,8 @@ message CreateMemoCommentRequest {
// The name of the memo.
string name = 1;
CreateMemoRequest comment = 2;
// The comment to create.
Memo comment = 2;
}
message ListMemoCommentsRequest {
......
This diff is collapsed.
......@@ -40,7 +40,7 @@ func request_MemoService_CreateMemo_0(ctx context.Context, marshaler runtime.Mar
protoReq CreateMemoRequest
metadata runtime.ServerMetadata
)
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Memo); err != nil && !errors.Is(err, io.EOF) {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
}
msg, err := client.CreateMemo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
......@@ -52,7 +52,7 @@ func local_request_MemoService_CreateMemo_0(ctx context.Context, marshaler runti
protoReq CreateMemoRequest
metadata runtime.ServerMetadata
)
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Memo); err != nil && !errors.Is(err, io.EOF) {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
}
msg, err := server.CreateMemo(ctx, &protoReq)
......
This diff is collapsed.
......@@ -35,8 +35,8 @@ func (s *APIV1Service) CreateMemo(ctx context.Context, request *v1pb.CreateMemoR
create := &store.Memo{
UID: shortuuid.New(),
CreatorID: user.ID,
Content: request.Content,
Visibility: convertVisibilityToStore(request.Visibility),
Content: request.Memo.Content,
Visibility: convertVisibilityToStore(request.Memo.Visibility),
}
workspaceMemoRelatedSetting, err := s.Store.GetWorkspaceMemoRelatedSetting(ctx)
if err != nil {
......@@ -55,27 +55,27 @@ func (s *APIV1Service) CreateMemo(ctx context.Context, request *v1pb.CreateMemoR
if err := memopayload.RebuildMemoPayload(create); err != nil {
return nil, status.Errorf(codes.Internal, "failed to rebuild memo payload: %v", err)
}
if request.Location != nil {
create.Payload.Location = convertLocationToStore(request.Location)
if request.Memo.Location != nil {
create.Payload.Location = convertLocationToStore(request.Memo.Location)
}
memo, err := s.Store.CreateMemo(ctx, create)
if err != nil {
return nil, err
}
if len(request.Resources) > 0 {
if len(request.Memo.Resources) > 0 {
_, err := s.SetMemoResources(ctx, &v1pb.SetMemoResourcesRequest{
Name: fmt.Sprintf("%s%s", MemoNamePrefix, memo.UID),
Resources: request.Resources,
Resources: request.Memo.Resources,
})
if err != nil {
return nil, errors.Wrap(err, "failed to set memo resources")
}
}
if len(request.Relations) > 0 {
if len(request.Memo.Relations) > 0 {
_, err := s.SetMemoRelations(ctx, &v1pb.SetMemoRelationsRequest{
Name: fmt.Sprintf("%s%s", MemoNamePrefix, memo.UID),
Relations: request.Relations,
Relations: request.Memo.Relations,
})
if err != nil {
return nil, errors.Wrap(err, "failed to set memo relations")
......@@ -390,7 +390,7 @@ func (s *APIV1Service) CreateMemoComment(ctx context.Context, request *v1pb.Crea
}
// Create the memo comment first.
memoComment, err := s.CreateMemo(ctx, request.Comment)
memoComment, err := s.CreateMemo(ctx, &v1pb.CreateMemoRequest{Memo: request.Comment})
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to create memo")
}
......
......@@ -350,11 +350,13 @@ const MemoEditor = (props: Props) => {
// Create memo or memo comment.
const request = !parentMemoName
? memoStore.createMemo({
content,
visibility: state.memoVisibility,
resources: state.resourceList,
relations: state.relationList,
location: state.location,
memo: Memo.fromPartial({
content,
visibility: state.memoVisibility,
resources: state.resourceList,
relations: state.relationList,
location: state.location,
}),
})
: memoServiceClient
.createMemoComment({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment