code refactored

Author: adi6859

pkg/appStore/deployment/service/InstalledAppService.go

@@ -50,6 +50,7 @@ import (
 	util3 "github.com/devtron-labs/devtron/util"
 	"github.com/devtron-labs/devtron/util/argo"
 	"github.com/tidwall/gjson"
+	"k8s.io/apimachinery/pkg/version"
 	"net/http"
 	"regexp"
 	"sync"
@@ -947,23 +948,7 @@ func (impl *InstalledAppServiceImpl) FindNotesForArgoApplication(installedAppId,
 			impl.logger.Errorw("exception caught in getting k8sServerVersion", "err", err)
 			return notes, appName, err
 		}
-
-		installReleaseRequest := &client.InstallReleaseRequest{
-			ChartName:    appStoreAppVersion.Name,
-			ChartVersion: appStoreAppVersion.Version,
-			ValuesYaml:   installedAppVerison.ValuesYaml,
-			K8SVersion:   k8sServerVersion.String(),
-			ChartRepository: &client.ChartRepository{
-				Name:     appStoreAppVersion.AppStore.ChartRepo.Name,
-				Url:      appStoreAppVersion.AppStore.ChartRepo.Url,
-				Username: appStoreAppVersion.AppStore.ChartRepo.UserName,
-				Password: appStoreAppVersion.AppStore.ChartRepo.Password,
-			},
-			ReleaseIdentifier: &client.ReleaseIdentifier{
-				ReleaseNamespace: installedAppVerison.InstalledApp.Environment.Namespace,
-				ReleaseName:      installedAppVerison.InstalledApp.App.AppName,
-			},
-		}
+		installReleaseRequest := setInstallReleaseRequest(appStoreAppVersion, installedAppVerison, k8sServerVersion)
 
 		notes, err = impl.helmAppService.GetNotes(context.Background(), installReleaseRequest)
 		if err != nil {
@@ -980,6 +965,29 @@ func (impl *InstalledAppServiceImpl) FindNotesForArgoApplication(installedAppId,
 	return notes, appName, nil
 }
 
+func setInstallReleaseRequest(appStoreAppVersion *appStoreDiscoverRepository.AppStoreApplicationVersion, installedAppVerison *repository2.InstalledAppVersions, k8sServerVersion *version.Info) *client.InstallReleaseRequest {
+	installReleaseRequest := &client.InstallReleaseRequest{
+		ChartName:    appStoreAppVersion.Name,
+		ChartVersion: appStoreAppVersion.Version,
+		ValuesYaml:   installedAppVerison.ValuesYaml,
+		K8SVersion:   k8sServerVersion.String(),
+		ChartRepository: &client.ChartRepository{
+			Name:     appStoreAppVersion.AppStore.ChartRepo.Name,
+			Url:      appStoreAppVersion.AppStore.ChartRepo.Url,
+			Username: appStoreAppVersion.AppStore.ChartRepo.UserName,
+			Password: appStoreAppVersion.AppStore.ChartRepo.Password,
+		},
+		ReleaseIdentifier: &client.ReleaseIdentifier{
+			ReleaseNamespace: installedAppVerison.InstalledApp.Environment.Namespace,
+			ReleaseName:      installedAppVerison.InstalledApp.App.AppName,
+			ClusterConfig: &client.ClusterConfig{
+				ClusterId: int32(installedAppVerison.InstalledApp.Environment.ClusterId),
+			},
+		},
+	}
+	return installReleaseRequest
+}
+
 func (impl InstalledAppServiceImpl) GetInstalledAppVersionHistory(installedAppId int) (*appStoreBean.InstallAppVersionHistoryDto, error) {
 	result := &appStoreBean.InstallAppVersionHistoryDto{}
 	var history []*appStoreBean.IAVHistory