YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: resource v1 definition

Browse Source
This commit is contained in:
Steven
2024-03-24 22:35:10 +08:00
parent be525fa3df
commit e703b4f70d
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/route/api/v1/resource.go
View File

@ -26,6 +26,7 @@ import (
type Resource struct { type Resource struct {
ID int32 `json:"id"` ID int32 `json:"id"`
Name string `json:"name"` Name string `json:"name"`
UID string `json:"uid"`
// Standard fields // Standard fields
CreatorID int32 `json:"creatorId"` CreatorID int32 `json:"creatorId"`
@ -371,7 +372,8 @@ func replacePathTemplate(path, filename string) string {
func convertResourceFromStore(resource *store.Resource) *Resource { func convertResourceFromStore(resource *store.Resource) *Resource {
return &Resource{ return &Resource{
ID: resource.ID, ID: resource.ID,
Name: resource.UID, Name: fmt.Sprintf("resources/%d", resource.ID),
UID: resource.UID,
CreatorID: resource.CreatorID, CreatorID: resource.CreatorID,
CreatedTs: resource.CreatedTs, CreatedTs: resource.CreatedTs,
UpdatedTs: resource.UpdatedTs, UpdatedTs: resource.UpdatedTs,

2
server/route/api/v2/memo_resource_service.go
View File

@ -46,7 +46,7 @@ func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.Se
slices.Reverse(request.Resources) slices.Reverse(request.Resources)
// Update resources' memo_id in the request. // Update resources' memo_id in the request.
for index, resource := range request.Resources { for index, resource := range request.Resources {
id, err := ExtractMemoIDFromName(resource.Name) id, err := ExtractResourceIDFromName(resource.Name)
if err != nil { if err != nil {
return nil, status.Errorf(codes.InvalidArgument, "invalid resource name: %v", err) return nil, status.Errorf(codes.InvalidArgument, "invalid resource name: %v", err)
} }

6
server/route/api/v2/resource_service.go
View File

@ -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) { func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetResourceRequest) (*apiv2pb.GetResourceResponse, error) {
id, err := ExtractResourceIDFromName(request.Name) id, err := ExtractResourceIDFromName(request.Name)
if err != nil { 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{ resource, err := s.Store.GetResource(ctx, &store.FindResource{
ID: &id, 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) { func (s *APIV2Service) UpdateResource(ctx context.Context, request *apiv2pb.UpdateResourceRequest) (*apiv2pb.UpdateResourceResponse, error) {
id, err := ExtractResourceIDFromName(request.Resource.Name) id, err := ExtractResourceIDFromName(request.Resource.Name)
if err != nil { 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 { if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "update mask is required") 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) { func (s *APIV2Service) DeleteResource(ctx context.Context, request *apiv2pb.DeleteResourceRequest) (*apiv2pb.DeleteResourceResponse, error) {
id, err := ExtractResourceIDFromName(request.Name) id, err := ExtractResourceIDFromName(request.Name)
if err != nil { 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) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {