espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename subscription table

Browse Source
This commit is contained in:
Yuri Kuznetsov
2024-05-21 14:28:09 +03:00
parent c0ac579b7f
commit 15860096d3
10 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Classes/Cleanup/Subscribers.php
+2 -2
View File
@@ -33,7 +33,7 @@ use Espo\Core\Cleanup\Cleanup;
use Espo\Core\Field\DateTime;
use Espo\Core\Utils\Config;
use Espo\Core\Utils\Metadata;
use Espo\Entities\Subscription;
use Espo\Entities\StreamSubscription;
use Espo\ORM\EntityManager;
use Espo\ORM\Query\Part\Condition as Cond;
@@ -97,7 +97,7 @@ class Subscribers implements Cleanup
$query = $this->entityManager
->getQueryBuilder()
->delete()
->from(Subscription::ENTITY_TYPE, 'subscription')
->from(StreamSubscription::ENTITY_TYPE, 'subscription')
->join(
$entityType,
'entity',
application/Espo/Core/Select/Bool/Filters/Followed.php
+2 -2
View File
@@ -30,7 +30,7 @@
namespace Espo\Core\Select\Bool\Filters;
use Espo\Core\Select\Bool\Filter;
use Espo\Entities\Subscription;
use Espo\Entities\StreamSubscription;
use Espo\Entities\User;
use Espo\ORM\Query\Part\Where\OrGroupBuilder;
use Espo\ORM\Query\Part\WhereClause;
@@ -46,7 +46,7 @@ class Followed implements Filter
$alias = 'subscriptionFollowedBoolFilter';
$queryBuilder->leftJoin(
Subscription::ENTITY_TYPE,
StreamSubscription::ENTITY_TYPE,
$alias,
[
$alias . '.entityType' => $this->entityType,
application/Espo/Core/Select/Primary/Filters/Followed.php
+2 -1
View File
@@ -30,6 +30,7 @@
namespace Espo\Core\Select\Primary\Filters;
use Espo\Core\Select\Primary\Filter;
use Espo\Entities\StreamSubscription;
use Espo\Entities\User;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
@@ -43,7 +44,7 @@ class Followed implements Filter
$alias = 'subscriptionFollowedPrimaryFilter';
$queryBuilder->join(
'Subscription',
StreamSubscription::ENTITY_TYPE,
$alias,
[
$alias . '.entityType' => $this->entityType,
application/Espo/Core/Select/SelectManager.php
+3 -2
View File
@@ -40,6 +40,7 @@ use Espo\Core\Utils\Config;
use Espo\Core\Utils\FieldUtil;
use Espo\Core\Utils\Metadata;
use Espo\Entities\StreamSubscription;
use Espo\ORM\Entity;
use Espo\ORM\Query\Select as SelectQuery;
use Espo\ORM\QueryComposer\BaseQueryComposer as QueryComposer;
@@ -2740,7 +2741,7 @@ class SelectManager
protected function filterFollowed(&$result)
{
$this->addJoin([
'Subscription',
StreamSubscription::ENTITY_TYPE,
'subscription',
[
'subscription.entityType' => $this->getEntityType(),
@@ -2753,7 +2754,7 @@ class SelectManager
protected function boolFilterFollowed(&$result)
{
$this->addLeftJoin([
'Subscription',
StreamSubscription::ENTITY_TYPE,
'subscription',
[
'subscription.entityType' => $this->getEntityType(),
application/Espo/Core/Upgrades/Migrations/V8_3/AfterUpgrade.php
+32 -1
View File
@@ -29,9 +29,11 @@
namespace Espo\Core\Upgrades\Migrations\V8_3;
use Doctrine\DBAL\Exception as DbalException;
use Espo\Core\Templates\Entities\Event;
use Espo\Core\Upgrades\Migration\Script;
use Espo\Core\Utils\Config;
use Espo\Core\Utils\Database\Helper;
use Espo\Core\Utils\Metadata;
use Espo\Entities\AuthenticationProvider;
use Espo\Entities\Role;
@@ -44,14 +46,19 @@ class AfterUpgrade implements Script
public function __construct(
private EntityManager $entityManager,
private Metadata $metadata,
private Config $config
private Config $config,
private Helper $helper
) {}
/**
* @throws DbalException
*/
public function run(): void
{
$this->updateRoles();
$this->updateMetadata();
$this->updateAuthenticationProviders();
$this->renameSubscription();
}
private function updateRoles(): void
@@ -114,4 +121,28 @@ class AfterUpgrade implements Script
$this->entityManager->saveEntity($entity);
}
}
/**
* @throws DbalException
*/
private function renameSubscription(): void
{
$connection = $this->helper->getDbalConnection();
$schemaManager = $connection->createSchemaManager();
if (!$schemaManager->tablesExist('subscription')) {
return;
}
if ($schemaManager->tablesExist('stream_subscription')) {
try {
$schemaManager->dropTable('stream_subscription');
}
catch (DbalException) {
$schemaManager->renameTable('stream_subscription', 'stream_subscription_waste');
}
}
$schemaManager->renameTable('subscription', 'stream_subscription');
}
}
application/Espo/Entities/Subscription.php → application/Espo/Entities/StreamSubscription.php
+2 -2
View File
@@ -31,7 +31,7 @@ namespace Espo\Entities;
use Espo\Core\ORM\Entity;
class Subscription extends Entity
class StreamSubscription extends Entity
{
public const ENTITY_TYPE = 'Subscription';
public const ENTITY_TYPE = 'StreamSubscription';
}
application/Espo/Resources/metadata/entityDefs/Subscription.json → application/Espo/Resources/metadata/entityDefs/StreamSubscription.json
View File
application/Espo/Resources/metadata/scopes/Subscription.json → application/Espo/Resources/metadata/scopes/StreamSubscription.json
View File
application/Espo/Tools/Stream/Service.php
+11 -11
View File
@@ -32,7 +32,7 @@ namespace Espo\Tools\Stream;
use Espo\Core\Field\LinkParent;
use Espo\Core\ORM\Repository\Option\SaveOption;
use Espo\Core\ORM\Type\FieldType;
use Espo\Entities\Subscription;
use Espo\Entities\StreamSubscription;
use Espo\Modules\Crm\Entities\Account;
use Espo\Repositories\EmailAddress as EmailAddressRepository;
@@ -165,7 +165,7 @@ class Service
}
return (bool) $this->entityManager
->getRDBRepository(Subscription::ENTITY_TYPE)
->getRDBRepository(StreamSubscription::ENTITY_TYPE)
->select(['id'])
->where([
'userId' => $userId,
@@ -240,7 +240,7 @@ class Service
$delete = $this->entityManager->getQueryBuilder()
->delete()
->from(Subscription::ENTITY_TYPE)
->from(StreamSubscription::ENTITY_TYPE)
->where([
'userId' => $userIdList,
'entityId' => $entity->getId(),
@@ -253,7 +253,7 @@ class Service
$collection = new EntityCollection();
foreach ($userIdList as $userId) {
$subscription = $this->entityManager->getNewEntity(Subscription::ENTITY_TYPE);
$subscription = $this->entityManager->getNewEntity(StreamSubscription::ENTITY_TYPE);
$subscription->set([
'userId' => $userId,
@@ -305,7 +305,7 @@ class Service
return true;
}
$this->entityManager->createEntity(Subscription::ENTITY_TYPE, [
$this->entityManager->createEntity(StreamSubscription::ENTITY_TYPE, [
'entityId' => $entity->getId(),
'entityType' => $entity->getEntityType(),
'userId' => $userId,
@@ -322,7 +322,7 @@ class Service
$delete = $this->entityManager->getQueryBuilder()
->delete()
->from(Subscription::ENTITY_TYPE)
->from(StreamSubscription::ENTITY_TYPE)
->where([
'userId' => $userId,
'entityId' => $entity->getId(),
@@ -343,7 +343,7 @@ class Service
$delete = $this->entityManager->getQueryBuilder()
->delete()
->from(Subscription::ENTITY_TYPE)
->from(StreamSubscription::ENTITY_TYPE)
->where([
'entityId' => $entity->getId(),
'entityType' => $entity->getEntityType(),
@@ -978,7 +978,7 @@ class Service
->getRDBRepository(User::ENTITY_TYPE)
->select(['id'])
->join(
Subscription::ENTITY_TYPE,
StreamSubscription::ENTITY_TYPE,
'subscription',
[
'subscription.userId=:' => 'user.id',
@@ -1021,7 +1021,7 @@ class Service
}
$builder->join(
Subscription::ENTITY_TYPE,
StreamSubscription::ENTITY_TYPE,
'subscription',
[
'subscription.userId=:' => 'user.id',
@@ -1069,7 +1069,7 @@ class Service
->getRDBRepository(User::ENTITY_TYPE)
->select(['id', 'name'])
->join(
Subscription::ENTITY_TYPE,
StreamSubscription::ENTITY_TYPE,
'subscription',
[
'subscription.userId=:' => 'user.id',
@@ -1126,7 +1126,7 @@ class Service
$builder = $this->entityManager
->getQueryBuilder()
->select()
->from(Subscription::ENTITY_TYPE)
->from(StreamSubscription::ENTITY_TYPE)
->select('userId')
->where([
'entityId' => $parentId,
application/Espo/Tools/Stream/UserRecordService.php
+4 -4
View File
@@ -35,7 +35,7 @@ use Espo\Core\Exceptions\NotFound;
use Espo\Core\Select\SearchParams;
use Espo\Modules\Crm\Entities\Account;
use Espo\ORM\EntityManager;
use Espo\Entities\Subscription;
use Espo\Entities\StreamSubscription;
use Espo\Entities\User;
use Espo\Entities\Note;
use Espo\Entities\Email;
@@ -317,7 +317,7 @@ class UserRecordService
$builder
->join(
Subscription::ENTITY_TYPE,
StreamSubscription::ENTITY_TYPE,
'subscription',
[
'entityType:' => 'parentType',
@@ -371,7 +371,7 @@ class UserRecordService
$builder
->join(
Subscription::ENTITY_TYPE,
StreamSubscription::ENTITY_TYPE,
'subscription',
[
// Improves performance significantly.
@@ -383,7 +383,7 @@ class UserRecordService
)
// NOT EXISTS sub-query would perform very slow.
->leftJoin(
Subscription::ENTITY_TYPE,
StreamSubscription::ENTITY_TYPE,
'subscriptionExclude',
[
'entityType:' => 'parentType',