Commit 1b045c85 authored by Brian Hatchet's avatar Brian Hatchet :speech_balloon:

CR fixes

1 merge request!350WIP: Epic/permissions 28
Pipeline #88079097 passed with stages
in 10 minutes and 9 seconds
......@@ -50,7 +50,13 @@ class FeedSyncEntity implements JsonSerializable
/** @var Entity */
protected $entity;
public function setEntity($entity)
/**
* Setter for populating the child entity on feed sync items
* Some FeedSyncEntity managers populate the entity with the hydrated object
* Do not assume this is always called because you can easily
* Just have the header information stored in ES (without the entity)
*/
public function setEntity($entity) : FeedSyncEntity
{
$this->entity = $entity;
$this->accessId = $entity->getAccessId();
......@@ -70,7 +76,7 @@ class FeedSyncEntity implements JsonSerializable
return [
'guid' => (string) $this->guid,
'owner_guid' => (string) $this->ownerGuid,
'access_id' => $this->accessId,
'access_id' => (int) $this->accessId,
'timestamp' => $this->timestamp,
'urn' => $this->urn,
'type' => $this->type,
......
......@@ -39,8 +39,6 @@ class Permissions implements \JsonSerializable
$this->entitiesBuilder = $entitiesBuilder ?: Di::_()->get('EntitiesBuilder');
$this->roles = $roles ?: new Roles();
$this->user = $user;
$this->groups = [];
$this->channels = [];
$this->entities = [];
$this->roles = $roles ?: new Roles();
$this->user = $user;
......
......@@ -1497,14 +1497,6 @@ CREATE TABLE minds.moderation_summons (
ALTER TABLE minds.views ADD owner_guid text;
CREATE TABLE minds.subscription_requests (
publisher_guid bigint,
subscriber_guid bigint,
timestamp timestamp,
declined boolean,
PRIMARY KEY (publisher_guid, subscriber_guid)
);
CREATE TABLE minds.pro (
user_guid bigint,
domain text,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment