appview: {db,issues}: remove unnecessary `GetIssueId` method #2

closed

opened by

boltless.me 5 months ago targeting master from feat/search

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 boltlessengineer@proton.me

options

unified split

Changed files

+7 -19

appview

issues.go

issues

issues.go

-6

appview/db/issues.go

···

       98
        
       	return issueAt, err

     

       99
        
       }

     

       100
        
       

     

       101
       -
       func GetIssueId(e Execer, repoAt syntax.ATURI) (int, error) {

     

       102
       -
       	var issueId int

     

       103
       -
       	err := e.QueryRow(`select next_issue_id from repo_issue_seqs where repo_at = ?`, repoAt).Scan(&issueId)

     

       104
       -
       	return issueId - 1, err

     

       105
       -
       }

     

       106
       -
       

     

       107
        
       func GetIssueOwnerDid(e Execer, repoAt syntax.ATURI, issueId int) (string, error) {

     

       108
        
       	var ownerDid string

     

       109
        
       	err := e.QueryRow(`select owner_did from issues where repo_at = ? and issue_id = ?`, repoAt, issueId).Scan(&ownerDid)

···

       98
        
       	return issueAt, err

     

       99
        
       }

     

       100
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       101
        
       func GetIssueOwnerDid(e Execer, repoAt syntax.ATURI, issueId int) (string, error) {

     

       102
        
       	var ownerDid string

     

       103
        
       	err := e.QueryRow(`select owner_did from issues where repo_at = ? and issue_id = ?`, repoAt, issueId).Scan(&ownerDid)

+7 -13

appview/issues/issues.go

···

       687
        
       			return

     

       688
        
       		}

     

       689
        
       

     

       690
       -
       		err = db.NewIssue(tx, &db.Issue{

     

       691
        
       			RepoAt:   f.RepoAt,

     

       692
        
       			Title:    title,

     

       693
        
       			Body:     body,

     

       694
        
       			OwnerDid: user.Did,

     

       695
       -
       		})

     

       696
       -
       		if err != nil {

     

       697
       -
       			log.Println("failed to create issue", err)

     

       698
       -
       			rp.pages.Notice(w, "issues", "Failed to create issue.")

     

       699
       -
       			return

     

       700
        
       		}

     

       701
       -
       

     

       702
       -
       		issueId, err := db.GetIssueId(rp.db, f.RepoAt)

     

       703
        
       		if err != nil {

     

       704
       -
       			log.Println("failed to get issue id", err)

     

       705
        
       			rp.pages.Notice(w, "issues", "Failed to create issue.")

     

       706
        
       			return

     

       707
        
       		}

     
···

       723
        
       					Title:   title,

     

       724
        
       					Body:    &body,

     

       725
        
       					Owner:   user.Did,

     

       726
       -
       					IssueId: int64(issueId),

     

       727
        
       				},

     

       728
        
       			},

     

       729
        
       		})

     
···

       733
        
       			return

     

       734
        
       		}

     

       735
        
       

     

       736
       -
       		err = db.SetIssueAt(rp.db, f.RepoAt, issueId, resp.Uri)

     

       737
        
       		if err != nil {

     

       738
        
       			log.Println("failed to set issue at", err)

     

       739
        
       			rp.pages.Notice(w, "issues", "Failed to create issue.")

     
···

       744
        
       			err = rp.posthog.Enqueue(posthog.Capture{

     

       745
        
       				DistinctId: user.Did,

     

       746
        
       				Event:      "new_issue",

     

       747
       -
       				Properties: posthog.Properties{"repo_at": f.RepoAt.String(), "issue_id": issueId},

     

       748
        
       			})

     

       749
        
       			if err != nil {

     

       750
        
       				log.Println("failed to enqueue posthog event:", err)

     

       751
        
       			}

     

       752
        
       		}

     

       753
        
       

     

       754
       -
       		rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", f.OwnerSlashRepo(), issueId))

     

       755
        
       		return

     

       756
        
       	}

     

       757
        
       }

···

       687
        
       			return

     

       688
        
       		}

     

       689
        
       

     

       690
       +
       		issue := &db.Issue{

     

       691
        
       			RepoAt:   f.RepoAt,

     

       692
        
       			Title:    title,

     

       693
        
       			Body:     body,

     

       694
        
       			OwnerDid: user.Did,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       695
        
       		}

     

       696
       +
       		err = db.NewIssue(tx, issue)

     

       0
        
       
     

       697
        
       		if err != nil {

     

       698
       +
       			log.Println("failed to create issue", err)

     

       699
        
       			rp.pages.Notice(w, "issues", "Failed to create issue.")

     

       700
        
       			return

     

       701
        
       		}

     
···

       717
        
       					Title:   title,

     

       718
        
       					Body:    &body,

     

       719
        
       					Owner:   user.Did,

     

       720
       +
       					IssueId: int64(issue.IssueId),

     

       721
        
       				},

     

       722
        
       			},

     

       723
        
       		})

     
···

       727
        
       			return

     

       728
        
       		}

     

       729
        
       

     

       730
       +
       		err = db.SetIssueAt(rp.db, f.RepoAt, issue.IssueId, resp.Uri)

     

       731
        
       		if err != nil {

     

       732
        
       			log.Println("failed to set issue at", err)

     

       733
        
       			rp.pages.Notice(w, "issues", "Failed to create issue.")

     
···

       738
        
       			err = rp.posthog.Enqueue(posthog.Capture{

     

       739
        
       				DistinctId: user.Did,

     

       740
        
       				Event:      "new_issue",

     

       741
       +
       				Properties: posthog.Properties{"repo_at": f.RepoAt.String(), "issue_id": issue.IssueId},

     

       742
        
       			})

     

       743
        
       			if err != nil {

     

       744
        
       				log.Println("failed to enqueue posthog event:", err)

     

       745
        
       			}

     

       746
        
       		}

     

       747
        
       

     

       748
       +
       		rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", f.OwnerSlashRepo(), issue.IssueId))

     

       749
        
       		return

     

       750
        
       	}

     

       751
        
       }