fix integration testing

Author: janishar

api/user/service.go

@@ -21,6 +21,11 @@ type Service interface {
 	CreateUser(
 		email string, password string, name string, profilePicURL *string, roles []*model.Role,
 	) (*model.User, error)
+
+	/*--------only for tests----------*/
+	CreateRole(code model.RoleCode) (*model.Role, error)
+	DeleteRole(role *model.Role) (bool, error)
+	/*--------------------------------*/
 }
 
 type service struct {
@@ -469,3 +474,56 @@ func (s *service) DeleteUserByEmail(ctx context.Context, email string) (bool, er
 
 	return tag.RowsAffected() > 0, nil
 }
+
+func (s *service) CreateRole(code model.RoleCode) (*model.Role, error) {
+	ctx := context.Background()
+
+	var role model.Role
+
+	query := `
+		INSERT INTO roles (
+			code
+		)
+		VALUES ($1)
+		RETURNING
+			id,
+			code,
+			status,
+			created_at,
+			updated_at
+	`
+
+	err := s.db.QueryRow(
+		ctx,
+		query,
+		code,
+	).Scan(
+		&role.ID,
+		&role.Code,
+		&role.Status,
+		&role.CreatedAt,
+		&role.UpdatedAt,
+	)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &role, nil
+}
+
+func (s *service) DeleteRole(role *model.Role) (bool, error) {
+	ctx := context.Background()
+
+	query := `
+		DELETE FROM roles
+		WHERE id = $1
+	`
+
+	tag, err := s.db.Exec(ctx, query, role.ID)
+	if err != nil {
+		return false, err
+	}
+
+	return tag.RowsAffected() > 0, nil
+}	

tests/auth_integration_test.go

@@ -7,28 +7,58 @@ import (
 	"testing"
 
 	"github.com/afteracademy/goserve-example-api-server-postgres/api/auth/model"
+	roleModel "github.com/afteracademy/goserve-example-api-server-postgres/api/user/model"
 	"github.com/afteracademy/goserve-example-api-server-postgres/startup"
 	"github.com/afteracademy/goserve/v2/network"
+	"github.com/afteracademy/goserve/v2/utility"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestIntegrationAuthController_SignupSuccess(t *testing.T) {
 	router, module, shutdown := startup.TestServer()
+	var role *roleModel.Role
+	var apikey *model.ApiKey
 	defer shutdown()
 
-	apikey, err := module.GetInstance().AuthService.CreateApiKey("test_key", 1, []model.Permission{"test"}, []string{"comment"})
+	t.Cleanup(func() {
+		if apikey != nil {
+			module.GetInstance().AuthService.DeleteApiKey(apikey)
+		}
+	})
+
+	t.Cleanup(func() {
+		if role != nil {
+			module.GetInstance().UserService.DeleteRole(role)
+		}
+	})
+
+	t.Cleanup(func() {
+		module.GetInstance().UserService.RemoveUserByEmail("test@abc.com")
+	})
+
+	key, err := utility.GenerateRandomString(6)
+	if err != nil {
+		t.Fatalf("could not create key: %v", err)
+	}
+
+	apikey, err = module.GetInstance().AuthService.CreateApiKey(key, 1, []model.Permission{"test"}, []string{"comment"})
 	if err != nil {
 		t.Fatalf("could not create apikey: %v", err)
 	}
 
+	role, err = module.GetInstance().UserService.CreateRole(roleModel.RoleCodeLearner)
+	if err != nil {
+		t.Fatalf("could not create role: %v", err)
+	}
+
 	body := `{"email":"test@abc.com","password":"123456","name":"test name"}`
 
 	req, err := http.NewRequest("POST", "/auth/signup/basic", bytes.NewBuffer([]byte(body)))
 	if err != nil {
 		t.Fatalf("could not create request: %v", err)
 	}
 	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set(network.ApiKeyHeader, apikey.Key)
+	req.Header.Add(network.ApiKeyHeader, apikey.Key)
 
 	rr := httptest.NewRecorder()
 	router.GetEngine().ServeHTTP(rr, req)
@@ -40,13 +70,4 @@ func TestIntegrationAuthController_SignupSuccess(t *testing.T) {
 	assert.Contains(t, rr.Body.String(), `"roles"`)
 	assert.Contains(t, rr.Body.String(), `"tokens"`)
 
-	_, err = module.GetInstance().AuthService.DeleteApiKey(apikey)
-	if err != nil {
-		t.Fatalf("could not delete apikey: %v", err)
-	}
-
-	_, err = module.GetInstance().UserService.RemoveUserByEmail("test@abc.com")
-	if err != nil {
-		t.Fatalf("could not delete user: %v", err)
-	}
 }