Fixes 3577: creation prevented on previously deleted item (#573)

* Fixes 3577: Template creation prevented on previously deleted item

* Fix latest migration key

Author: Andrewgdewar

db/migrations.latest

@@ -1 +1 @@
-20240202124553
+20240212140239

db/migrations/20240212140239_update_template_unique_constraint.down.sql

@@ -0,0 +1,7 @@
+BEGIN;
+
+DROP INDEX name_org_id_not_deleted_unique;
+ALTER TABLE templates
+    ADD CONSTRAINT name_org_id_unique UNIQUE (name, org_id);
+
+COMMIT;

db/migrations/20240212140239_update_template_unique_constraint.up.sql

@@ -0,0 +1,10 @@
+BEGIN;
+
+ALTER TABLE templates
+    DROP CONSTRAINT name_org_id_unique;
+
+CREATE UNIQUE INDEX IF NOT EXISTS name_org_id_not_deleted_unique
+    ON templates(name, org_id)
+    WHERE deleted_at IS NULL;
+
+COMMIT;

pkg/dao/templates.go

@@ -27,7 +27,7 @@ func (t templateDaoImpl) DBToApiError(e error) *ce.DaoError {
 	if ok {
 		if pgError.Code == "23505" {
 			switch pgError.ConstraintName {
-			case "name_org_id_unique":
+			case "name_org_id_not_deleted_unique":
 				dupKeyName = "name"
 			}
 			return &ce.DaoError{BadValidation: true, Message: "Template with this " + dupKeyName + " already belongs to organization"}

pkg/dao/templates_test.go

@@ -58,6 +58,52 @@ func (s *TemplateSuite) TestCreate() {
 	assert.Len(s.T(), reqTemplate.RepositoryUUIDS, 2)
 }
 
+func (s *TemplateSuite) TestCreateDeleteCreateSameName() {
+	templateDao := templateDaoImpl{db: s.tx}
+
+	orgID := orgIDTest
+	err := seeds.SeedRepositoryConfigurations(s.tx, 2, seeds.SeedOptions{OrgID: orgID})
+	assert.NoError(s.T(), err)
+
+	var repoConfigs []models.RepositoryConfiguration
+	err = s.tx.Where("org_id = ?", orgID).Find(&repoConfigs).Error
+	assert.NoError(s.T(), err)
+
+	timeNow := time.Now()
+	reqTemplate := api.TemplateRequest{
+		Name:            pointy.String("template test"),
+		Description:     pointy.String("template test description"),
+		RepositoryUUIDS: []string{repoConfigs[0].UUID, repoConfigs[1].UUID},
+		Arch:            pointy.String(config.AARCH64),
+		Version:         pointy.String(config.El8),
+		Date:            &timeNow,
+		OrgID:           &orgID,
+	}
+
+	respTemplate, err := templateDao.Create(reqTemplate)
+	assert.NoError(s.T(), err)
+	assert.Equal(s.T(), orgID, respTemplate.OrgID)
+	assert.Len(s.T(), reqTemplate.RepositoryUUIDS, 2)
+
+	// As a template with this name exists, we expect this to error.
+	_, expectedErr := templateDao.Create(reqTemplate)
+	assert.Error(s.T(), expectedErr, "Template with this name already belongs to organization")
+
+	// Delete the template
+	err = templateDao.SoftDelete(respTemplate.OrgID, respTemplate.UUID)
+	assert.NoError(s.T(), err)
+
+	// We should now be able to recreate the template with the same name without issue
+	respTemplate, err = templateDao.Create(reqTemplate)
+	assert.NoError(s.T(), err)
+	assert.Equal(s.T(), orgID, respTemplate.OrgID)
+	assert.Equal(s.T(), *reqTemplate.Description, respTemplate.Description)
+	assert.Equal(s.T(), timeNow.Round(time.Millisecond), respTemplate.Date.Round(time.Millisecond))
+	assert.Equal(s.T(), *reqTemplate.Arch, respTemplate.Arch)
+	assert.Equal(s.T(), *reqTemplate.Version, respTemplate.Version)
+	assert.Len(s.T(), reqTemplate.RepositoryUUIDS, 2)
+}
+
 func (s *TemplateSuite) TestFetch() {
 	templateDao := templateDaoImpl{db: s.tx}