From a5399b473f7111c92b2645076d02a7f427e16f08 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Wed, 18 Dec 2024 22:10:08 -0800
Subject: [PATCH] Add more load functions to make sure the reference object
 loaded (#32901)

Fix #32897

(cherry picked from commit dc8f59baa54d4f47edab6feb76a6903947584326)
---
 services/convert/pull.go     | 5 +++++
 services/webhook/notifier.go | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/services/convert/pull.go b/services/convert/pull.go
index 4ec24a8276..70dc22445a 100644
--- a/services/convert/pull.go
+++ b/services/convert/pull.go
@@ -29,6 +29,11 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
 		err        error
 	)
 
+	if err = pr.LoadIssue(ctx); err != nil {
+		log.Error("pr.LoadIssue[%d]: %v", pr.ID, err)
+		return nil
+	}
+
 	if err = pr.Issue.LoadRepo(ctx); err != nil {
 		log.Error("pr.Issue.LoadRepo[%d]: %v", pr.ID, err)
 		return nil
diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go
index 8bfd03024f..fed33d8008 100644
--- a/services/webhook/notifier.go
+++ b/services/webhook/notifier.go
@@ -409,6 +409,10 @@ func (m *webhookNotifier) CreateIssueComment(ctx context.Context, doer *user_mod
 	var pullRequest *api.PullRequest
 	if issue.IsPull {
 		eventType = webhook_module.HookEventPullRequestComment
+		if err := issue.LoadPullRequest(ctx); err != nil {
+			log.Error("LoadPullRequest: %v", err)
+			return
+		}
 		pullRequest = convert.ToAPIPullRequest(ctx, issue.PullRequest, doer)
 	} else {
 		eventType = webhook_module.HookEventIssueComment