chore: renamed a function

devtron-labs · Aug 30, 2023 · fafbda3 · fafbda3
1 parent 0427667
commit fafbda3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/restHandler/CoreAppRestHandler.go b/api/restHandler/CoreAppRestHandler.go
@@ -1607,7 +1607,7 @@ func (handler CoreAppRestHandlerImpl) createCiPipeline(appId int, userId int32,
 			gitMaterial, err = handler.materialRepository.FindByAppIdAndCheckoutPath(appId, ciMaterial.CheckoutPath)
 		} else {
 			//if linked CI find git material by it's parentAppId and Id
-			gitMaterial, err = handler.materialRepository.FindByAppIdAndId(ciPipelineData.ParentAppId, ciMaterial.GitMaterialId)
+			gitMaterial, err = handler.materialRepository.FindByAppIdAndGitMaterialId(ciPipelineData.ParentAppId, ciMaterial.GitMaterialId)
 		}
 		if err != nil {
 			handler.logger.Errorw("service err, FindByAppIdAndCheckoutPath in CreateWorkflows", "err", err, "appId", appId)

diff --git a/internal/sql/repository/pipelineConfig/MaterialRepository.go b/internal/sql/repository/pipelineConfig/MaterialRepository.go
@@ -57,7 +57,7 @@ type MaterialRepository interface {
 	Update(materials []*GitMaterial) error
 	FindByAppId(appId int) ([]*GitMaterial, error)
 	FindById(Id int) (*GitMaterial, error)
-	FindByAppIdAndId(appId, id int) (*GitMaterial, error)
+	FindByAppIdAndGitMaterialId(appId, id int) (*GitMaterial, error)
 	UpdateMaterialScmId(material *GitMaterial) error
 	FindByAppIdAndCheckoutPath(appId int, checkoutPath string) (*GitMaterial, error)
 	FindByGitProviderId(gitProviderId int) (materials []*GitMaterial, err error)
@@ -93,7 +93,7 @@ func (repo MaterialRepositoryImpl) FindById(Id int) (*GitMaterial, error) {
 	return material, err
 }
 
-func (repo MaterialRepositoryImpl) FindByAppIdAndId(appId, id int) (*GitMaterial, error) {
+func (repo MaterialRepositoryImpl) FindByAppIdAndGitMaterialId(appId, id int) (*GitMaterial, error) {
 	material := &GitMaterial{}
 	err := repo.dbConnection.Model(material).
 		Column("git_material.*", "GitProvider").