diff --git a/system/repository/user.go b/system/repository/user.go index ceb2ea56a..a79ad0b5a 100644 --- a/system/repository/user.go +++ b/system/repository/user.go @@ -72,11 +72,7 @@ func (r user) columns() []string { func (r user) query() squirrel.SelectBuilder { return squirrel. Select(r.columns()...). - From(r.table() + " AS u"). - Where(squirrel.And{ - squirrel.Eq{"deleted_at": nil}, - squirrel.Eq{"suspended_at": nil}, - }) + From(r.table() + " AS u") } func (r *user) With(ctx context.Context, db *factory.DB) UserRepository { diff --git a/tests/system/user_test.go b/tests/system/user_test.go index e3ad51bf7..b06d51724 100644 --- a/tests/system/user_test.go +++ b/tests/system/user_test.go @@ -311,5 +311,7 @@ func TestUserDelete(t *testing.T) { End() u, err := h.repoUser().FindByID(u.ID) - h.a.Error(err, "system.repository.UserNotFound") + h.a.NoError(err) + h.a.NotNil(u) + h.a.NotNil(u.DeletedAt) }