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
e2e8130f
Unverified
Commit
e2e8130f
authored
Jan 07, 2023
by
boojack
Committed by
GitHub
Jan 07, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: sort version (#914)
parent
46c13a4b
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
38 additions
and
13 deletions
+38
-13
auth.go
server/auth.go
+6
-0
memo.go
server/memo.go
+3
-0
resource.go
server/resource.go
+3
-0
server.go
server/server.go
+3
-0
shortcut.go
server/shortcut.go
+4
-1
tag.go
server/tag.go
+4
-1
user.go
server/user.go
+3
-0
db.go
store/db/db.go
+10
-4
migration_history.go
store/db/migration_history.go
+2
-7
No files found.
server/auth.go
View file @
e2e8130f
...
...
@@ -157,6 +157,9 @@ func (s *Server) createUserAuthSignInActivity(c echo.Context, user *api.User) er
Level
:
api
.
ActivityInfo
,
Payload
:
string
(
payloadStr
),
})
if
err
!=
nil
||
activity
==
nil
{
return
errors
.
Wrap
(
err
,
"failed to create activity"
)
}
s
.
Collector
.
Collect
(
ctx
,
&
metric
.
Metric
{
Name
:
string
(
activity
.
Type
),
})
...
...
@@ -179,6 +182,9 @@ func (s *Server) createUserAuthSignUpActivity(c echo.Context, user *api.User) er
Level
:
api
.
ActivityInfo
,
Payload
:
string
(
payloadStr
),
})
if
err
!=
nil
||
activity
==
nil
{
return
errors
.
Wrap
(
err
,
"failed to create activity"
)
}
s
.
Collector
.
Collect
(
ctx
,
&
metric
.
Metric
{
Name
:
string
(
activity
.
Type
),
})
...
...
server/memo.go
View file @
e2e8130f
...
...
@@ -583,6 +583,9 @@ func (s *Server) createMemoCreateActivity(c echo.Context, memo *api.Memo) error
Level
:
api
.
ActivityInfo
,
Payload
:
string
(
payloadStr
),
})
if
err
!=
nil
||
activity
==
nil
{
return
errors
.
Wrap
(
err
,
"failed to create activity"
)
}
s
.
Collector
.
Collect
(
ctx
,
&
metric
.
Metric
{
Name
:
string
(
activity
.
Type
),
})
...
...
server/resource.go
View file @
e2e8130f
...
...
@@ -299,6 +299,9 @@ func (s *Server) createResourceCreateActivity(c echo.Context, resource *api.Reso
Level
:
api
.
ActivityInfo
,
Payload
:
string
(
payloadStr
),
})
if
err
!=
nil
||
activity
==
nil
{
return
errors
.
Wrap
(
err
,
"failed to create activity"
)
}
s
.
Collector
.
Collect
(
ctx
,
&
metric
.
Metric
{
Name
:
string
(
activity
.
Type
),
})
...
...
server/server.go
View file @
e2e8130f
...
...
@@ -146,6 +146,9 @@ func (s *Server) createServerStartActivity(ctx context.Context) error {
Level
:
api
.
ActivityInfo
,
Payload
:
string
(
payloadStr
),
})
if
err
!=
nil
||
activity
==
nil
{
return
errors
.
Wrap
(
err
,
"failed to create activity"
)
}
s
.
Collector
.
Collect
(
ctx
,
&
metric
.
Metric
{
Name
:
string
(
activity
.
Type
),
})
...
...
server/shortcut.go
View file @
e2e8130f
...
...
@@ -175,11 +175,14 @@ func (s *Server) createShortcutCreateActivity(c echo.Context, shortcut *api.Shor
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"failed to marshal activity payload"
)
}
_
,
err
=
s
.
Store
.
CreateActivity
(
ctx
,
&
api
.
ActivityCreate
{
activity
,
err
:
=
s
.
Store
.
CreateActivity
(
ctx
,
&
api
.
ActivityCreate
{
CreatorID
:
shortcut
.
CreatorID
,
Type
:
api
.
ActivityShortcutCreate
,
Level
:
api
.
ActivityInfo
,
Payload
:
string
(
payloadStr
),
})
if
err
!=
nil
||
activity
==
nil
{
return
errors
.
Wrap
(
err
,
"failed to create activity"
)
}
return
err
}
server/tag.go
View file @
e2e8130f
...
...
@@ -165,11 +165,14 @@ func (s *Server) createTagCreateActivity(c echo.Context, tag *api.Tag) error {
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"failed to marshal activity payload"
)
}
_
,
err
=
s
.
Store
.
CreateActivity
(
ctx
,
&
api
.
ActivityCreate
{
activity
,
err
:
=
s
.
Store
.
CreateActivity
(
ctx
,
&
api
.
ActivityCreate
{
CreatorID
:
tag
.
CreatorID
,
Type
:
api
.
ActivityTagCreate
,
Level
:
api
.
ActivityInfo
,
Payload
:
string
(
payloadStr
),
})
if
err
!=
nil
||
activity
==
nil
{
return
errors
.
Wrap
(
err
,
"failed to create activity"
)
}
return
err
}
server/user.go
View file @
e2e8130f
...
...
@@ -296,6 +296,9 @@ func (s *Server) createUserCreateActivity(c echo.Context, user *api.User) error
Level
:
api
.
ActivityInfo
,
Payload
:
string
(
payloadStr
),
})
if
err
!=
nil
||
activity
==
nil
{
return
errors
.
Wrap
(
err
,
"failed to create activity"
)
}
s
.
Collector
.
Collect
(
ctx
,
&
metric
.
Metric
{
Name
:
string
(
activity
.
Type
),
})
...
...
store/db/db.go
View file @
e2e8130f
...
...
@@ -68,11 +68,11 @@ func (db *DB) Open(ctx context.Context) (err error) {
}
currentVersion
:=
version
.
GetCurrentVersion
(
db
.
profile
.
Mode
)
migrationHistory
,
err
:=
db
.
FindMigrationHistory
(
ctx
,
&
MigrationHistoryFind
{})
migrationHistory
List
,
err
:=
db
.
FindMigrationHistoryList
(
ctx
,
&
MigrationHistoryFind
{})
if
err
!=
nil
{
return
fmt
.
Errorf
(
"failed to find migration history, err: %w"
,
err
)
}
if
migrationHistory
==
nil
{
if
len
(
migrationHistoryList
)
==
0
{
if
_
,
err
=
db
.
UpsertMigrationHistory
(
ctx
,
&
MigrationHistoryUpsert
{
Version
:
currentVersion
,
});
err
!=
nil
{
...
...
@@ -80,8 +80,14 @@ func (db *DB) Open(ctx context.Context) (err error) {
}
return
nil
}
migrationHistoryVersionList
:=
[]
string
{}
for
_
,
migrationHistory
:=
range
migrationHistoryList
{
migrationHistoryVersionList
=
append
(
migrationHistoryVersionList
,
migrationHistory
.
Version
)
}
sort
.
Strings
(
migrationHistoryVersionList
)
latestMigrationHistoryVersion
:=
migrationHistoryVersionList
[
0
]
if
version
.
IsVersionGreaterThan
(
version
.
GetSchemaVersion
(
currentVersion
),
migrationHistory
.
Version
)
{
if
version
.
IsVersionGreaterThan
(
version
.
GetSchemaVersion
(
currentVersion
),
latestMigrationHistory
Version
)
{
minorVersionList
:=
getMinorVersionList
()
// backup the raw database file before migration
...
...
@@ -98,7 +104,7 @@ func (db *DB) Open(ctx context.Context) (err error) {
println
(
"start migrate"
)
for
_
,
minorVersion
:=
range
minorVersionList
{
normalizedVersion
:=
minorVersion
+
".0"
if
version
.
IsVersionGreaterThan
(
normalizedVersion
,
migrationHistory
.
Version
)
&&
version
.
IsVersionGreaterOrEqualThan
(
currentVersion
,
normalizedVersion
)
{
if
version
.
IsVersionGreaterThan
(
normalizedVersion
,
latestMigrationHistory
Version
)
&&
version
.
IsVersionGreaterOrEqualThan
(
currentVersion
,
normalizedVersion
)
{
println
(
"applying migration for"
,
normalizedVersion
)
if
err
:=
db
.
applyMigrationForMinorVersion
(
ctx
,
minorVersion
);
err
!=
nil
{
return
fmt
.
Errorf
(
"failed to apply minor version migration: %w"
,
err
)
...
...
store/db/migration_history.go
View file @
e2e8130f
...
...
@@ -19,7 +19,7 @@ type MigrationHistoryFind struct {
Version
*
string
}
func
(
db
*
DB
)
FindMigrationHistory
(
ctx
context
.
Context
,
find
*
MigrationHistoryFind
)
(
*
MigrationHistory
,
error
)
{
func
(
db
*
DB
)
FindMigrationHistory
List
(
ctx
context
.
Context
,
find
*
MigrationHistoryFind
)
([]
*
MigrationHistory
,
error
)
{
tx
,
err
:=
db
.
DBInstance
.
BeginTx
(
ctx
,
nil
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -31,12 +31,7 @@ func (db *DB) FindMigrationHistory(ctx context.Context, find *MigrationHistoryFi
return
nil
,
err
}
if
len
(
list
)
==
0
{
return
nil
,
nil
}
migrationHistory
:=
list
[
0
]
return
migrationHistory
,
nil
return
list
,
nil
}
func
(
db
*
DB
)
UpsertMigrationHistory
(
ctx
context
.
Context
,
upsert
*
MigrationHistoryUpsert
)
(
*
MigrationHistory
,
error
)
{
...
...
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