Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-12 07:44:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixups

Browse source
This commit is contained in:
Philipp 2021-10-10 22:45:25 +02:00
parent 7061e16b27
commit f273c27e3b
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
7 changed files with 99 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Profile/ProfileField/Depository/ProfileField.php
View file

@ -30,6 +30,7 @@ use Friendica\Profile\ProfileField\Factory;
use Friendica\Profile\ProfileField\Entity;
use Friendica\Profile\ProfileField\Collection;
use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository;
use Friendica\Util\DateTimeFormat;
use Psr\Log\LoggerInterface;
class ProfileField extends BaseDepository
@ -46,7 +47,7 @@ class ProfileField extends BaseDepository
{
parent::__construct($database, $logger, $factory);
$this->permissionSetDepository = permissionSetDepository;
$this->permissionSetDepository = $permissionSetDepository;
}
/**
@ -91,11 +92,13 @@ class ProfileField extends BaseDepository
protected function convertToTableRow(Entity\ProfileField $profileField): array
{
return [
'uid' => $profileField->uid,
'label' => $profileField->label,
'value' => $profileField->value,
'order' => $profileField->order,
'created' => $profileField->created,
'edited' => $profileField->edited,
'created' => $profileField->created->format(DateTimeFormat::MYSQL),
'edited' => $profileField->edited->format(DateTimeFormat::MYSQL),
'psid' => $profileField->permissionSetId
];
}
@ -205,7 +208,7 @@ class ProfileField extends BaseDepository
try {
if ($profileField->id) {
$this->db->update(self::$table_name, $fields, ['id' => $profileField]);
$this->db->update(self::$table_name, $fields, ['id' => $profileField->id]);
} else {
$this->db->insert(self::$table_name, $fields);
@ -233,7 +236,7 @@ class ProfileField extends BaseDepository
// Update the order based on the new Profile Field Collection
$order = 0;
$labelProfileFieldsOld = $profileFieldsOld->column('id', 'label');
$labelProfileFieldsOld = array_flip($profileFieldsOld->column('label'));
foreach ($profileFields as $profileField) {
// Update existing field (preserve

15
src/Profile/ProfileField/Entity/ProfileField.php
View file

@ -58,7 +58,7 @@ class ProfileField extends BaseEntity
/** @var int */
protected $order;
/** @var int */
protected $psid;
protected $permissionSetId;
/** @var string */
protected $label;
/** @var string */
@ -68,6 +68,9 @@ class ProfileField extends BaseEntity
/** @var \DateTime */
protected $edited;
/**
* @throws UnexpectedPermissionSetException In case no Permission Set can be retrieved
*/
public function __construct(PermissionSetDepository $permissionSetDepository, int $uid, int $order, int $permissionSetId, string $label, string $value, \DateTime $created, \DateTime $edited, int $id = null, PermissionSet $permissionSet = null)
{
$this->permissionSetDepository = $permissionSetDepository;
@ -75,12 +78,16 @@ class ProfileField extends BaseEntity
$this->uid = $uid;
$this->order = $order;
$this->psid = $permissionSetId;
$this->permissionSetId = $permissionSetId ?? ($permissionSet ? $permissionSet->id : null);
$this->label = $label;
$this->value = $value;
$this->created = $created;
$this->edited = $edited;
$this->id = $id;
if (is_null($this->permissionSetId)) {
throw new UnexpectedPermissionSetException('Either set the permission set ID or the permission set itself');
}
}
/**
@ -93,7 +100,7 @@ class ProfileField extends BaseEntity
case 'permissionSet':
if (empty($this->permissionSet)) {
try {
$permissionSet = $this->permissionSetDepository->selectOneById($this->psid, $this->uid);
$permissionSet = $this->permissionSetDepository->selectOneById($this->permissionSetId, $this->uid);
if ($permissionSet->uid !== $this->uid) {
throw new UnexpectedPermissionSetException(sprintf('PermissionSet %d (user-id: %d) for ProfileField %d (user-id: %d) is invalid.', $permissionSet->id, $permissionSet->uid, $this->id, $this->uid));
}
@ -130,7 +137,7 @@ class ProfileField extends BaseEntity
$this->value = $value;
$this->order = $order;
$this->permissionSet = $permissionSet;
$this->psid = $permissionSet->id;
$this->permissionSetId = $permissionSet->id;
$this->edited = new \DateTime('now', new \DateTimeZone('UTC'));
}