Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/en #31

Merged
merged 3 commits into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions zbook_backend/db/migration/000005_add_repos.up.sql
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ CREATE TABLE "repos" (
"visibility_level" varchar(255) NOT NULL,
"commit_id" varchar(255) NOT NULL,
"config" text NOT NULL DEFAULT '',
"home" text NOT NULL DEFAULT '',
"theme_sidebar" text NOT NULL CHECK (length(trim(theme_sidebar)) > 0),
"theme_color" text NOT NULL CHECK (length(trim(theme_color)) > 0),
"created_at" timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
Expand Down
15 changes: 15 additions & 0 deletions zbook_backend/db/mock/store.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions zbook_backend/db/query/repo.sql
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RETURNING *;

-- name: UpdateRepoConfig :exec
UPDATE repos
SET config=$2,commit_id=$3,updated_at=now()
SET config=$2,commit_id=$3,home=$4,updated_at=now()
WHERE repo_id = $1;

-- name: UpdateRepoInfo :one
Expand Down Expand Up @@ -54,7 +54,12 @@ JOIN users on users.user_id= repos.user_id
WHERE users.username=$1 AND repos.repo_name=$2;

-- name: GetRepoConfig :one
SELECT repos.repo_id,config,repos.user_id,visibility_level,repos.theme_sidebar,repos.theme_color FROM repos
SELECT repos.repo_id,config,repos.user_id,visibility_level,repos.theme_sidebar,repos.theme_color,repos.home FROM repos
JOIN users on users.user_id = repos.user_id
WHERE users.username=$1 AND repos.repo_name=$2;

-- name: GetRepoHome :one
SELECT repos.home FROM repos
JOIN users on users.user_id = repos.user_id
WHERE users.username=$1 AND repos.repo_name=$2;

Expand Down
3 changes: 2 additions & 1 deletion zbook_backend/db/sqlc/comment.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions zbook_backend/db/sqlc/convert_db.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,20 @@ func ConvertFile2DB(ctx context.Context, q *Queries, cloneDir string, repoID int
if err != nil {
return fmt.Errorf("generate repo config failed: %v", err)
}
home, err := config.GetFirstDocumentMap()
if err != nil {
return fmt.Errorf("generate repo home failed: %v", err)
}
// 将 docs 转换为 JSON 字符串
homeJSON, err := json.Marshal(home)
if err != nil {
return fmt.Errorf("marshal home docs to JSON failed: %v", err)
}
arg_update_repo_config := UpdateRepoConfigParams{
RepoID: repoID,
Config: string(configJSON),
CommitID: lastCommit,
Home: string(homeJSON),
}
if err := q.UpdateRepoConfig(ctx, arg_update_repo_config); err != nil {
return fmt.Errorf("update repo config failed: %v", err)
Expand All @@ -117,10 +127,20 @@ func ConvertFile2DB(ctx context.Context, q *Queries, cloneDir string, repoID int
if err != nil {
return fmt.Errorf("generate repo config failed: %v", err)
}
home, err := configFromFile.GetFirstDocumentMap()
if err != nil {
return fmt.Errorf("generate repo home failed: %v", err)
}
// 将 docs 转换为 JSON 字符串
homeJSON, err := json.Marshal(home)
if err != nil {
return fmt.Errorf("marshal home docs to JSON failed: %v", err)
}
arg_update_repo_config := UpdateRepoConfigParams{
RepoID: repoID,
Config: string(configJSON),
CommitID: lastCommit,
Home: string(homeJSON),
}
if err := q.UpdateRepoConfig(ctx, arg_update_repo_config); err != nil {
return fmt.Errorf("update repo config failed: %v", err)
Expand Down
1 change: 1 addition & 0 deletions zbook_backend/db/sqlc/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions zbook_backend/db/sqlc/querier.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading