From 36337ad64bec3295328c1936e0a7df236e3d923f Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Sun, 13 Jul 2025 15:33:51 +0900 Subject: [PATCH] appview: {db,issues}: remove unnecessary `GetIssueId` method Change-Id: ppqppuxrnlkqqkksyqylnmmxwnyptsqn As `issue.IssueId` is already retrieved from `NewIssue`, We don't need `GetIssueId` to get last issue-id. Using same, last inserted issue-id would be better. Signed-off-by: Seongmin Lee --- appview/db/issues.go | 6 ------ appview/issues/issues.go | 20 +++++++------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/appview/db/issues.go b/appview/db/issues.go index dd5121e..5d28656 100644 --- a/appview/db/issues.go +++ b/appview/db/issues.go @@ -98,12 +98,6 @@ func GetIssueAt(e Execer, repoAt syntax.ATURI, issueId int) (string, error) { return issueAt, err } -func GetIssueId(e Execer, repoAt syntax.ATURI) (int, error) { - var issueId int - err := e.QueryRow(`select next_issue_id from repo_issue_seqs where repo_at = ?`, repoAt).Scan(&issueId) - return issueId - 1, err -} - func GetIssueOwnerDid(e Execer, repoAt syntax.ATURI, issueId int) (string, error) { var ownerDid string err := e.QueryRow(`select owner_did from issues where repo_at = ? and issue_id = ?`, repoAt, issueId).Scan(&ownerDid) diff --git a/appview/issues/issues.go b/appview/issues/issues.go index 4ecbd10..cc1b816 100644 --- a/appview/issues/issues.go +++ b/appview/issues/issues.go @@ -703,21 +703,15 @@ func (rp *Issues) NewIssue(w http.ResponseWriter, r *http.Request) { return } - err = db.NewIssue(tx, &db.Issue{ + issue := &db.Issue{ RepoAt: f.RepoAt, Title: title, Body: body, OwnerDid: user.Did, - }) - if err != nil { - log.Println("failed to create issue", err) - rp.pages.Notice(w, "issues", "Failed to create issue.") - return } - - issueId, err := db.GetIssueId(rp.db, f.RepoAt) + err = db.NewIssue(tx, issue) if err != nil { - log.Println("failed to get issue id", err) + log.Println("failed to create issue", err) rp.pages.Notice(w, "issues", "Failed to create issue.") return } @@ -739,7 +733,7 @@ func (rp *Issues) NewIssue(w http.ResponseWriter, r *http.Request) { Title: title, Body: &body, Owner: user.Did, - IssueId: int64(issueId), + IssueId: int64(issue.IssueId), }, }, }) @@ -749,7 +743,7 @@ func (rp *Issues) NewIssue(w http.ResponseWriter, r *http.Request) { return } - err = db.SetIssueAt(rp.db, f.RepoAt, issueId, resp.Uri) + err = db.SetIssueAt(rp.db, f.RepoAt, issue.IssueId, resp.Uri) if err != nil { log.Println("failed to set issue at", err) rp.pages.Notice(w, "issues", "Failed to create issue.") @@ -760,14 +754,14 @@ func (rp *Issues) NewIssue(w http.ResponseWriter, r *http.Request) { err = rp.posthog.Enqueue(posthog.Capture{ DistinctId: user.Did, Event: "new_issue", - Properties: posthog.Properties{"repo_at": f.RepoAt.String(), "issue_id": issueId}, + Properties: posthog.Properties{"repo_at": f.RepoAt.String(), "issue_id": issue.IssueId}, }) if err != nil { log.Println("failed to enqueue posthog event:", err) } } - rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", f.OwnerSlashRepo(), issueId)) + rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", f.OwnerSlashRepo(), issue.IssueId)) return } } -- 2.43.0