Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArrayIterator
ArrayIterator committed Jul 14, 2024
1 parent fefb31b commit c73f1ee
Show file tree
Hide file tree
Showing 18 changed files with 106 additions and 109 deletions.
16 changes: 8 additions & 8 deletions Entities/Admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@
columns: ['identity_number', 'site_id']
)]
#[Index(
columns: ['username', 'status', 'role', 'first_name', 'last_name', 'site_id'],
name: 'index_username_status_role_first_name_last_name_site_id'
name: 'index_username_status_role_first_name_last_name_site_id',
columns: ['username', 'status', 'role', 'first_name', 'last_name', 'site_id']
)]
#[Index(
columns: ['attachment_id'],
name: 'relation_admins_attachment_id_attachments_id'
name: 'relation_admins_attachment_id_attachments_id',
columns: ['attachment_id']
)]
#[Index(
columns: ['role'],
name: 'relation_admins_role_roles_identity'
name: 'relation_admins_role_roles_identity',
columns: ['role']
)]
#[Index(
columns: ['site_id'],
name: 'relation_admins_site_id_sites_id'
name: 'relation_admins_site_id_sites_id',
columns: ['site_id']
)]
#[HasLifecycleCallbacks]
class Admin extends AbstractUser
Expand Down
10 changes: 5 additions & 5 deletions Entities/AdminLog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
]
)]
#[Index(
columns: ['user_id'],
name: 'relation_admin_logs_user_id_admins_id'
name: 'relation_admin_logs_user_id_admins_id',
columns: ['user_id']
)]
#[Index(
columns: ['user_id', 'name', 'type'],
name: 'index_user_id_name_type'
name: 'index_user_id_name_type',
columns: ['user_id', 'name', 'type']
)]
#[HasLifecycleCallbacks]
class AdminLog extends AbstractUserBasedLog
Expand All @@ -50,7 +50,7 @@ class AdminLog extends AbstractUserBasedLog
cascade: [
"persist",
"remove",
"merge",
// "merge",
"detach"
],
fetch: 'LAZY'
Expand Down
10 changes: 5 additions & 5 deletions Entities/AdminMeta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
]
)]
#[Index(
columns: ['name'],
name: 'index_name'
name: 'index_name',
columns: ['name']
)]
#[Index(
columns: ['user_id'],
name: 'relation_admin_meta_user_id_admins_id'
name: 'relation_admin_meta_user_id_admins_id',
columns: ['user_id']
)]
#[HasLifecycleCallbacks]
/**
Expand Down Expand Up @@ -74,7 +74,7 @@ class AdminMeta extends AbstractBasedMeta
cascade: [
"persist",
"remove",
"merge",
// "merge",
"detach"
],
fetch: 'EAGER'
Expand Down
14 changes: 7 additions & 7 deletions Entities/AdminOnlineActivity.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
]
)]
#[Index(
columns: ['updated_at'],
name: 'index_updated_at'
name: 'index_updated_at',
columns: ['updated_at']
)]
#[Index(
columns: ['user_id', 'name', 'created_at', 'updated_at'],
name: 'index_user_id_name_created_at_updated_at'
name: 'index_user_id_name_created_at_updated_at',
columns: ['user_id', 'name', 'created_at', 'updated_at']
)]
#[Index(
columns: ['user_id'],
name: 'relation_admin_online_activities_user_id_admins_id'
name: 'relation_admin_online_activities_user_id_admins_id',
columns: ['user_id']
)]
#[HasLifecycleCallbacks]
class AdminOnlineActivity extends AbstractBasedOnlineActivity
Expand All @@ -54,7 +54,7 @@ class AdminOnlineActivity extends AbstractBasedOnlineActivity
cascade: [
"persist",
"remove",
"merge",
// "merge",
"detach"
],
fetch: 'LAZY'
Expand Down
16 changes: 8 additions & 8 deletions Entities/Capability.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@
]
)]
#[Index(
columns: ['identity', 'site_id'],
name: 'index_identity_site_id'
name: 'index_identity_site_id',
columns: ['identity', 'site_id']
)]
#[Index(
columns: ['site_id'],
name: 'relation_capabilities_site_id_sites_id'
name: 'relation_capabilities_site_id_sites_id',
columns: ['site_id']
)]
#[Index(
columns: ['type'],
name: 'index_type'
name: 'index_type',
columns: ['type']
)]
#[HasLifecycleCallbacks]
class Capability extends AbstractEntity implements CapabilityEntityInterface
Expand Down Expand Up @@ -154,11 +154,11 @@ class Capability extends AbstractEntity implements CapabilityEntityInterface
* @var ?Collection<RoleCapability> $roleCapability
*/
#[OneToMany(
mappedBy: 'capability',
targetEntity: RoleCapability::class,
mappedBy: 'capability',
cascade: [
'detach',
'merge',
// "merge",
'persist',
'remove',
],
Expand Down
5 changes: 2 additions & 3 deletions Entities/Options.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use Doctrine\ORM\Mapping\JoinColumn;
use Doctrine\ORM\Mapping\ManyToOne;
use Doctrine\ORM\Mapping\Table;
use Doctrine\ORM\Mapping\UniqueConstraint;

/**
* @property-read string $name
Expand All @@ -34,8 +33,8 @@
]
)]
#[Index(
columns: ['site_id'],
name: 'relation_options_site_id_sites_id'
name: 'relation_options_site_id_sites_id',
columns: ['site_id']
)]
#[HasLifecycleCallbacks]
class Options extends AbstractEntity
Expand Down
13 changes: 6 additions & 7 deletions Entities/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
use Doctrine\ORM\Mapping\PrePersist;
use Doctrine\ORM\Mapping\PreUpdate;
use Doctrine\ORM\Mapping\Table;
use Doctrine\ORM\Mapping\UniqueConstraint;

#[Entity]
#[Table(
Expand All @@ -39,12 +38,12 @@
]
)]
#[Index(
columns: ['identity', 'site_id'],
name: 'index_identity_site_id'
name: 'index_identity_site_id',
columns: ['identity', 'site_id']
)]
#[Index(
columns: ['site_id'],
name: 'relation_roles_site_id_sites_id'
name: 'relation_roles_site_id_sites_id',
columns: ['site_id']
)]
#[HasLifecycleCallbacks]
/**
Expand Down Expand Up @@ -127,11 +126,11 @@ class Role extends AbstractEntity implements RoleInterface
protected ?Site $site = null;

#[OneToMany(
mappedBy: 'role',
targetEntity: RoleCapability::class,
mappedBy: 'role',
cascade: [
'detach',
'merge',
// "merge",
'persist',
'remove',
],
Expand Down
12 changes: 6 additions & 6 deletions Entities/RoleCapability.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
]
)]
#[Index(
columns: ['role_identity', 'site_id'],
name: 'relation_role_capabilities_identity_roles_identity_sites_id'
name: 'relation_role_capabilities_identity_roles_identity_sites_id',
columns: ['role_identity', 'site_id']
)]
#[Index(
columns: ['capability_identity', 'site_id'],
name: 'relation_roles_cap_cap_id_capabilities_identity_site_id'
name: 'relation_roles_cap_cap_id_capabilities_identity_site_id',
columns: ['capability_identity', 'site_id']
)]
#[HasLifecycleCallbacks]
class RoleCapability extends AbstractEntity
Expand Down Expand Up @@ -95,7 +95,7 @@ class RoleCapability extends AbstractEntity
cascade: [
"persist",
"remove",
"merge",
// "merge",
"detach"
],
fetch: 'LAZY'
Expand Down Expand Up @@ -132,7 +132,7 @@ class RoleCapability extends AbstractEntity
cascade: [
"persist",
"remove",
"merge",
// "merge",
"detach"
],
fetch: 'LAZY'
Expand Down
17 changes: 9 additions & 8 deletions Entities/Site.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@
columns: ['domain'],
)]
#[Index(
columns: ['user_id'],
name: 'relation_sites_user_id_admins_id'
name: 'relation_sites_user_id_admins_id',
columns: ['user_id']
)]
#[Index(
columns: ['domain', 'domain_alias'],
name: 'index_domain_domain_alias'
name: 'index_domain_domain_alias',
columns: ['domain', 'domain_alias']
)]
#[Index(
columns: ['name', 'domain', 'domain_alias', 'status'],
name: 'index_name_domain_domain_alias_status'
name: 'index_name_domain_domain_alias_status',
columns: ['name', 'domain', 'domain_alias', 'status']
)]
#[HasLifecycleCallbacks]
class Site extends AbstractEntity implements IdentityBasedEntityInterface, AvailabilityStatusEntityInterface
Expand Down Expand Up @@ -363,11 +363,12 @@ final public function isPostLoad(): bool
return $this->postLoad;
}

/** @noinspection PhpUnusedParameterInspection */
#[PostLoad]
final public function finalPostLoaded(PostLoadEventArgs $postLoadEventArgs): void
{
print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2));
exit;
// print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2));
// exit;
$this->postLoad = true;
}
}
26 changes: 12 additions & 14 deletions Entities/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,24 @@
columns: ['identity_number', 'site_id']
)]
#[Index(
columns: ['username', 'status', 'role', 'first_name', 'last_name', 'site_id'],
name: 'index_username_status_role_first_name_last_name_site_id'
name: 'index_username_status_role_first_name_last_name_site_id',
columns: ['username', 'status', 'role', 'first_name', 'last_name', 'site_id']
)]
#[Index(
columns: ['related_user_id'],
name: 'relation_users_related_user_id_users_id'
name: 'relation_users_related_user_id_users_id',
columns: ['related_user_id']
)]
#[Index(
columns: ['attachment_id'],
name: 'relation_users_attachment_id_user_attachments_id'
name: 'relation_users_attachment_id_user_attachments_id',
columns: ['attachment_id']
)]
#[Index(
columns: ['role'],
name: 'relation_users_role_roles_identity'
name: 'relation_users_role_roles_identity',
columns: ['role']
)]
#[Index(
columns: ['site_id'],
name: 'relation_users_site_id_sites_id'
name: 'relation_users_site_id_sites_id',
columns: ['site_id']
)]
#[HasLifecycleCallbacks]
class User extends AbstractUser
Expand Down Expand Up @@ -345,10 +345,8 @@ public function relationIdCheck(
->update($this::class, 'x')
->set('x.related_user_id', ':val')
->where('x.id = :id')
->setParameters([
'val' => null,
'id' => $this->getId(),
]);
->setParameter('val', null)
->setParameter('id', $this->getId());
$date = $this->getUpdatedAt();
/** @noinspection PhpConditionAlreadyCheckedInspection */
if ($date instanceof DateTimeInterface) {
Expand Down
10 changes: 5 additions & 5 deletions Entities/UserLog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
],
)]
#[Index(
columns: ['user_id'],
name: 'relation_user_logs_user_id_users_id'
name: 'relation_user_logs_user_id_users_id',
columns: ['user_id']
)]
#[Index(
columns: ['user_id', 'name', 'type'],
name: 'index_user_id_name_type'
name: 'index_user_id_name_type',
columns: ['user_id', 'name', 'type']
)]
#[HasLifecycleCallbacks]
class UserLog extends AbstractUserBasedLog
Expand All @@ -50,7 +50,7 @@ class UserLog extends AbstractUserBasedLog
cascade: [
"persist",
"remove",
"merge",
// "merge",
"detach"
],
fetch: 'LAZY'
Expand Down
10 changes: 5 additions & 5 deletions Entities/UserMeta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
]
)]
#[Index(
columns: ['name'],
name: 'index_name'
name: 'index_name',
columns: ['name']
)]
#[Index(
columns: ['user_id'],
name: 'relation_user_meta_user_id_users_id'
name: 'relation_user_meta_user_id_users_id',
columns: ['user_id']
)]
#[HasLifecycleCallbacks]
/**
Expand Down Expand Up @@ -74,7 +74,7 @@ class UserMeta extends AbstractBasedMeta
cascade: [
"persist",
"remove",
"merge",
// "merge",
"detach"
],
fetch: 'EAGER'
Expand Down
Loading

0 comments on commit c73f1ee

Please sign in to comment.