Merge branch 'main' into fix-oss-issues

devtron-labs · Sep 20, 2024 · ba9bc8b · ba9bc8b
2 parents 011e92f + ee06e41
commit ba9bc8b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/api/appStore/InstalledAppRestHandler.go b/api/appStore/InstalledAppRestHandler.go
@@ -148,6 +148,13 @@ func (handler *InstalledAppRestHandlerImpl) FetchAppOverview(w http.ResponseWrit
 	token := r.Header.Get("token")
 	handler.Logger.Infow("request payload, FindAppOverview", "installedAppId", installedAppId)
 	installedApp, err := handler.installedAppService.GetInstalledAppById(installedAppId)
+	if err != nil && err != pg.ErrNoRows {
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	} else if err == pg.ErrNoRows || installedApp == nil {
+		common.WriteJsonResp(w, errors.New("helm app doses not exist"), nil, http.StatusNotFound)
+		return
+	}
 	appOverview, err := handler.appCrudOperationService.GetAppMetaInfo(installedApp.AppId, installedAppId, installedApp.EnvironmentId)
 	if err != nil {
 		handler.Logger.Errorw("service err, FetchAppOverview", "err", err, "appId", installedApp.AppId, "installedAppId", installedAppId)