fix: app update migration

internal/sql/repository/app/AppRepository.go

@@ -54,6 +54,7 @@ type AppRepository interface {
 	UpdateWithTxn(app *App, tx *pg.Tx) error
 	SetDescription(id int, description string, userId int32) error
 	FindActiveByName(appName string) (pipelineGroup *App, err error)
+	FindAllActiveByName(appName string) ([]*App, error)
 	FindAppIdByName(appName string) (int, error)
 
 	FindJobByDisplayName(appName string) (pipelineGroup *App, err error)
@@ -133,35 +134,24 @@ func (repo AppRepositoryImpl) SetDescription(id int, description string, userId
 }
 
 func (repo AppRepositoryImpl) FindActiveByName(appName string) (*App, error) {
+	pipelineGroup := &App{}
+	err := repo.dbConnection.
+		Model(pipelineGroup).
+		Where("app_name = ?", appName).
+		Where("active = ?", true).
+		Order("id DESC").Limit(1).
+		Select()
+	return pipelineGroup, err
+}
+
+func (repo AppRepositoryImpl) FindAllActiveByName(appName string) ([]*App, error) {
 	var apps []*App
 	err := repo.dbConnection.
 		Model(&apps).
 		Where("app_name = ?", appName).
 		Where("active = ?", true).
-		Order("id DESC").
 		Select()
-	if len(apps) == 1 {
-		return apps[0], nil
-	} else if len(apps) > 1 {
-		isHelmApp := true
-		for _, app := range apps {
-			if app.AppType != helper.ChartStoreApp && app.AppType != helper.ExternalChartStoreApp {
-				isHelmApp = false
-				break
-			}
-		}
-		if isHelmApp {
-			err := repo.fixMultipleHelmAppsWithSameName(appName)
-			if err != nil {
-				repo.logger.Errorw("error in fixing duplicate helm apps with same name")
-				return nil, err
-			}
-		}
-		return apps[0], nil
-	} else {
-		err = pg.ErrNoRows
-	}
-	return nil, err
+	return apps, err
 }
 
 func (repo AppRepositoryImpl) FindAppIdByName(appName string) (int, error) {
@@ -349,52 +339,9 @@ func (repo AppRepositoryImpl) FindAppAndProjectByAppName(appName string) (*App,
 		Where("app.app_name = ?", appName).
 		Where("app.active=?", true).
 		Select()
-
-	if err == pg.ErrMultiRows && (app.AppType == helper.ChartStoreApp || app.AppType == helper.ExternalChartStoreApp) {
-		// this case can arise in helms apps only
-
-		err := repo.fixMultipleHelmAppsWithSameName(appName)
-		if err != nil {
-			repo.logger.Errorw("error in fixing duplicate helm apps with same name")
-			return nil, err
-		}
-
-		err = repo.dbConnection.Model(app).Column("Team").
-			Where("app.app_name = ?", appName).
-			Where("app.active=?", true).
-			Select()
-		if err != nil {
-			repo.logger.Errorw("error in fetching apps by name", "appName", appName, "err", err)
-			return nil, err
-		}
-	}
 	return app, err
 }
 
-func (repo AppRepositoryImpl) fixMultipleHelmAppsWithSameName(appName string) error {
-	// updating installed apps setting app_id = max app_id
-	installAppUpdateQuery := `update installed_apps set 
-                          app_id=(select max(id) as id from app where app_name = ?) 
-                    	where app_id in (select id from app where app_name= ? )`
-
-	_, err := repo.dbConnection.Exec(installAppUpdateQuery, appName, appName)
-	if err != nil {
-		repo.logger.Errorw("error in updating maxAppId in installedApps", "appName", appName, "err", err)
-		return err
-	}
-
-	maxAppIdQuery := repo.dbConnection.Model((*App)(nil)).ColumnExpr("max(id)").
-		Where("app_name = ? ", appName).
-		Where("active = ? ", true)
-
-	// deleting all apps other than app with max id
-	_, err = repo.dbConnection.Model((*App)(nil)).
-		Set("active = ?", false).Set("updated_by = ?", SYSTEM_USER_ID).Set("updated_on = ?", time.Now()).
-		Where("id not in (?) ", maxAppIdQuery).Update()
-
-	return nil
-}
-
 func (repo AppRepositoryImpl) FindAllMatchesByAppName(appName string, appType helper.AppType) ([]*App, error) {
 	var apps []*App
 	var err error

pkg/app/AppCrudOperationService.go

@@ -463,10 +463,37 @@ func (impl AppCrudOperationServiceImpl) getAppAndProjectForAppIdentifier(appIden
 	var err error
 	appNameUniqueIdentifier := appIdentifier.GetUniqueAppNameIdentifier()
 	app, err = impl.appRepository.FindAppAndProjectByAppName(appNameUniqueIdentifier)
-	if err != nil && err != pg.ErrNoRows {
+	if err != nil && err != pg.ErrNoRows && err != pg.ErrMultiRows {
 		impl.logger.Errorw("error in fetching app meta data by unique app identifier", "appNameUniqueIdentifier", appNameUniqueIdentifier, "err", err)
 		return app, err
 	}
+	if err == pg.ErrMultiRows {
+		installedApp, err := impl.installedAppRepository.GetInstalledAppByAppName(appNameUniqueIdentifier)
+		if err != nil {
+			impl.logger.Errorw("error in fetching installed app by unique identifier", "appNameUniqueIdentifier", appNameUniqueIdentifier, "err", err)
+			return app, err
+		}
+		validAppId := installedApp.AppId
+		allActiveApps, err := impl.appRepository.FindAllActiveByName(appNameUniqueIdentifier)
+		if err != nil {
+			impl.logger.Errorw("error in fetching all active apps by name", "appName", appNameUniqueIdentifier, "err", err)
+			return app, err
+		}
+		var validApp *appRepository.App
+		for _, activeApp := range allActiveApps {
+			if activeApp.Id != validAppId {
+				activeApp.Active = false
+				err := impl.appRepository.Update(activeApp)
+				if err != nil {
+					impl.logger.Errorw("error in marking app inactive", "name", activeApp.AppName, "err", err)
+					return nil, err
+				}
+			} else {
+				validApp = activeApp
+			}
+		}
+		return validApp, nil
+	}
 	if util.IsErrNoRows(err) {
 		//find app by display name if not found by unique identifier
 		app, err = impl.appRepository.FindAppAndProjectByAppName(appIdentifier.ReleaseName)