YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-02-19 12:50:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix memo resources position

Browse Source
This commit is contained in:
Steven 2024-01-06 09:23:20 +08:00
parent 501f8898f6
commit 8b9455d784
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/v2/memo_resource_service.go
View File

@ -2,6 +2,8 @@ package v2
import ( import (
"context" "context"
"slices"
"time"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
@ -11,7 +13,9 @@ import (
) )
func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.SetMemoResourcesRequest) (*apiv2pb.SetMemoResourcesResponse, error) { func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.SetMemoResourcesRequest) (*apiv2pb.SetMemoResourcesResponse, error) {
resources, err := s.Store.ListResources(ctx, &store.FindResource{MemoID: &request.Id}) resources, err := s.Store.ListResources(ctx, &store.FindResource{
MemoID: &request.Id,
})
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to list resources") return nil, status.Errorf(codes.Internal, "failed to list resources")
} }
@ -35,11 +39,14 @@ func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.Se
} }
} }
slices.Reverse(request.Resources)
// Update resources' memo_id in the request. // Update resources' memo_id in the request.
for _, resource := range request.Resources { for index, resource := range request.Resources {
updatedTs := time.Now().Unix() + int64(index)
if _, err := s.Store.UpdateResource(ctx, &store.UpdateResource{ if _, err := s.Store.UpdateResource(ctx, &store.UpdateResource{
ID: resource.Id, ID: resource.Id,
MemoID: &request.Id, MemoID: &request.Id,
UpdatedTs: &updatedTs,
}); err != nil { }); err != nil {
return nil, status.Errorf(codes.Internal, "failed to update resource") return nil, status.Errorf(codes.Internal, "failed to update resource")
} }

2
store/db/mysql/resource.go
View File

@ -63,7 +63,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*st
fields = append(fields, "`blob`") fields = append(fields, "`blob`")
} }
query := fmt.Sprintf("SELECT %s FROM `resource` WHERE %s GROUP BY `id` ORDER BY `created_ts` DESC", strings.Join(fields, ", "), strings.Join(where, " AND ")) query := fmt.Sprintf("SELECT %s FROM `resource` WHERE %s ORDER BY `updated_ts` DESC, `created_ts` DESC", strings.Join(fields, ", "), strings.Join(where, " AND "))
if find.Limit != nil { if find.Limit != nil {
query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit) query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)
if find.Offset != nil { if find.Offset != nil {

3
store/db/postgres/resource.go
View File

@ -49,8 +49,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*st
%s %s
FROM resource FROM resource
WHERE %s WHERE %s
GROUP BY id ORDER BY updated_ts DESC, created_ts DESC
ORDER BY created_ts DESC
`, strings.Join(fields, ", "), strings.Join(where, " AND ")) `, strings.Join(fields, ", "), strings.Join(where, " AND "))
if find.Limit != nil { if find.Limit != nil {
query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit) query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)

3
store/db/sqlite/resource.go
View File

@ -51,8 +51,7 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*st
%s %s
FROM resource FROM resource
WHERE %s WHERE %s
GROUP BY id ORDER BY updated_ts DESC, created_ts DESC
ORDER BY created_ts DESC
`, strings.Join(fields, ", "), strings.Join(where, " AND ")) `, strings.Join(fields, ", "), strings.Join(where, " AND "))
if find.Limit != nil { if find.Limit != nil {
query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit) query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)