Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
e703b4f7
Commit
e703b4f7
authored
Mar 24, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: resource v1 definition
parent
be525fa3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
resource.go
server/route/api/v1/resource.go
+3
-1
memo_resource_service.go
server/route/api/v2/memo_resource_service.go
+1
-1
resource_service.go
server/route/api/v2/resource_service.go
+3
-3
No files found.
server/route/api/v1/resource.go
View file @
e703b4f7
...
@@ -26,6 +26,7 @@ import (
...
@@ -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 {
...
@@ -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
,
...
...
server/route/api/v2/memo_resource_service.go
View file @
e703b4f7
...
@@ -46,7 +46,7 @@ func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.Se
...
@@ -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
:=
Extract
Memo
IDFromName
(
resource
.
Name
)
id
,
err
:=
Extract
Resource
IDFromName
(
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
)
}
}
...
...
server/route/api/v2/resource_service.go
View file @
e703b4f7
...
@@ -105,7 +105,7 @@ func (s *APIV2Service) SearchResources(ctx context.Context, request *apiv2pb.Sea
...
@@ -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
...
@@ -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
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment