Revert "Introduce number column for area and iteration and allow seah…

…ching it (#2287)" (#2307)

This reverts commit a917dfe (aka #2287).

We're experiencing trouble to migrate the DB for this change (see https://gitlab.cee.redhat.com/dtsd/housekeeping/issues/2349). Currently the prod-preview database is not being updated and stalls at the migration from 105 to 106 (number for iteration an area).

area/area.go

@@ -8,7 +8,6 @@ import (
 	"github.com/fabric8-services/fabric8-wit/errors"
 	"github.com/fabric8-services/fabric8-wit/gormsupport"
 	"github.com/fabric8-services/fabric8-wit/log"
-	"github.com/fabric8-services/fabric8-wit/numbersequence"
 	"github.com/fabric8-services/fabric8-wit/path"
 
 	"fmt"
@@ -24,7 +23,6 @@ const APIStringTypeAreas = "areas"
 // Area describes a single Area
 type Area struct {
 	gormsupport.Lifecycle
-	numbersequence.HumanFriendlyNumber
 	ID      uuid.UUID `sql:"type:uuid default uuid_generate_v4()" gorm:"primary_key"` // This is the ID PK field
 	SpaceID uuid.UUID `sql:"type:uuid"`
 	Path    path.Path
@@ -83,8 +81,6 @@ type GormAreaRepository struct {
 func (m *GormAreaRepository) Create(ctx context.Context, u *Area) error {
 	defer goa.MeasureSince([]string{"goa", "db", "area", "create"}, time.Now())
 
-	u.HumanFriendlyNumber = numbersequence.NewHumanFriendlyNumber(u.SpaceID, u.TableName())
-
 	if u.ID == uuid.Nil {
 		u.ID = uuid.NewV4()
 		u.Path = path.Path{u.ID}

area/area_blackbox_test.go

@@ -49,11 +49,11 @@ func (s *TestAreaRepository) TestCreateAreaWithSameNameFail() {
 	assert.IsType(s.T(), errors.DataConflictError{}, errs.Cause(err))
 }
 
-func (s *TestAreaRepository) TestCreate() {
+func (s *TestAreaRepository) TestCreateArea() {
 	// given
 	repo := area.NewAreaRepository(s.DB)
 	name := "TestCreateArea"
-	fxt := tf.NewTestFixture(s.T(), s.DB, tf.Spaces(2))
+	fxt := tf.NewTestFixture(s.T(), s.DB, tf.Spaces(1))
 	a := area.Area{
 		Name:    name,
 		SpaceID: fxt.Spaces[0].ID,
@@ -65,19 +65,6 @@ func (s *TestAreaRepository) TestCreate() {
 	require.NotEqual(s.T(), uuid.Nil, a.ID)
 	assert.True(s.T(), !a.CreatedAt.After(time.Now()), "Area was not created, CreatedAt after Now()?")
 	assert.Equal(s.T(), name, a.Name)
-	assert.Equal(s.T(), 1, a.Number)
-	s.T().Run("second area in same space gets a sequential number", func(t *testing.T) {
-		a := area.Area{Name: "second area", SpaceID: fxt.Spaces[0].ID}
-		err := repo.Create(context.Background(), &a)
-		require.NoError(t, err)
-		require.Equal(t, 2, a.Number)
-	})
-	s.T().Run("first area in another space starts numbering at 1", func(t *testing.T) {
-		a := area.Area{Name: "first area", SpaceID: fxt.Spaces[1].ID}
-		err := repo.Create(context.Background(), &a)
-		require.NoError(t, err)
-		require.Equal(t, 1, a.Number)
-	})
 }
 
 func (s *TestAreaRepository) TestExistsArea() {

controller/area.go

@@ -212,7 +212,6 @@ func ConvertArea(db application.DB, request *http.Request, ar area.Area, options
 			UpdatedAt:  &ar.UpdatedAt,
 			Version:    &ar.Version,
 			ParentPath: ptr.String(ar.Path.ParentPath().String()),
-			Number:     &ar.Number,
 		},
 		Relationships: &app.AreaRelations{
 			Space: &app.RelationGeneric{

controller/iteration.go

@@ -475,7 +475,6 @@ func ConvertIteration(request *http.Request, itr iteration.Iteration, additional
 			ParentPath:   &pathToTopMostParent,
 			UserActive:   &itr.UserActive,
 			ActiveStatus: &activeStatus,
-			Number:       &itr.Number,
 		},
 		Relationships: &app.IterationRelations{
 			Space: &app.RelationGeneric{

controller/test-files/area/create/ok.child1_ok.res.payload.golden.json

@@ -3,7 +3,6 @@
     "attributes": {
       "created-at": "0001-01-01T00:00:00Z",
       "name": "TestSuccessCreateMultiChildArea-0",
-      "number": 3,
       "parent_path": "/00000000-0000-0000-0000-000000000001",
       "parent_path_resolved": "/area 00000000-0000-0000-0000-000000000002",
       "updated-at": "0001-01-01T00:00:00Z",

controller/test-files/area/create/ok.res.payload.golden.json

@@ -3,7 +3,6 @@
     "attributes": {
       "created-at": "0001-01-01T00:00:00Z",
       "name": "TestSuccessCreateChildArea",
-      "number": 2,
       "parent_path": "/00000000-0000-0000-0000-000000000001",
       "parent_path_resolved": "/area 00000000-0000-0000-0000-000000000002",
       "updated-at": "0001-01-01T00:00:00Z",

controller/test-files/area/show/expired_if_modified_since.res.payload.golden.json

@@ -3,7 +3,6 @@
     "attributes": {
       "created-at": "0001-01-01T00:00:00Z",
       "name": "root",
-      "number": 1,
       "parent_path": "/",
       "parent_path_resolved": "/",
       "updated-at": "0001-01-01T00:00:00Z",

controller/test-files/area/show/expired_if_none_match.res.payload.golden.json

@@ -3,7 +3,6 @@
     "attributes": {
       "created-at": "0001-01-01T00:00:00Z",
       "name": "root",
-      "number": 1,
       "parent_path": "/",
       "parent_path_resolved": "/",
       "updated-at": "0001-01-01T00:00:00Z",

controller/test-files/area/show/ok-root-area.res.payload.golden.json

@@ -3,7 +3,6 @@
     "attributes": {
       "created-at": "0001-01-01T00:00:00Z",
       "name": "root",
-      "number": 1,
       "parent_path": "/",
       "parent_path_resolved": "/",
       "updated-at": "0001-01-01T00:00:00Z",

controller/test-files/area/showChildren/ok.res.payload.golden.json

@@ -4,7 +4,6 @@
       "attributes": {
         "created-at": "0001-01-01T00:00:00Z",
         "name": "TestShowChildrenArea",
-        "number": 2,
         "parent_path": "/00000000-0000-0000-0000-000000000001",
         "parent_path_resolved": "/area 00000000-0000-0000-0000-000000000002",
         "updated-at": "0001-01-01T00:00:00Z",

controller/test-files/iteration/create/ok_create_child.res.iteration.golden.json

@@ -6,7 +6,6 @@
       "description": "Some description",
       "endAt": "0001-01-01T00:00:00Z",
       "name": "Sprint #21",
-      "number": 3,
       "parent_path": "/00000000-0000-0000-0000-000000000001/00000000-0000-0000-0000-000000000002",
       "resolved_parent_path": "/root/child",
       "startAt": "0001-01-01T00:00:00Z",

controller/test-files/iteration/create/ok_create_child_with_ID_paylod.res.iteration.golden.json

@@ -6,7 +6,6 @@
       "description": "Some description",
       "endAt": "0001-01-01T00:00:00Z",
       "name": "Sprint #21",
-      "number": 3,
       "parent_path": "/00000000-0000-0000-0000-000000000001/00000000-0000-0000-0000-000000000002",
       "resolved_parent_path": "/root/child",
       "startAt": "0001-01-01T00:00:00Z",

controller/test-files/iteration/show/ok-child-iteration.res.payload.golden.json

@@ -6,7 +6,6 @@
       "description": "some description (see function github.com/fabric8-services/fabric8-wit/controller_test.(*TestIterationREST).TestShow in controller/iteration_blackbox_test.go)",
       "endAt": "0001-01-01T00:00:00Z",
       "name": "child",
-      "number": 2,
       "parent_path": "/00000000-0000-0000-0000-000000000001",
       "resolved_parent_path": "/root",
       "startAt": "0001-01-01T00:00:00Z",

controller/test-files/iteration/show/ok-root-iteration.res.payload.golden.json

@@ -5,7 +5,6 @@
       "created-at": "0001-01-01T00:00:00Z",
       "description": "some description (see function github.com/fabric8-services/fabric8-wit/controller_test.(*TestIterationREST).TestShow in controller/iteration_blackbox_test.go)",
       "name": "root",
-      "number": 1,
       "parent_path": "/",
       "resolved_parent_path": "/",
       "state": "new",

controller/test-files/iteration/update/ok_change_parent.res.iteration.golden.json

@@ -5,7 +5,6 @@
       "created-at": "0001-01-01T00:00:00Z",
       "description": "some description (see function github.com/fabric8-services/fabric8-wit/controller_test.(*TestIterationREST).TestUpdateIteration.func1 in controller/iteration_blackbox_test.go)",
       "name": "iteration 3",
-      "number": 4,
       "parent_path": "/00000000-0000-0000-0000-000000000001/00000000-0000-0000-0000-000000000002",
       "resolved_parent_path": "/root/iteration 1",
       "state": "new",

controller/test-files/space_iterations/create/ok.payload.res.golden.json

@@ -5,7 +5,6 @@
       "created-at": "0001-01-01T00:00:00Z",
       "endAt": "0001-01-01T00:00:00Z",
       "name": "Sprint #42",
-      "number": 2,
       "parent_path": "/00000000-0000-0000-0000-000000000001",
       "resolved_parent_path": "/space 00000000-0000-0000-0000-000000000002",
       "startAt": "0001-01-01T00:00:00Z",

controller/test-files/space_iterations/create/ok_with_force_active.payload.res.golden.json

@@ -5,7 +5,6 @@
       "created-at": "0001-01-01T00:00:00Z",
       "endAt": "0001-01-01T00:00:00Z",
       "name": "Sprint #43",
-      "number": 2,
       "parent_path": "/00000000-0000-0000-0000-000000000001",
       "resolved_parent_path": "/space 00000000-0000-0000-0000-000000000002",
       "startAt": "0001-01-01T00:00:00Z",

design/areas.go

@@ -37,7 +37,6 @@ var areaAttributes = a.Type("AreaAttributes", func() {
 	a.Attribute("parent_path_resolved", d.String, "Path to the topmost area specified by area names", func() {
 		a.Example("/devtools/planner/planner-ui")
 	})
-	a.Attribute("number", d.Integer, "Human-friendly number of the area that is unique inside the area's space")
 })
 
 var areaRelationships = a.Type("AreaRelations", func() {

design/iterations.go

@@ -40,15 +40,16 @@ var iterationAttributes = a.Type("IterationAttributes", func() {
 	a.Attribute("state", d.String, "State of an iteration", func() {
 		a.Enum("new", "start", "close")
 	})
-	a.Attribute("user_active", d.Boolean, "Active flag set by user")
-	a.Attribute("active_status", d.Boolean, "Active status of iteration calculated using user_active, startAt and endAt")
+	a.Attribute("user_active", d.Boolean, "Active flag set by user", func() {
+	})
+	a.Attribute("active_status", d.Boolean, "Active status of iteration calculated using user_active, startAt and endAt", func() {
+	})
 	a.Attribute("parent_path", d.String, "Path string separataed by / having UUIDs of all parent iterations", func() {
 		a.Example("/8ab013be-6477-41e2-b206-53593dac6543/300d9835-fcf7-4d2f-a629-1919de091663/42f0dabd-16bf-40a6-a521-888ec2ad7461")
 	})
 	a.Attribute("resolved_parent_path", d.String, "Path string separataed by / having names of all parent iterations", func() {
 		a.Example("/beta/Web-App/Sprint 9/Sprint 9.1")
 	})
-	a.Attribute("number", d.Integer, "Human-friendly number of the iteration that is unique inside the iteration's space")
 })
 
 var iterationRelationships = a.Type("IterationRelations", func() {

iteration/iteration.go

@@ -10,7 +10,6 @@ import (
 	"github.com/fabric8-services/fabric8-wit/errors"
 	"github.com/fabric8-services/fabric8-wit/gormsupport"
 	"github.com/fabric8-services/fabric8-wit/log"
-	"github.com/fabric8-services/fabric8-wit/numbersequence"
 	"github.com/fabric8-services/fabric8-wit/path"
 	"github.com/goadesign/goa"
 	"github.com/jinzhu/gorm"
@@ -30,7 +29,6 @@ const (
 // Iteration describes a single iteration
 type Iteration struct {
 	gormsupport.Lifecycle
-	numbersequence.HumanFriendlyNumber
 	ID          uuid.UUID `sql:"type:uuid default uuid_generate_v4()" gorm:"primary_key"` // This is the ID PK field
 	SpaceID     uuid.UUID `sql:"type:uuid"`
 	Path        path.Path
@@ -139,7 +137,6 @@ func (m *GormIterationRepository) LoadMultiple(ctx context.Context, ids []uuid.U
 func (m *GormIterationRepository) Create(ctx context.Context, u *Iteration) error {
 	defer goa.MeasureSince([]string{"goa", "db", "iteration", "create"}, time.Now())
 
-	u.HumanFriendlyNumber = numbersequence.NewHumanFriendlyNumber(u.SpaceID, u.TableName())
 	if u.ID == uuid.Nil {
 		u.ID = uuid.NewV4()
 		u.Path = path.Path{u.ID}

iteration/iteration_test.go

@@ -25,7 +25,7 @@ func TestRunIterationRepository(t *testing.T) {
 	suite.Run(t, &TestIterationRepository{DBTestSuite: gormtestsupport.NewDBTestSuite()})
 }
 
-func (s *TestIterationRepository) TestCreate() {
+func (s *TestIterationRepository) TestCreateIteration() {
 	t := s.T()
 	resource.Require(t, resource.Database)
 	repo := iteration.NewIterationRepository(s.DB)
@@ -35,7 +35,7 @@ func (s *TestIterationRepository) TestCreate() {
 		end := start.Add(time.Hour * (24 * 8 * 3))
 		name := "Sprint #24"
 		// given
-		fxt := tf.NewTestFixture(t, s.DB, tf.Spaces(2))
+		fxt := tf.NewTestFixture(t, s.DB, tf.Spaces(1))
 
 		i := iteration.Iteration{
 			Name:    name,
@@ -47,24 +47,15 @@ func (s *TestIterationRepository) TestCreate() {
 		err := repo.Create(context.Background(), &i)
 		// then
 		require.NoError(t, err)
-		require.NotEqual(t, uuid.Nil, i.ID, "iteration not created, ID is nil")
-		require.False(t, i.CreatedAt.After(time.Now()), "iteration was not created, CreatedAt after Now()?")
+		if i.ID == uuid.Nil {
+			t.Errorf("Iteration was not created, ID nil")
+		}
+		if i.CreatedAt.After(time.Now()) {
+			t.Errorf("Iteration was not created, CreatedAt after Now()?")
+		}
 		assert.Equal(t, start, *i.StartAt)
 		assert.Equal(t, end, *i.EndAt)
 		assert.Equal(t, name, i.Name)
-		assert.Equal(t, 1, i.Number)
-		t.Run("second iteration in space gets sequential number", func(t *testing.T) {
-			i := iteration.Iteration{Name: "second iteration", SpaceID: fxt.Spaces[0].ID}
-			err := repo.Create(context.Background(), &i)
-			require.NoError(t, err)
-			assert.Equal(t, 2, i.Number)
-		})
-		t.Run("first iteration in another space starts numbering at 1", func(t *testing.T) {
-			i := iteration.Iteration{Name: "first iteration", SpaceID: fxt.Spaces[1].ID}
-			err := repo.Create(context.Background(), &i)
-			require.NoError(t, err)
-			assert.Equal(t, 1, i.Number)
-		})
 	})
 
 	t.Run("success - create child", func(t *testing.T) {
@@ -82,7 +73,8 @@ func (s *TestIterationRepository) TestCreate() {
 			EndAt:   &end,
 		}
 		// when
-		repo.Create(context.Background(), &i)
+		err := repo.Create(context.Background(), &i)
+		require.NoError(t, err)
 		parentPath := append(i.Path, i.ID)
 		require.NotNil(t, parentPath)
 		i2 := iteration.Iteration{
@@ -92,8 +84,9 @@ func (s *TestIterationRepository) TestCreate() {
 			EndAt:   &end,
 			Path:    parentPath,
 		}
-		repo.Create(context.Background(), &i2)
+		err = repo.Create(context.Background(), &i2)
 		// then
+		require.NoError(t, err)
 		i2L, err := repo.Load(context.Background(), i2.ID)
 		require.NoError(t, err)
 		assert.NotEmpty(t, i2.Path)
@@ -211,17 +204,18 @@ func (s *TestIterationRepository) TestLoad() {
 			EndAt:   &end,
 		}
 		// when
-		repo.Create(context.Background(), &i)
-
+		err := repo.Create(context.Background(), &i)
+		require.NoError(t, err)
 		i2 := iteration.Iteration{
 			Name:    name2,
 			SpaceID: fxt.Spaces[0].ID,
 			StartAt: &start,
 			EndAt:   &end,
 		}
 		i2.MakeChildOf(i)
-		repo.Create(context.Background(), &i2)
+		err = repo.Create(context.Background(), &i2)
 		// then
+		require.NoError(t, err)
 		res, err := repo.Root(context.Background(), fxt.Spaces[0].ID)
 		require.NoError(t, err)
 		assert.Equal(t, i.Name, res.Name)

migration/migration.go

@@ -454,10 +454,7 @@ func GetMigrations() Migrations {
 	m = append(m, steps{ExecuteSQLFile("105-update-root-area-and-iteration-path-field.sql")})
 
 	// Version 106
-	m = append(m, steps{ExecuteSQLFile("106-number-sequences.sql")})
-
-	// Version 107
-	m = append(m, steps{ExecuteSQLFile("107-remove-link-category-concept.sql")})
+	m = append(m, steps{ExecuteSQLFile("106-remove-link-category-concept.sql")})
 
 	// Version N
 	//