Merge pull request #30 from Tecsisa/29-fix-remove-group

fix remove group (closes #29)

database/postgresql/group.go

@@ -149,11 +149,11 @@ func (g PostgresRepo) UpdateGroup(group api.Group) (*api.Group, error) {
 }
 
 func (g PostgresRepo) RemoveGroup(id string) error {
+
 	transaction := g.Dbmap.Begin()
+
 	// Delete group
 	transaction.Where("id like ?", id).Delete(&Group{})
-
-	// Error handling
 	if err := transaction.Error; err != nil {
 		transaction.Rollback()
 		return &database.Error{
@@ -164,8 +164,16 @@ func (g PostgresRepo) RemoveGroup(id string) error {
 
 	// Delete all group relations
 	transaction.Where("group_id like ?", id).Delete(&GroupUserRelation{})
+	if err := transaction.Error; err != nil {
+		transaction.Rollback()
+		return &database.Error{
+			Code:    database.INTERNAL_ERROR,
+			Message: err.Error(),
+		}
 
-	// Error handling
+	}
+	// Delete all policy relations
+	transaction.Where("group_id like ?", id).Delete(&GroupPolicyRelation{})
 	if err := transaction.Error; err != nil {
 		transaction.Rollback()
 		return &database.Error{

database/postgresql/group_test.go

@@ -695,16 +695,20 @@ func TestPostgresRepo_UpdateGroup(t *testing.T) {
 }
 
 func TestPostgresRepo_RemoveGroup(t *testing.T) {
-	type relation struct {
-		userID        string
-		groupID       string
-		groupNotFound bool
+	type userRelation struct {
+		userID  string
+		groupID string
+	}
+	type policyRelation struct {
+		policyID string
+		groupID  string
 	}
 	now := time.Now().UTC()
 	testcases := map[string]struct {
 		// Previous data
-		previousGroups []Group
-		relations      []relation
+		previousGroups  []Group
+		userRelations   []userRelation
+		policyRelations []policyRelation
 		// Postgres Repo Args
 		groupToDelete string
 	}{
@@ -729,23 +733,34 @@ func TestPostgresRepo_RemoveGroup(t *testing.T) {
 					Org:      "Org",
 				},
 			},
-			relations: []relation{
+			userRelations: []userRelation{
 				{
 					userID:  "UserID",
 					groupID: "GroupID",
 				},
 				{
-					userID:  "UserID",
+					userID:  "UserID1",
 					groupID: "GroupID2",
 				},
 			},
+			policyRelations: []policyRelation{
+				{
+					policyID: "policyID",
+					groupID:  "GroupID",
+				},
+				{
+					policyID: "policyID1",
+					groupID:  "GroupID2",
+				},
+			},
 			groupToDelete: "GroupID",
 		},
 	}
 
 	for n, test := range testcases {
 		cleanGroupTable()
 		cleanGroupUserRelationTable()
+		cleanGroupPolicyRelationTable()
 
 		// Insert previous data
 		if test.previousGroups != nil {
@@ -756,14 +771,22 @@ func TestPostgresRepo_RemoveGroup(t *testing.T) {
 				}
 			}
 		}
-		if test.relations != nil {
-			for _, rel := range test.relations {
+		if test.userRelations != nil {
+			for _, rel := range test.userRelations {
 				if err := insertGroupUserRelation(rel.userID, rel.groupID); err != nil {
 					t.Errorf("Test %v failed. Unexpected error inserting previous group user relations: %v", n, err)
 					continue
 				}
 			}
 		}
+		if test.policyRelations != nil {
+			for _, rel := range test.policyRelations {
+				if err := insertGroupPolicyRelation(rel.groupID, rel.policyID); err != nil {
+					t.Errorf("Test %v failed. Unexpected error inserting previous group policy relations: %v", n, err)
+					continue
+				}
+			}
+		}
 		// Call to repository to remove group
 		err := repoDB.RemoveGroup(test.groupToDelete)
 
@@ -803,13 +826,35 @@ func TestPostgresRepo_RemoveGroup(t *testing.T) {
 		// Check total group user relations
 		totalRelations, err := getGroupUserRelations("", "")
 		if err != nil {
-			t.Errorf("Test %v failed. Unexpected error counting total relations: %v", n, err)
+			t.Errorf("Test %v failed. Unexpected error counting total group user relations: %v", n, err)
 			continue
 		}
-		if relations != 0 {
+		if totalRelations != 1 {
 			t.Errorf("Test %v failed. Received different total group user relation number: %v", n, totalRelations)
 			continue
 		}
+
+		// Check group policy relations
+		relations, err = getGroupPolicyRelationCount("", test.groupToDelete)
+		if err != nil {
+			t.Errorf("Test %v failed. Unexpected error counting group policy relations: %v", n, err)
+			continue
+		}
+		if relations != 0 {
+			t.Errorf("Test %v failed. Received different group policy relation number: %v", n, relations)
+			continue
+		}
+
+		// Check total group policy relations
+		totalRelations, err = getGroupPolicyRelationCount("", "")
+		if err != nil {
+			t.Errorf("Test %v failed. Unexpected error counting total group policy relations: %v", n, err)
+			continue
+		}
+		if totalRelations != 1 {
+			t.Errorf("Test %v failed. Received different total group policy relation number: %v", n, totalRelations)
+			continue
+		}
 	}
 }