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
be046cae
Commit
be046cae
authored
Oct 01, 2023
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: add parent field to memo
parent
922de077
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
18 deletions
+48
-18
memo.go
api/v1/memo.go
+17
-0
memo.go
store/memo.go
+3
-0
memo.go
store/mysql/memo.go
+14
-9
memo.go
store/sqlite/memo.go
+14
-9
No files found.
api/v1/memo.go
View file @
be046cae
...
@@ -57,6 +57,7 @@ type Memo struct {
...
@@ -57,6 +57,7 @@ type Memo struct {
Pinned
bool
`json:"pinned"`
Pinned
bool
`json:"pinned"`
// Related fields
// Related fields
Parent
*
Memo
`json:"parent"`
CreatorName
string
`json:"creatorName"`
CreatorName
string
`json:"creatorName"`
CreatorUsername
string
`json:"creatorUsername"`
CreatorUsername
string
`json:"creatorUsername"`
ResourceList
[]
*
Resource
`json:"resourceList"`
ResourceList
[]
*
Resource
`json:"resourceList"`
...
@@ -849,6 +850,22 @@ func (s *APIV1Service) convertMemoFromStore(ctx context.Context, memo *store.Mem
...
@@ -849,6 +850,22 @@ func (s *APIV1Service) convertMemoFromStore(ctx context.Context, memo *store.Mem
}
}
memoResponse
.
ResourceList
=
resourceList
memoResponse
.
ResourceList
=
resourceList
if
memo
.
ParentID
!=
nil
{
parentMemo
,
err
:=
s
.
Store
.
GetMemo
(
ctx
,
&
store
.
FindMemo
{
ID
:
memo
.
ParentID
,
})
if
err
!=
nil
{
return
nil
,
err
}
if
parentMemo
!=
nil
{
parent
,
err
:=
s
.
convertMemoFromStore
(
ctx
,
parentMemo
)
if
err
!=
nil
{
return
nil
,
err
}
memoResponse
.
Parent
=
parent
}
}
return
memoResponse
,
nil
return
memoResponse
,
nil
}
}
...
...
store/memo.go
View file @
be046cae
...
@@ -42,6 +42,9 @@ type Memo struct {
...
@@ -42,6 +42,9 @@ type Memo struct {
Visibility
Visibility
Visibility
Visibility
// Composed fields
// Composed fields
// For those comment memos, the parent ID is the memo ID of the memo being commented.
// If the parent ID is nil, then this memo is not a comment.
ParentID
*
int32
Pinned
bool
Pinned
bool
ResourceIDList
[]
int32
ResourceIDList
[]
int32
RelationList
[]
*
MemoRelation
RelationList
[]
*
MemoRelation
...
...
store/mysql/memo.go
View file @
be046cae
...
@@ -176,11 +176,16 @@ func (d *Driver) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.
...
@@ -176,11 +176,16 @@ func (d *Driver) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
relationType
:=
store
.
MemoRelationType
(
relatedMemoTypeList
[
1
])
memo
.
RelationList
=
append
(
memo
.
RelationList
,
&
store
.
MemoRelation
{
memo
.
RelationList
=
append
(
memo
.
RelationList
,
&
store
.
MemoRelation
{
MemoID
:
memo
.
ID
,
MemoID
:
memo
.
ID
,
RelatedMemoID
:
relatedMemoID
,
RelatedMemoID
:
relatedMemoID
,
Type
:
store
.
MemoRelationType
(
relatedMemoTypeList
[
1
])
,
Type
:
relationType
,
})
})
// Set the first parent ID if relation type is comment.
if
memo
.
ParentID
==
nil
&&
relationType
==
store
.
MemoRelationComment
{
memo
.
ParentID
=
&
relatedMemoID
}
}
}
}
}
list
=
append
(
list
,
&
memo
)
list
=
append
(
list
,
&
memo
)
...
...
store/sqlite/memo.go
View file @
be046cae
...
@@ -176,11 +176,16 @@ func (d *Driver) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.
...
@@ -176,11 +176,16 @@ func (d *Driver) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
relationType
:=
store
.
MemoRelationType
(
relatedMemoTypeList
[
1
])
memo
.
RelationList
=
append
(
memo
.
RelationList
,
&
store
.
MemoRelation
{
memo
.
RelationList
=
append
(
memo
.
RelationList
,
&
store
.
MemoRelation
{
MemoID
:
memo
.
ID
,
MemoID
:
memo
.
ID
,
RelatedMemoID
:
relatedMemoID
,
RelatedMemoID
:
relatedMemoID
,
Type
:
store
.
MemoRelationType
(
relatedMemoTypeList
[
1
])
,
Type
:
relationType
,
})
})
// Set the first parent ID if relation type is comment.
if
memo
.
ParentID
==
nil
&&
relationType
==
store
.
MemoRelationComment
{
memo
.
ParentID
=
&
relatedMemoID
}
}
}
}
}
list
=
append
(
list
,
&
memo
)
list
=
append
(
list
,
&
memo
)
...
...
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