Compare commits
No commits in common. "7f882f2e71b045299c62630aff1388b4b8679372" and "1f32387f63f0eaa0b4e887553bd061efae7a9b36" have entirely different histories.
7f882f2e71
...
1f32387f63
@ -199,19 +199,7 @@ class CommunityController implements IAuthenticationRequired
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ($this->transactionRepository->isAnyCommon()) {
|
|
||||||
return new JsonContent([
|
|
||||||
'error' => ['errorText' => 'There are transactions with common payee!']
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
$user = $this->userRepository->getById(\Container::$request->post('user_id'));
|
$user = $this->userRepository->getById(\Container::$request->post('user_id'));
|
||||||
if ($this->communityMemberRepository->getByCommunityAndUser($community, $user) !== null) {
|
|
||||||
return new JsonContent([
|
|
||||||
'error' => ['errorText' => 'This user is already a member of this community.']
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
$communityMember = new CommunityMember();
|
$communityMember = new CommunityMember();
|
||||||
$communityMember->setCommunity($community);
|
$communityMember->setCommunity($community);
|
||||||
$communityMember->setUser($user);
|
$communityMember->setUser($user);
|
||||||
@ -307,16 +295,6 @@ class CommunityController implements IAuthenticationRequired
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->transactionRepository->isAnyForCurrency($currency)) {
|
|
||||||
return new JsonContent([
|
|
||||||
'error' => ['errorText' => 'There are transactions with this currency!']
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($this->currencyExchangeRatesRepository->getAllByCurrency($currency) as $currencyExchangeRate) {
|
|
||||||
\Container::$persistentDataManager->deleteFromDb($currencyExchangeRate);
|
|
||||||
}
|
|
||||||
|
|
||||||
\Container::$persistentDataManager->deleteFromDb($currency);
|
\Container::$persistentDataManager->deleteFromDb($currency);
|
||||||
|
|
||||||
return new JsonContent(['success' => true]);
|
return new JsonContent(['success' => true]);
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
use Container;
|
use Container;
|
||||||
use Generator;
|
use Generator;
|
||||||
use RVR\PersistentData\Model\Community;
|
use RVR\PersistentData\Model\Community;
|
||||||
use RVR\PersistentData\Model\Currency;
|
|
||||||
use RVR\PersistentData\Model\Transaction;
|
use RVR\PersistentData\Model\Transaction;
|
||||||
use RVR\PersistentData\Model\User;
|
use RVR\PersistentData\Model\User;
|
||||||
use SokoWeb\Database\Query\Select;
|
use SokoWeb\Database\Query\Select;
|
||||||
@ -37,22 +36,6 @@ class TransactionRepository
|
|||||||
return $select->count() > 0;
|
return $select->count() > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function isAnyCommon(): bool
|
|
||||||
{
|
|
||||||
$select = new Select(Container::$dbConnection, Transaction::getTable());
|
|
||||||
$select->where('payee_user_id', '=', null);
|
|
||||||
|
|
||||||
return $select->count() > 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function isAnyForCurrency(Currency $currency): bool
|
|
||||||
{
|
|
||||||
$select = new Select(Container::$dbConnection, Transaction::getTable());
|
|
||||||
$select->where('currency_id', '=', $currency->getId());
|
|
||||||
|
|
||||||
return $select->count() > 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getPagedByCommunity(Community $community, int $start, int $limit, bool $useRelations = false, array $withRelations = []): Generator
|
public function getPagedByCommunity(Community $community, int $start, int $limit, bool $useRelations = false, array $withRelations = []): Generator
|
||||||
{
|
{
|
||||||
$select = new Select(Container::$dbConnection);
|
$select = new Select(Container::$dbConnection);
|
||||||
|
Loading…
Reference in New Issue
Block a user