add additional query to filter for repo name (#2084)

* add additional query to filter for repo name

* fix review

Author: motatoes

backend/controllers/github.go

@@ -699,7 +699,7 @@ func handlePullRequestEvent(gh utils.GithubClientProvider, payload *github.PullR
 
 	// remove any dangling locks which are no longer in the list of impacted projects
 	if *diggerCommand == orchestrator_scheduler.DiggerCommandUnlock {
-		err := models.DB.DeleteAllLocksAcquiredByPR(prNumber, organisationId)
+		err := models.DB.DeleteAllLocksAcquiredByPR(prNumber, repoFullName, organisationId)
 		if err != nil {
 			slog.Error("Failed to delete locks",
 				"prNumber", prNumber,
@@ -1595,7 +1595,7 @@ func handleIssueCommentEvent(gh utils.GithubClientProvider, payload *github.Issu
 
 	// remove any dangling locks which are no longer in the list of impacted projects
 	if *diggerCommand == orchestrator_scheduler.DiggerCommandUnlock {
-		err := models.DB.DeleteAllLocksAcquiredByPR(issueNumber, orgId)
+		err := models.DB.DeleteAllLocksAcquiredByPR(issueNumber, repoFullName, orgId)
 		if err != nil {
 			slog.Error("Failed to delete locks",
 				"prNumber", issueNumber,

backend/models/storage.go

@@ -1703,6 +1703,15 @@ func (db *Database) RefreshProjectsFromRepo(orgId string, config configuration.D
 	return nil
 }
 
+func (db *Database) GetLocksForOrg(orgId uint) ([]DiggerLock, error) {
+	locks := make([]DiggerLock, 0)
+	err := db.GormDB.Where("organisation_id=?", orgId).Find(&locks).Error
+	if err != nil {
+		return nil, err
+	}
+	return locks, nil
+}
+
 func (db *Database) CreateDiggerLock(resource string, lockId int, orgId uint) (*DiggerLock, error) {
 	lock := &DiggerLock{
 		Resource:       resource,
@@ -1726,9 +1735,10 @@ func (db *Database) CreateDiggerLock(resource string, lockId int, orgId uint) (*
 	return lock, nil
 }
 
-func (db *Database) DeleteAllLocksAcquiredByPR(prNumber int, orgId uint) error {
+func (db *Database) DeleteAllLocksAcquiredByPR(prNumber int, repoFullName string, orgId uint) error {
 	l := DiggerLock{}
-	err := db.GormDB.Where("lock_id=? AND organisation_id=?", prNumber, orgId).Delete(&l).Error
+	err := db.GormDB.Where("lock_id=? AND organisation_id=? AND resource LIKE ?", prNumber, orgId, repoFullName+"%").Delete(&l).Error
+
 	if err != nil {
 		return fmt.Errorf("could not delete all locks: %v", err)
 	}

backend/models/storage_test.go

@@ -35,7 +35,7 @@ func setupSuite(tb testing.TB) (func(tb testing.TB), *Database, *Organisation) {
 	// migrate tables
 	err = gdb.AutoMigrate(&Policy{}, &Organisation{}, &Repo{}, &Project{}, &Token{},
 		&User{}, &ProjectRun{}, &GithubAppInstallation{}, &VCSConnection{}, &GithubAppInstallationLink{},
-		&GithubDiggerJobLink{}, &DiggerJob{}, &DiggerJobParentLink{})
+		&GithubDiggerJobLink{}, &DiggerJob{}, &DiggerJobParentLink{}, &DiggerLock{})
 	if err != nil {
 		panic(err)
 	}
@@ -157,3 +157,27 @@ func TestGetDiggerJobsForBatchPreloadsSummary(t *testing.T) {
 	assert.Equal(t, jobssss[0].DiggerJobSummary.ResourcesUpdated, resourcesUpdated)
 	assert.Equal(t, jobssss[0].DiggerJobSummary.ResourcesDeleted, resourcesDeleted)
 }
+
+func TestDiggerLockFunctionalities(t *testing.T) {
+	teardownSuite, _, _ := setupSuite(t)
+	defer teardownSuite(t)
+
+	DB.CreateDiggerLock("org/repo1#dev", 1, 1)
+	DB.CreateDiggerLock("org/repo1#staging", 1, 1)
+	DB.CreateDiggerLock("org/repo1#prod", 1, 1)
+
+	DB.CreateDiggerLock("org/repo2#dev", 1, 1)
+	DB.CreateDiggerLock("org/repo2#prod", 1, 1)
+
+	existingLocks, err := DB.GetLocksForOrg(1)
+	assert.NoError(t, err)
+	assert.Equal(t, 5, len(existingLocks))
+
+	DB.DeleteAllLocksAcquiredByPR(1, "org/repo1", 1)
+
+	existingLocksAfterDeletion, err := DB.GetLocksForOrg(1)
+	assert.NoError(t, err)
+	assert.Equal(t, 2, len(existingLocksAfterDeletion))
+	assert.Equal(t, "org/repo2#dev", existingLocksAfterDeletion[0].Resource)
+	assert.Equal(t, "org/repo2#prod", existingLocksAfterDeletion[1].Resource)
+}