feat: soft-delete for teamer accounts
addresses #869dv9br3
This commit is contained in:
1 parent
388ecf9603
commit
d654ce77fb
45 files changed
+1151
-7
No files matched your search
@@ -52,6 +52,9 @@ class UserRepository extends ServiceEntityRepository
|
||||
));
|
||||
|
||||
return $qb
|
||||
// andWhere after a chain of orWhere yields "(... OR ...) AND ...", so this
|
||||
// narrows the whole list rather than widening it by one more alternative
|
||||
->andWhere($qb->expr()->isNull('u.deletedAt'))
|
||||
->orderBy('u.lastName', 'ASC')
|
||||
->getQuery()
|
||||
->getResult()
|
||||
@@ -82,6 +85,7 @@ class UserRepository extends ServiceEntityRepository
|
||||
|
||||
return $qb
|
||||
->andWhere('JSON_CONTAINS(user.roles, :role) = 1')
|
||||
->andWhere($qb->expr()->isNull('user.deletedAt'))
|
||||
->setParameter('role', json_encode($role))
|
||||
->getQuery()
|
||||
->getResult()
|
||||
@@ -98,6 +102,7 @@ class UserRepository extends ServiceEntityRepository
|
||||
$qb->expr()->like('user.firstName', ':search'),
|
||||
))
|
||||
->andWhere('JSON_CONTAINS(user.roles, :role) = 1')
|
||||
->andWhere($qb->expr()->isNull('user.deletedAt'))
|
||||
->orderBy('user.lastName', 'ASC')
|
||||
->addOrderBy('user.firstName', 'ASC')
|
||||
->setParameter('search', '%'.$this->escapeLikeWildcards($search).'%')
|
||||
|
||||
Reference in new issue
Block a user