From d2a41fd62b9659defe69c8310ab0053051a382f6 Mon Sep 17 00:00:00 2001
From: Carlos Treminio <ctreminiom079@gmail.com>
Date: Sun, 11 Aug 2024 00:38:36 -0600
Subject: [PATCH] :art: issue_impl_rich_text.go edited

---
 jira/internal/issue_impl_rich_text.go | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/jira/internal/issue_impl_rich_text.go b/jira/internal/issue_impl_rich_text.go
index c8a36bee..ee27d30e 100644
--- a/jira/internal/issue_impl_rich_text.go
+++ b/jira/internal/issue_impl_rich_text.go
@@ -170,28 +170,23 @@ func (i *internalRichTextServiceImpl) Transitions(ctx context.Context, issueKeyO
 }
 
 func (i *internalRichTextServiceImpl) Create(ctx context.Context, payload *model.IssueSchemeV2, customFields *model.CustomFields) (*model.IssueResponseScheme, *model.ResponseScheme, error) {
-
-	var request *http.Request
+	var body interface{} = payload
 	var err error
 
-	endpoint := fmt.Sprintf("rest/api/%v/issue", i.version)
-
-	if customFields != nil {
+	if customFields != nil && len(customFields.Fields) != 0 {
 
 		payloadWithFields, err := payload.MergeCustomFields(customFields)
 		if err != nil {
 			return nil, nil, err
 		}
 
-		request, err = i.c.NewRequest(ctx, http.MethodPost, endpoint, "", payloadWithFields)
-		if err != nil {
-			return nil, nil, err
-		}
-	} else {
-		request, err = i.c.NewRequest(ctx, http.MethodPost, endpoint, "", payload)
-		if err != nil {
-			return nil, nil, err
-		}
+		body = payloadWithFields
+	}
+
+	endpoint := fmt.Sprintf("rest/api/%v/issue", i.version)
+	request, err := i.c.NewRequest(ctx, http.MethodPost, endpoint, "", body)
+	if err != nil {
+		return nil, nil, err
 	}
 
 	issue := new(model.IssueResponseScheme)