appview/middleware: extract issue in middleware

Signed-off-by: oppiliappan <[e-mail]>

appview/issues/router.go

···
 
 	r.Route("/", func(r chi.Router) {
 		r.With(middleware.Paginate).Get("/", i.RepoIssues)
-		r.Get("/{issue}", i.RepoSingleIssue)
+
+		r.Route("/{issue}", func(r chi.Router) {
+			r.Use(mw.ResolveIssue())
+			r.Get("/", i.RepoSingleIssue)
+
+			// authenticated routes
+			r.Group(func(r chi.Router) {
+				r.Use(middleware.AuthMiddleware(i.oauth))
+				r.Post("/comment", i.NewIssueComment)
+				r.Route("/comment/{commentId}/", func(r chi.Router) {
+					r.Get("/", i.IssueComment)
+					r.Delete("/", i.DeleteIssueComment)
+					r.Get("/edit", i.EditIssueComment)
+					r.Post("/edit", i.EditIssueComment)
+					r.Get("/reply", i.ReplyIssueComment)
+					r.Get("/replyPlaceholder", i.ReplyIssueCommentPlaceholder)
+				})
+				r.Post("/close", i.CloseIssue)
+				r.Post("/reopen", i.ReopenIssue)
+			})
+		})
 
 		r.Group(func(r chi.Router) {
 			r.Use(middleware.AuthMiddleware(i.oauth))
 			r.Get("/new", i.NewIssue)
 			r.Post("/new", i.NewIssue)
-			r.Post("/{issue}/comment", i.NewIssueComment)
-			r.Route("/{issue}/comment/{comment_id}/", func(r chi.Router) {
-				r.Get("/", i.IssueComment)
-				r.Delete("/", i.DeleteIssueComment)
-				r.Get("/edit", i.EditIssueComment)
-				r.Post("/edit", i.EditIssueComment)
-			})
-			r.Post("/{issue}/close", i.CloseIssue)
-			r.Post("/{issue}/reopen", i.ReopenIssue)
 		})
 	})
 

appview/middleware/middleware.go

···
 	}
 }
 
+// middleware that is tacked on top of /{user}/{repo}/issues/{issue}
+func (mw Middleware) ResolveIssue() middlewareFunc {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			f, err := mw.repoResolver.Resolve(r)
+			if err != nil {
+				log.Println("failed to fully resolve repo", err)
+				mw.pages.ErrorKnot404(w)
+				return
+			}
+
+			issueIdStr := chi.URLParam(r, "issue")
+			issueId, err := strconv.Atoi(issueIdStr)
+			if err != nil {
+				log.Println("failed to fully resolve issue ID", err)
+				mw.pages.ErrorKnot404(w)
+				return
+			}
+
+			issues, err := db.GetIssues(
+				mw.db,
+				db.FilterEq("repo_at", f.RepoAt()),
+				db.FilterEq("issue_id", issueId),
+			)
+			if err != nil {
+				log.Println("failed to get issues", "err", err)
+				return
+			}
+			if len(issues) != 1 {
+				log.Println("got incorrect number of issues", "len(issuse)", len(issues))
+				return
+			}
+			issue := issues[0]
+
+			ctx := context.WithValue(r.Context(), "issue", &issue)
+			next.ServeHTTP(w, r.WithContext(ctx))
+		})
+	}
+}
+
 // this should serve the go-import meta tag even if the path is technically
 // a 404 like tangled.sh/oppi.li/go-git/v5
 func (mw Middleware) GoImport() middlewareFunc {

appview/posthog/notifier.go

···
 
 func (n *posthogNotifier) NewIssue(ctx context.Context, issue *db.Issue) {
 	err := n.client.Enqueue(posthog.Capture{
-		DistinctId: issue.OwnerDid,
+		DistinctId: issue.Did,
 		Event:      "new_issue",
 		Properties: posthog.Properties{
 			"repo_at":  issue.RepoAt.String(),

appview/repo/feed.go

···
 }
 
 func (rp *Repo) createIssueItem(ctx context.Context, issue db.Issue, f *reporesolver.ResolvedRepo) (*feeds.Item, error) {
-	owner, err := rp.idResolver.ResolveIdent(ctx, issue.OwnerDid)
+	owner, err := rp.idResolver.ResolveIdent(ctx, issue.Did)
 	if err != nil {
 		return nil, err
 	}