FOUR-31145: Self Service tasks not visible to users in assigned subgroups#9022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rodriquelca wants to merge 1 commit into
base:develop
Choose a base branch
from
Open

FOUR-31145: Self Service tasks not visible to users in assigned subgroups #9022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions ProcessMaker/Models/Group.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Models;

use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Validation\Rule;
use ProcessMaker\Models\EmptyModel;
use ProcessMaker\Query\Traits\PMQL;
Expand DownExpand Up@@ -156,4 +158,63 @@ public function assigned()
{
return $this->morphMany(ProcessTaskAssignment::class, 'assigned', 'assignment_type', 'assignment_id');
}

/**
* Parent group IDs for the given groups (one walk up, not one query per group).
*/
public static function ancestorIdsFor(iterable $groupIds): Collection
{
$ids = collect($groupIds)->filter()->map(fn ($id) => (int) $id)->unique()->values();
if ($ids->isEmpty()) {
return collect();
}

return collect(static::computeAncestorIds($ids->all()));
}

public const SELF_SERVICE_HIERARCHY_VERSION_KEY = 'self_service:hierarchy_version';

public static function selfServiceHierarchyVersion(): int
{
return (int) Cache::get(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
}

public static function bumpSelfServiceHierarchyVersion(): void
{
if (!Cache::has(self::SELF_SERVICE_HIERARCHY_VERSION_KEY)) {
Cache::forever(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
}
Cache::increment(self::SELF_SERVICE_HIERARCHY_VERSION_KEY);
}

/**
* @return array<int>
*/
private static function computeAncestorIds(array $groupIds): array
{
$ancestors = [];
$queue = $groupIds;
$visited = array_fill_keys($groupIds, true);

while ($queue) {
$parents = GroupMember::query()
->where('member_type', self::class)
->whereIn('member_id', $queue)
->pluck('group_id')
->all();

$queue = [];
foreach ($parents as $parentId) {
$parentId = (int) $parentId;
if (isset($visited[$parentId])) {
continue;
}
$visited[$parentId] = true;
$ancestors[] = $parentId;
$queue[] = $parentId;
}
}

return $ancestors;
}
}
5 changes: 3 additions & 2 deletions ProcessMaker/Models/ProcessMakerModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,9 @@ public function scopeExclude($query, array $columns)
}

$columnsToShow = array_diff($this->getTableColumns(), $columns);
$columnsToShow = array_map(function ($column) {
return $this->table . '.' . $column;
$table = $this->getTable();
$columnsToShow = array_map(function ($column) use ($table) {
return $table . '.' . $column;
}, $columnsToShow);

return $query->select($columnsToShow);
Expand Down
44 changes: 37 additions & 7 deletions ProcessMaker/Models/User.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,10 @@ class User extends Authenticatable implements HasMedia
// Session key to save request ids that the user started
public const REQUESTS_SESSION_KEY = 'web-entry-request-ids';

public const SELF_SERVICE_GROUP_IDS_CACHE_PREFIX = 'self_service:user_group_ids:';

public const SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES = 10;

/**
* The attributes that are mass assignable.
*
Expand DownExpand Up@@ -449,15 +453,13 @@ public function canSelfServe(ProcessRequestToken $task)
return true;
} elseif (array_key_exists('groups', $task->self_service_groups)) {
return collect($task->self_service_groups['groups'])
->intersect(
$this->groups()->pluck('groups.id')
)->count() > 0;
->intersect($this->selfServiceGroupIds())
->count() > 0;
} else {
// For older processes
return collect($task->self_service_groups)
->intersect(
$this->groups()->pluck('groups.id')
)->count() > 0;
->intersect($this->selfServiceGroupIds())
->count() > 0;
}
}

Expand All@@ -466,9 +468,37 @@ public function removeFromGroups()
$this->groups()->detach();
}

/**
* Direct group IDs plus ancestor groups. Cached per user; skipped on inbox repeats.
*/
public function selfServiceGroupIds()
{
$key = $this->selfServiceGroupIdsCacheKey();

return collect(Cache::remember($key, now()->addMinutes(self::SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES), function () {
$direct = $this->groups()->pluck('groups.id');
if ($direct->isEmpty()) {
return [];
}

return $direct->merge(Group::ancestorIdsFor($direct))->unique()->values()->all();
}));
}

public static function flushSelfServiceGroupIdsCache(int $userId): void
{
$version = Group::selfServiceHierarchyVersion();
Cache::forget(self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $userId . ':' . $version);
}

private function selfServiceGroupIdsCacheKey(): string
{
return self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $this->id . ':' . Group::selfServiceHierarchyVersion();
}

public function availableSelfServiceTasksQuery()
{
$groupIds = $this->groups()->pluck('groups.id');
$groupIds = $this->selfServiceGroupIds();

$taskQuery = ProcessRequestToken::select(['process_request_tokens.id'])
->where([
Expand Down
22 changes: 22 additions & 0 deletions ProcessMaker/Observers/GroupMemberObserver.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Events\GroupMembershipChanged;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\User;

class GroupMemberObserver
{
Expand All@@ -14,6 +15,8 @@ class GroupMemberObserver
*/
public function created(GroupMember $groupMember): void
{
$this->invalidateSelfServiceGroupCache($groupMember);

// Only handle group-to-group relationships, not user-to-group
if ($groupMember->member_type === Group::class) {
$group = Group::find($groupMember->member_id);
Expand All@@ -32,6 +35,8 @@ public function created(GroupMember $groupMember): void
*/
public function updated(GroupMember $groupMember): void
{
$this->invalidateSelfServiceGroupCache($groupMember);

// Only handle group-to-group relationships, not user-to-group
if ($groupMember->member_type === Group::class) {
$group = Group::find($groupMember->member_id);
Expand All@@ -50,6 +55,8 @@ public function updated(GroupMember $groupMember): void
*/
public function deleted(GroupMember $groupMember): void
{
$this->invalidateSelfServiceGroupCache($groupMember);

// Only handle group-to-group relationships, not user-to-group
if ($groupMember->member_type === Group::class) {
$group = Group::find($groupMember->member_id);
Expand All@@ -68,6 +75,8 @@ public function deleted(GroupMember $groupMember): void
*/
public function restored(GroupMember $groupMember): void
{
$this->invalidateSelfServiceGroupCache($groupMember);

// Only handle group-to-group relationships, not user-to-group
if ($groupMember->member_type === Group::class) {
$group = Group::find($groupMember->member_id);
Expand All@@ -80,4 +89,17 @@ public function restored(GroupMember $groupMember): void
}
}
}

private function invalidateSelfServiceGroupCache(GroupMember $groupMember): void
{
if ($groupMember->member_type === Group::class) {
Group::bumpSelfServiceHierarchyVersion();

return;
}

if ($groupMember->member_type === User::class) {
User::flushSelfServiceGroupIdsCache((int) $groupMember->member_id);
}
}
}
162 changes: 162 additions & 0 deletions tests/Feature/SelfServiceSubgroupTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
<?php

declare(strict_types=1);

namespace Tests\Feature;

use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\User;
use Tests\TestCase;

class SelfServiceSubgroupTest extends TestCase
{
use RefreshDatabase;

public function test_subgroup_member_sees_and_can_claim_parent_group_self_service_task(): void
{
[$parent, $subgroup, $nestedUser, $directUser, $outsider] = $this->createNestedGroups();

$task = ProcessRequestToken::factory()->create([
'is_self_service' => true,
'status' => 'ACTIVE',
'user_id' => null,
'self_service_groups' => ['groups' => [$parent->id]],
]);

$this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());
$this->assertContains($task->id, $directUser->availableSelfServiceTaskIds());
$this->assertNotContains($task->id, $outsider->availableSelfServiceTaskIds());

Auth::login($nestedUser);
$this->assertTrue($nestedUser->canSelfServe($task));

Auth::login($directUser);
$this->assertTrue($directUser->canSelfServe($task));

Auth::login($outsider);
$this->assertFalse($outsider->canSelfServe($task));

$this->assertContains($parent->id, $nestedUser->selfServiceGroupIds());
$this->assertNotContains($subgroup->id, $outsider->selfServiceGroupIds());
}

public function test_two_level_nested_subgroup_member_sees_self_service_task(): void
{
$parent = Group::factory()->create();
$child = Group::factory()->create();
$grandchild = Group::factory()->create();
$user = User::factory()->create();

GroupMember::factory()->create([
'group_id' => $parent->id,
'member_id' => $child->id,
'member_type' => Group::class,
]);
GroupMember::factory()->create([
'group_id' => $child->id,
'member_id' => $grandchild->id,
'member_type' => Group::class,
]);
$user->groups()->attach($grandchild);

$task = ProcessRequestToken::factory()->create([
'is_self_service' => true,
'status' => 'ACTIVE',
'user_id' => null,
'self_service_groups' => ['groups' => [(string) $parent->id]],
]);

$this->assertContains($task->id, $user->availableSelfServiceTaskIds());
Auth::login($user);
$this->assertTrue($user->canSelfServe($task));
}

public function test_removing_subgroup_from_parent_drops_cached_self_service_visibility(): void
{
[$parent, $subgroup, $nestedUser] = $this->createNestedGroups();

$task = ProcessRequestToken::factory()->create([
'is_self_service' => true,
'status' => 'ACTIVE',
'user_id' => null,
'self_service_groups' => ['groups' => [$parent->id]],
]);

$this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());

GroupMember::where('group_id', $parent->id)
->where('member_id', $subgroup->id)
->where('member_type', Group::class)
->first()
->delete();

$this->assertNotContains($task->id, $nestedUser->fresh()->availableSelfServiceTaskIds());
}

public function test_exclude_qualifies_columns_with_the_model_table(): void
{
$task = ProcessRequestToken::factory()->create([
'element_type' => 'task',
]);

$found = ProcessRequestToken::exclude(['data'])->find($task->id);

$this->assertNotNull($found);
$this->assertSame($task->id, $found->id);
$this->assertStringContainsString(
'`process_request_tokens`.`id`',
ProcessRequestToken::exclude(['data'])->toSql()
);
}

public function test_subgroup_member_sees_parent_self_service_task_on_tasks_index(): void
{
[$parent, , $nestedUser] = $this->createNestedGroups();

$task = ProcessRequestToken::factory()->create([
'is_self_service' => true,
'status' => 'ACTIVE',
'user_id' => null,
'element_type' => 'task',
'self_service_groups' => ['groups' => [(string) $parent->id], 'users' => []],
]);

$response = $this->actingAs($nestedUser, 'api')->getJson(route('api.tasks.index', [
'pmql' => '(status = "Self Service")',
'per_page' => 15,
'order_by' => 'ID',
'order_direction' => 'DESC',
'non_system' => true,
'processesIManage' => false,
]));

$response->assertOk();
$this->assertContains($task->id, collect($response->json('data'))->pluck('id'));
}

/**
* @return array{0: Group, 1: Group, 2: User, 3: User, 4: User}
*/
private function createNestedGroups(): array
{
$parent = Group::factory()->create(['name' => 'Main']);
$subgroup = Group::factory()->create(['name' => 'Sub']);
$nestedUser = User::factory()->create();
$directUser = User::factory()->create();
$outsider = User::factory()->create();

GroupMember::factory()->create([
'group_id' => $parent->id,
'member_id' => $subgroup->id,
'member_type' => Group::class,
]);
$nestedUser->groups()->attach($subgroup);
$directUser->groups()->attach($parent);

return [$parent, $subgroup, $nestedUser, $directUser, $outsider];
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
FOUR-31145: Self Service tasks not visible to users in assigned subgroups#9022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

rodriquelca
wants to merge
1
commit into

base:develop
Choose a base branch

from

 Open


FOUR-31145: Self Service tasks not visible to users in assigned subgroups
#9022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 61 additions & 0 deletions
ProcessMaker/Models/Group.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Models;

use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Validation\Rule;
use ProcessMaker\Models\EmptyModel;
use ProcessMaker\Query\Traits\PMQL;
Expand DownExpand Up@@ -156,4 +158,63 @@ public function assigned()
 {
 return $this->morphMany(ProcessTaskAssignment::class, 'assigned', 'assignment_type', 'assignment_id');
 }

 /**
 * Parent group IDs for the given groups (one walk up, not one query per group).
 */
 public static function ancestorIdsFor(iterable $groupIds): Collection
 {
 $ids = collect($groupIds)->filter()->map(fn ($id) => (int) $id)->unique()->values();
 if ($ids->isEmpty()) {
 return collect();
 }

 return collect(static::computeAncestorIds($ids->all()));
 }

 public const SELF_SERVICE_HIERARCHY_VERSION_KEY = 'self_service:hierarchy_version';

 public static function selfServiceHierarchyVersion(): int
 {
 return (int) Cache::get(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }

 public static function bumpSelfServiceHierarchyVersion(): void
 {
 if (!Cache::has(self::SELF_SERVICE_HIERARCHY_VERSION_KEY)) {
 Cache::forever(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }
 Cache::increment(self::SELF_SERVICE_HIERARCHY_VERSION_KEY);
 }

 /**
 * @return array<int>
 */
 private static function computeAncestorIds(array $groupIds): array
 {
 $ancestors = [];
 $queue = $groupIds;
 $visited = array_fill_keys($groupIds, true);

 while ($queue) {
 $parents = GroupMember::query()
 ->where('member_type', self::class)
 ->whereIn('member_id', $queue)
 ->pluck('group_id')
 ->all();

 $queue = [];
 foreach ($parents as $parentId) {
 $parentId = (int) $parentId;
 if (isset($visited[$parentId])) {
 continue;
 }
 $visited[$parentId] = true;
 $ancestors[] = $parentId;
 $queue[] = $parentId;
 }
 }

 return $ancestors;
 }
}

5 changes: 3 additions & 2 deletions
ProcessMaker/Models/ProcessMakerModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,9 @@ public function scopeExclude($query, array $columns)
 }

 $columnsToShow = array_diff($this->getTableColumns(), $columns);
 $columnsToShow = array_map(function ($column) {
 return $this->table . '.' . $column;
 $table = $this->getTable();
 $columnsToShow = array_map(function ($column) use ($table) {
 return $table . '.' . $column;
 }, $columnsToShow);

 return $query->select($columnsToShow);
Expand Down

44 changes: 37 additions & 7 deletions
ProcessMaker/Models/User.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,10 @@ class User extends Authenticatable implements HasMedia
 // Session key to save request ids that the user started
 public const REQUESTS_SESSION_KEY = 'web-entry-request-ids';

 public const SELF_SERVICE_GROUP_IDS_CACHE_PREFIX = 'self_service:user_group_ids:';

 public const SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES = 10;

 /**
 * The attributes that are mass assignable.
 *
Expand DownExpand Up@@ -449,15 +453,13 @@ public function canSelfServe(ProcessRequestToken $task)
 return true;
 } elseif (array_key_exists('groups', $task->self_service_groups)) {
 return collect($task->self_service_groups['groups'])
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 } else {
 // For older processes
 return collect($task->self_service_groups)
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 }
 }

Expand All@@ -466,9 +468,37 @@ public function removeFromGroups()
 $this->groups()->detach();
 }

 /**
 * Direct group IDs plus ancestor groups. Cached per user; skipped on inbox repeats.
 */
 public function selfServiceGroupIds()
 {
 $key = $this->selfServiceGroupIdsCacheKey();

 return collect(Cache::remember($key, now()->addMinutes(self::SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES), function () {
 $direct = $this->groups()->pluck('groups.id');
 if ($direct->isEmpty()) {
 return [];
 }

 return $direct->merge(Group::ancestorIdsFor($direct))->unique()->values()->all();
 }));
 }

 public static function flushSelfServiceGroupIdsCache(int $userId): void
 {
 $version = Group::selfServiceHierarchyVersion();
 Cache::forget(self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $userId . ':' . $version);
 }

 private function selfServiceGroupIdsCacheKey(): string
 {
 return self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $this->id . ':' . Group::selfServiceHierarchyVersion();
 }

 public function availableSelfServiceTasksQuery()
 {
 $groupIds = $this->groups()->pluck('groups.id');
 $groupIds = $this->selfServiceGroupIds();

 $taskQuery = ProcessRequestToken::select(['process_request_tokens.id'])
 ->where([
Expand Down

22 changes: 22 additions & 0 deletions
ProcessMaker/Observers/GroupMemberObserver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Events\GroupMembershipChanged;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\User;

class GroupMemberObserver
{
Expand All@@ -14,6 +15,8 @@ class GroupMemberObserver
 */
 public function created(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -32,6 +35,8 @@ public function created(GroupMember $groupMember): void
 */
 public function updated(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -50,6 +55,8 @@ public function updated(GroupMember $groupMember): void
 */
 public function deleted(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -68,6 +75,8 @@ public function deleted(GroupMember $groupMember): void
 */
 public function restored(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -80,4 +89,17 @@ public function restored(GroupMember $groupMember): void
 }
 }
 }

 private function invalidateSelfServiceGroupCache(GroupMember $groupMember): void
 {
 if ($groupMember->member_type === Group::class) {
 Group::bumpSelfServiceHierarchyVersion();

 return;
 }

 if ($groupMember->member_type === User::class) {
 User::flushSelfServiceGroupIdsCache((int) $groupMember->member_id);
 }
 }
}

162 changes: 162 additions & 0 deletions
tests/Feature/SelfServiceSubgroupTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
<?php

declare(strict_types=1);

namespace Tests\Feature;

use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\User;
use Tests\TestCase;

class SelfServiceSubgroupTest extends TestCase
{
 use RefreshDatabase;

 public function test_subgroup_member_sees_and_can_claim_parent_group_self_service_task(): void
 {
 [$parent, $subgroup, $nestedUser, $directUser, $outsider] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());
 $this->assertContains($task->id, $directUser->availableSelfServiceTaskIds());
 $this->assertNotContains($task->id, $outsider->availableSelfServiceTaskIds());

 Auth::login($nestedUser);
 $this->assertTrue($nestedUser->canSelfServe($task));

 Auth::login($directUser);
 $this->assertTrue($directUser->canSelfServe($task));

 Auth::login($outsider);
 $this->assertFalse($outsider->canSelfServe($task));

 $this->assertContains($parent->id, $nestedUser->selfServiceGroupIds());
 $this->assertNotContains($subgroup->id, $outsider->selfServiceGroupIds());
 }

 public function test_two_level_nested_subgroup_member_sees_self_service_task(): void
 {
 $parent = Group::factory()->create();
 $child = Group::factory()->create();
 $grandchild = Group::factory()->create();
 $user = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $child->id,
 'member_type' => Group::class,
 ]);
 GroupMember::factory()->create([
 'group_id' => $child->id,
 'member_id' => $grandchild->id,
 'member_type' => Group::class,
 ]);
 $user->groups()->attach($grandchild);

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [(string) $parent->id]],
 ]);

 $this->assertContains($task->id, $user->availableSelfServiceTaskIds());
 Auth::login($user);
 $this->assertTrue($user->canSelfServe($task));
 }

 public function test_removing_subgroup_from_parent_drops_cached_self_service_visibility(): void
 {
 [$parent, $subgroup, $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());

 GroupMember::where('group_id', $parent->id)
 ->where('member_id', $subgroup->id)
 ->where('member_type', Group::class)
 ->first()
 ->delete();

 $this->assertNotContains($task->id, $nestedUser->fresh()->availableSelfServiceTaskIds());
 }

 public function test_exclude_qualifies_columns_with_the_model_table(): void
 {
 $task = ProcessRequestToken::factory()->create([
 'element_type' => 'task',
 ]);

 $found = ProcessRequestToken::exclude(['data'])->find($task->id);

 $this->assertNotNull($found);
 $this->assertSame($task->id, $found->id);
 $this->assertStringContainsString(
 '`process_request_tokens`.`id`',
 ProcessRequestToken::exclude(['data'])->toSql()
 );
 }

 public function test_subgroup_member_sees_parent_self_service_task_on_tasks_index(): void
 {
 [$parent, , $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'element_type' => 'task',
 'self_service_groups' => ['groups' => [(string) $parent->id], 'users' => []],
 ]);

 $response = $this->actingAs($nestedUser, 'api')->getJson(route('api.tasks.index', [
 'pmql' => '(status = "Self Service")',
 'per_page' => 15,
 'order_by' => 'ID',
 'order_direction' => 'DESC',
 'non_system' => true,
 'processesIManage' => false,
 ]));

 $response->assertOk();
 $this->assertContains($task->id, collect($response->json('data'))->pluck('id'));
 }

 /**
 * @return array{0: Group, 1: Group, 2: User, 3: User, 4: User}
 */
 private function createNestedGroups(): array
 {
 $parent = Group::factory()->create(['name' => 'Main']);
 $subgroup = Group::factory()->create(['name' => 'Sub']);
 $nestedUser = User::factory()->create();
 $directUser = User::factory()->create();
 $outsider = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $subgroup->id,
 'member_type' => Group::class,
 ]);
 $nestedUser->groups()->attach($subgroup);
 $directUser->groups()->attach($parent);

 return [$parent, $subgroup, $nestedUser, $directUser, $outsider];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-31145: Self Service tasks not visible to users in assigned subgroups#9022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

rodriquelca
wants to merge
1
commit into

base:develop
Choose a base branch

from

 Open


FOUR-31145: Self Service tasks not visible to users in assigned subgroups
#9022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 61 additions & 0 deletions
ProcessMaker/Models/Group.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Models;

use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Validation\Rule;
use ProcessMaker\Models\EmptyModel;
use ProcessMaker\Query\Traits\PMQL;
Expand DownExpand Up@@ -156,4 +158,63 @@ public function assigned()
 {
 return $this->morphMany(ProcessTaskAssignment::class, 'assigned', 'assignment_type', 'assignment_id');
 }

 /**
 * Parent group IDs for the given groups (one walk up, not one query per group).
 */
 public static function ancestorIdsFor(iterable $groupIds): Collection
 {
 $ids = collect($groupIds)->filter()->map(fn ($id) => (int) $id)->unique()->values();
 if ($ids->isEmpty()) {
 return collect();
 }

 return collect(static::computeAncestorIds($ids->all()));
 }

 public const SELF_SERVICE_HIERARCHY_VERSION_KEY = 'self_service:hierarchy_version';

 public static function selfServiceHierarchyVersion(): int
 {
 return (int) Cache::get(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }

 public static function bumpSelfServiceHierarchyVersion(): void
 {
 if (!Cache::has(self::SELF_SERVICE_HIERARCHY_VERSION_KEY)) {
 Cache::forever(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }
 Cache::increment(self::SELF_SERVICE_HIERARCHY_VERSION_KEY);
 }

 /**
 * @return array<int>
 */
 private static function computeAncestorIds(array $groupIds): array
 {
 $ancestors = [];
 $queue = $groupIds;
 $visited = array_fill_keys($groupIds, true);

 while ($queue) {
 $parents = GroupMember::query()
 ->where('member_type', self::class)
 ->whereIn('member_id', $queue)
 ->pluck('group_id')
 ->all();

 $queue = [];
 foreach ($parents as $parentId) {
 $parentId = (int) $parentId;
 if (isset($visited[$parentId])) {
 continue;
 }
 $visited[$parentId] = true;
 $ancestors[] = $parentId;
 $queue[] = $parentId;
 }
 }

 return $ancestors;
 }
}

5 changes: 3 additions & 2 deletions
ProcessMaker/Models/ProcessMakerModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,9 @@ public function scopeExclude($query, array $columns)
 }

 $columnsToShow = array_diff($this->getTableColumns(), $columns);
 $columnsToShow = array_map(function ($column) {
 return $this->table . '.' . $column;
 $table = $this->getTable();
 $columnsToShow = array_map(function ($column) use ($table) {
 return $table . '.' . $column;
 }, $columnsToShow);

 return $query->select($columnsToShow);
Expand Down

44 changes: 37 additions & 7 deletions
ProcessMaker/Models/User.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,10 @@ class User extends Authenticatable implements HasMedia
 // Session key to save request ids that the user started
 public const REQUESTS_SESSION_KEY = 'web-entry-request-ids';

 public const SELF_SERVICE_GROUP_IDS_CACHE_PREFIX = 'self_service:user_group_ids:';

 public const SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES = 10;

 /**
 * The attributes that are mass assignable.
 *
Expand DownExpand Up@@ -449,15 +453,13 @@ public function canSelfServe(ProcessRequestToken $task)
 return true;
 } elseif (array_key_exists('groups', $task->self_service_groups)) {
 return collect($task->self_service_groups['groups'])
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 } else {
 // For older processes
 return collect($task->self_service_groups)
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 }
 }

Expand All@@ -466,9 +468,37 @@ public function removeFromGroups()
 $this->groups()->detach();
 }

 /**
 * Direct group IDs plus ancestor groups. Cached per user; skipped on inbox repeats.
 */
 public function selfServiceGroupIds()
 {
 $key = $this->selfServiceGroupIdsCacheKey();

 return collect(Cache::remember($key, now()->addMinutes(self::SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES), function () {
 $direct = $this->groups()->pluck('groups.id');
 if ($direct->isEmpty()) {
 return [];
 }

 return $direct->merge(Group::ancestorIdsFor($direct))->unique()->values()->all();
 }));
 }

 public static function flushSelfServiceGroupIdsCache(int $userId): void
 {
 $version = Group::selfServiceHierarchyVersion();
 Cache::forget(self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $userId . ':' . $version);
 }

 private function selfServiceGroupIdsCacheKey(): string
 {
 return self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $this->id . ':' . Group::selfServiceHierarchyVersion();
 }

 public function availableSelfServiceTasksQuery()
 {
 $groupIds = $this->groups()->pluck('groups.id');
 $groupIds = $this->selfServiceGroupIds();

 $taskQuery = ProcessRequestToken::select(['process_request_tokens.id'])
 ->where([
Expand Down

22 changes: 22 additions & 0 deletions
ProcessMaker/Observers/GroupMemberObserver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Events\GroupMembershipChanged;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\User;

class GroupMemberObserver
{
Expand All@@ -14,6 +15,8 @@ class GroupMemberObserver
 */
 public function created(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -32,6 +35,8 @@ public function created(GroupMember $groupMember): void
 */
 public function updated(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -50,6 +55,8 @@ public function updated(GroupMember $groupMember): void
 */
 public function deleted(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -68,6 +75,8 @@ public function deleted(GroupMember $groupMember): void
 */
 public function restored(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -80,4 +89,17 @@ public function restored(GroupMember $groupMember): void
 }
 }
 }

 private function invalidateSelfServiceGroupCache(GroupMember $groupMember): void
 {
 if ($groupMember->member_type === Group::class) {
 Group::bumpSelfServiceHierarchyVersion();

 return;
 }

 if ($groupMember->member_type === User::class) {
 User::flushSelfServiceGroupIdsCache((int) $groupMember->member_id);
 }
 }
}

162 changes: 162 additions & 0 deletions
tests/Feature/SelfServiceSubgroupTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
<?php

declare(strict_types=1);

namespace Tests\Feature;

use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\User;
use Tests\TestCase;

class SelfServiceSubgroupTest extends TestCase
{
 use RefreshDatabase;

 public function test_subgroup_member_sees_and_can_claim_parent_group_self_service_task(): void
 {
 [$parent, $subgroup, $nestedUser, $directUser, $outsider] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());
 $this->assertContains($task->id, $directUser->availableSelfServiceTaskIds());
 $this->assertNotContains($task->id, $outsider->availableSelfServiceTaskIds());

 Auth::login($nestedUser);
 $this->assertTrue($nestedUser->canSelfServe($task));

 Auth::login($directUser);
 $this->assertTrue($directUser->canSelfServe($task));

 Auth::login($outsider);
 $this->assertFalse($outsider->canSelfServe($task));

 $this->assertContains($parent->id, $nestedUser->selfServiceGroupIds());
 $this->assertNotContains($subgroup->id, $outsider->selfServiceGroupIds());
 }

 public function test_two_level_nested_subgroup_member_sees_self_service_task(): void
 {
 $parent = Group::factory()->create();
 $child = Group::factory()->create();
 $grandchild = Group::factory()->create();
 $user = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $child->id,
 'member_type' => Group::class,
 ]);
 GroupMember::factory()->create([
 'group_id' => $child->id,
 'member_id' => $grandchild->id,
 'member_type' => Group::class,
 ]);
 $user->groups()->attach($grandchild);

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [(string) $parent->id]],
 ]);

 $this->assertContains($task->id, $user->availableSelfServiceTaskIds());
 Auth::login($user);
 $this->assertTrue($user->canSelfServe($task));
 }

 public function test_removing_subgroup_from_parent_drops_cached_self_service_visibility(): void
 {
 [$parent, $subgroup, $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());

 GroupMember::where('group_id', $parent->id)
 ->where('member_id', $subgroup->id)
 ->where('member_type', Group::class)
 ->first()
 ->delete();

 $this->assertNotContains($task->id, $nestedUser->fresh()->availableSelfServiceTaskIds());
 }

 public function test_exclude_qualifies_columns_with_the_model_table(): void
 {
 $task = ProcessRequestToken::factory()->create([
 'element_type' => 'task',
 ]);

 $found = ProcessRequestToken::exclude(['data'])->find($task->id);

 $this->assertNotNull($found);
 $this->assertSame($task->id, $found->id);
 $this->assertStringContainsString(
 '`process_request_tokens`.`id`',
 ProcessRequestToken::exclude(['data'])->toSql()
 );
 }

 public function test_subgroup_member_sees_parent_self_service_task_on_tasks_index(): void
 {
 [$parent, , $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'element_type' => 'task',
 'self_service_groups' => ['groups' => [(string) $parent->id], 'users' => []],
 ]);

 $response = $this->actingAs($nestedUser, 'api')->getJson(route('api.tasks.index', [
 'pmql' => '(status = "Self Service")',
 'per_page' => 15,
 'order_by' => 'ID',
 'order_direction' => 'DESC',
 'non_system' => true,
 'processesIManage' => false,
 ]));

 $response->assertOk();
 $this->assertContains($task->id, collect($response->json('data'))->pluck('id'));
 }

 /**
 * @return array{0: Group, 1: Group, 2: User, 3: User, 4: User}
 */
 private function createNestedGroups(): array
 {
 $parent = Group::factory()->create(['name' => 'Main']);
 $subgroup = Group::factory()->create(['name' => 'Sub']);
 $nestedUser = User::factory()->create();
 $directUser = User::factory()->create();
 $outsider = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $subgroup->id,
 'member_type' => Group::class,
 ]);
 $nestedUser->groups()->attach($subgroup);
 $directUser->groups()->attach($parent);

 return [$parent, $subgroup, $nestedUser, $directUser, $outsider];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-31145: Self Service tasks not visible to users in assigned subgroups#9022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

rodriquelca
wants to merge
1
commit into

base:develop
Choose a base branch

from

 Open


FOUR-31145: Self Service tasks not visible to users in assigned subgroups
#9022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 61 additions & 0 deletions
ProcessMaker/Models/Group.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Models;

use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Validation\Rule;
use ProcessMaker\Models\EmptyModel;
use ProcessMaker\Query\Traits\PMQL;
Expand DownExpand Up@@ -156,4 +158,63 @@ public function assigned()
 {
 return $this->morphMany(ProcessTaskAssignment::class, 'assigned', 'assignment_type', 'assignment_id');
 }

 /**
 * Parent group IDs for the given groups (one walk up, not one query per group).
 */
 public static function ancestorIdsFor(iterable $groupIds): Collection
 {
 $ids = collect($groupIds)->filter()->map(fn ($id) => (int) $id)->unique()->values();
 if ($ids->isEmpty()) {
 return collect();
 }

 return collect(static::computeAncestorIds($ids->all()));
 }

 public const SELF_SERVICE_HIERARCHY_VERSION_KEY = 'self_service:hierarchy_version';

 public static function selfServiceHierarchyVersion(): int
 {
 return (int) Cache::get(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }

 public static function bumpSelfServiceHierarchyVersion(): void
 {
 if (!Cache::has(self::SELF_SERVICE_HIERARCHY_VERSION_KEY)) {
 Cache::forever(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }
 Cache::increment(self::SELF_SERVICE_HIERARCHY_VERSION_KEY);
 }

 /**
 * @return array<int>
 */
 private static function computeAncestorIds(array $groupIds): array
 {
 $ancestors = [];
 $queue = $groupIds;
 $visited = array_fill_keys($groupIds, true);

 while ($queue) {
 $parents = GroupMember::query()
 ->where('member_type', self::class)
 ->whereIn('member_id', $queue)
 ->pluck('group_id')
 ->all();

 $queue = [];
 foreach ($parents as $parentId) {
 $parentId = (int) $parentId;
 if (isset($visited[$parentId])) {
 continue;
 }
 $visited[$parentId] = true;
 $ancestors[] = $parentId;
 $queue[] = $parentId;
 }
 }

 return $ancestors;
 }
}

5 changes: 3 additions & 2 deletions
ProcessMaker/Models/ProcessMakerModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,9 @@ public function scopeExclude($query, array $columns)
 }

 $columnsToShow = array_diff($this->getTableColumns(), $columns);
 $columnsToShow = array_map(function ($column) {
 return $this->table . '.' . $column;
 $table = $this->getTable();
 $columnsToShow = array_map(function ($column) use ($table) {
 return $table . '.' . $column;
 }, $columnsToShow);

 return $query->select($columnsToShow);
Expand Down

44 changes: 37 additions & 7 deletions
ProcessMaker/Models/User.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,10 @@ class User extends Authenticatable implements HasMedia
 // Session key to save request ids that the user started
 public const REQUESTS_SESSION_KEY = 'web-entry-request-ids';

 public const SELF_SERVICE_GROUP_IDS_CACHE_PREFIX = 'self_service:user_group_ids:';

 public const SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES = 10;

 /**
 * The attributes that are mass assignable.
 *
Expand DownExpand Up@@ -449,15 +453,13 @@ public function canSelfServe(ProcessRequestToken $task)
 return true;
 } elseif (array_key_exists('groups', $task->self_service_groups)) {
 return collect($task->self_service_groups['groups'])
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 } else {
 // For older processes
 return collect($task->self_service_groups)
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 }
 }

Expand All@@ -466,9 +468,37 @@ public function removeFromGroups()
 $this->groups()->detach();
 }

 /**
 * Direct group IDs plus ancestor groups. Cached per user; skipped on inbox repeats.
 */
 public function selfServiceGroupIds()
 {
 $key = $this->selfServiceGroupIdsCacheKey();

 return collect(Cache::remember($key, now()->addMinutes(self::SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES), function () {
 $direct = $this->groups()->pluck('groups.id');
 if ($direct->isEmpty()) {
 return [];
 }

 return $direct->merge(Group::ancestorIdsFor($direct))->unique()->values()->all();
 }));
 }

 public static function flushSelfServiceGroupIdsCache(int $userId): void
 {
 $version = Group::selfServiceHierarchyVersion();
 Cache::forget(self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $userId . ':' . $version);
 }

 private function selfServiceGroupIdsCacheKey(): string
 {
 return self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $this->id . ':' . Group::selfServiceHierarchyVersion();
 }

 public function availableSelfServiceTasksQuery()
 {
 $groupIds = $this->groups()->pluck('groups.id');
 $groupIds = $this->selfServiceGroupIds();

 $taskQuery = ProcessRequestToken::select(['process_request_tokens.id'])
 ->where([
Expand Down

22 changes: 22 additions & 0 deletions
ProcessMaker/Observers/GroupMemberObserver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Events\GroupMembershipChanged;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\User;

class GroupMemberObserver
{
Expand All@@ -14,6 +15,8 @@ class GroupMemberObserver
 */
 public function created(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -32,6 +35,8 @@ public function created(GroupMember $groupMember): void
 */
 public function updated(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -50,6 +55,8 @@ public function updated(GroupMember $groupMember): void
 */
 public function deleted(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -68,6 +75,8 @@ public function deleted(GroupMember $groupMember): void
 */
 public function restored(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -80,4 +89,17 @@ public function restored(GroupMember $groupMember): void
 }
 }
 }

 private function invalidateSelfServiceGroupCache(GroupMember $groupMember): void
 {
 if ($groupMember->member_type === Group::class) {
 Group::bumpSelfServiceHierarchyVersion();

 return;
 }

 if ($groupMember->member_type === User::class) {
 User::flushSelfServiceGroupIdsCache((int) $groupMember->member_id);
 }
 }
}

162 changes: 162 additions & 0 deletions
tests/Feature/SelfServiceSubgroupTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
<?php

declare(strict_types=1);

namespace Tests\Feature;

use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\User;
use Tests\TestCase;

class SelfServiceSubgroupTest extends TestCase
{
 use RefreshDatabase;

 public function test_subgroup_member_sees_and_can_claim_parent_group_self_service_task(): void
 {
 [$parent, $subgroup, $nestedUser, $directUser, $outsider] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());
 $this->assertContains($task->id, $directUser->availableSelfServiceTaskIds());
 $this->assertNotContains($task->id, $outsider->availableSelfServiceTaskIds());

 Auth::login($nestedUser);
 $this->assertTrue($nestedUser->canSelfServe($task));

 Auth::login($directUser);
 $this->assertTrue($directUser->canSelfServe($task));

 Auth::login($outsider);
 $this->assertFalse($outsider->canSelfServe($task));

 $this->assertContains($parent->id, $nestedUser->selfServiceGroupIds());
 $this->assertNotContains($subgroup->id, $outsider->selfServiceGroupIds());
 }

 public function test_two_level_nested_subgroup_member_sees_self_service_task(): void
 {
 $parent = Group::factory()->create();
 $child = Group::factory()->create();
 $grandchild = Group::factory()->create();
 $user = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $child->id,
 'member_type' => Group::class,
 ]);
 GroupMember::factory()->create([
 'group_id' => $child->id,
 'member_id' => $grandchild->id,
 'member_type' => Group::class,
 ]);
 $user->groups()->attach($grandchild);

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [(string) $parent->id]],
 ]);

 $this->assertContains($task->id, $user->availableSelfServiceTaskIds());
 Auth::login($user);
 $this->assertTrue($user->canSelfServe($task));
 }

 public function test_removing_subgroup_from_parent_drops_cached_self_service_visibility(): void
 {
 [$parent, $subgroup, $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());

 GroupMember::where('group_id', $parent->id)
 ->where('member_id', $subgroup->id)
 ->where('member_type', Group::class)
 ->first()
 ->delete();

 $this->assertNotContains($task->id, $nestedUser->fresh()->availableSelfServiceTaskIds());
 }

 public function test_exclude_qualifies_columns_with_the_model_table(): void
 {
 $task = ProcessRequestToken::factory()->create([
 'element_type' => 'task',
 ]);

 $found = ProcessRequestToken::exclude(['data'])->find($task->id);

 $this->assertNotNull($found);
 $this->assertSame($task->id, $found->id);
 $this->assertStringContainsString(
 '`process_request_tokens`.`id`',
 ProcessRequestToken::exclude(['data'])->toSql()
 );
 }

 public function test_subgroup_member_sees_parent_self_service_task_on_tasks_index(): void
 {
 [$parent, , $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'element_type' => 'task',
 'self_service_groups' => ['groups' => [(string) $parent->id], 'users' => []],
 ]);

 $response = $this->actingAs($nestedUser, 'api')->getJson(route('api.tasks.index', [
 'pmql' => '(status = "Self Service")',
 'per_page' => 15,
 'order_by' => 'ID',
 'order_direction' => 'DESC',
 'non_system' => true,
 'processesIManage' => false,
 ]));

 $response->assertOk();
 $this->assertContains($task->id, collect($response->json('data'))->pluck('id'));
 }

 /**
 * @return array{0: Group, 1: Group, 2: User, 3: User, 4: User}
 */
 private function createNestedGroups(): array
 {
 $parent = Group::factory()->create(['name' => 'Main']);
 $subgroup = Group::factory()->create(['name' => 'Sub']);
 $nestedUser = User::factory()->create();
 $directUser = User::factory()->create();
 $outsider = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $subgroup->id,
 'member_type' => Group::class,
 ]);
 $nestedUser->groups()->attach($subgroup);
 $directUser->groups()->attach($parent);

 return [$parent, $subgroup, $nestedUser, $directUser, $outsider];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
FOUR-31145: Self Service tasks not visible to users in assigned subgroups#9022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

rodriquelca
wants to merge
1
commit into

base:develop
Choose a base branch

from

 Open


FOUR-31145: Self Service tasks not visible to users in assigned subgroups
#9022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 61 additions & 0 deletions
ProcessMaker/Models/Group.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Models;

use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Validation\Rule;
use ProcessMaker\Models\EmptyModel;
use ProcessMaker\Query\Traits\PMQL;
Expand DownExpand Up@@ -156,4 +158,63 @@ public function assigned()
 {
 return $this->morphMany(ProcessTaskAssignment::class, 'assigned', 'assignment_type', 'assignment_id');
 }

 /**
 * Parent group IDs for the given groups (one walk up, not one query per group).
 */
 public static function ancestorIdsFor(iterable $groupIds): Collection
 {
 $ids = collect($groupIds)->filter()->map(fn ($id) => (int) $id)->unique()->values();
 if ($ids->isEmpty()) {
 return collect();
 }

 return collect(static::computeAncestorIds($ids->all()));
 }

 public const SELF_SERVICE_HIERARCHY_VERSION_KEY = 'self_service:hierarchy_version';

 public static function selfServiceHierarchyVersion(): int
 {
 return (int) Cache::get(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }

 public static function bumpSelfServiceHierarchyVersion(): void
 {
 if (!Cache::has(self::SELF_SERVICE_HIERARCHY_VERSION_KEY)) {
 Cache::forever(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }
 Cache::increment(self::SELF_SERVICE_HIERARCHY_VERSION_KEY);
 }

 /**
 * @return array<int>
 */
 private static function computeAncestorIds(array $groupIds): array
 {
 $ancestors = [];
 $queue = $groupIds;
 $visited = array_fill_keys($groupIds, true);

 while ($queue) {
 $parents = GroupMember::query()
 ->where('member_type', self::class)
 ->whereIn('member_id', $queue)
 ->pluck('group_id')
 ->all();

 $queue = [];
 foreach ($parents as $parentId) {
 $parentId = (int) $parentId;
 if (isset($visited[$parentId])) {
 continue;
 }
 $visited[$parentId] = true;
 $ancestors[] = $parentId;
 $queue[] = $parentId;
 }
 }

 return $ancestors;
 }
}

5 changes: 3 additions & 2 deletions
ProcessMaker/Models/ProcessMakerModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,9 @@ public function scopeExclude($query, array $columns)
 }

 $columnsToShow = array_diff($this->getTableColumns(), $columns);
 $columnsToShow = array_map(function ($column) {
 return $this->table . '.' . $column;
 $table = $this->getTable();
 $columnsToShow = array_map(function ($column) use ($table) {
 return $table . '.' . $column;
 }, $columnsToShow);

 return $query->select($columnsToShow);
Expand Down

44 changes: 37 additions & 7 deletions
ProcessMaker/Models/User.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,10 @@ class User extends Authenticatable implements HasMedia
 // Session key to save request ids that the user started
 public const REQUESTS_SESSION_KEY = 'web-entry-request-ids';

 public const SELF_SERVICE_GROUP_IDS_CACHE_PREFIX = 'self_service:user_group_ids:';

 public const SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES = 10;

 /**
 * The attributes that are mass assignable.
 *
Expand DownExpand Up@@ -449,15 +453,13 @@ public function canSelfServe(ProcessRequestToken $task)
 return true;
 } elseif (array_key_exists('groups', $task->self_service_groups)) {
 return collect($task->self_service_groups['groups'])
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 } else {
 // For older processes
 return collect($task->self_service_groups)
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 }
 }

Expand All@@ -466,9 +468,37 @@ public function removeFromGroups()
 $this->groups()->detach();
 }

 /**
 * Direct group IDs plus ancestor groups. Cached per user; skipped on inbox repeats.
 */
 public function selfServiceGroupIds()
 {
 $key = $this->selfServiceGroupIdsCacheKey();

 return collect(Cache::remember($key, now()->addMinutes(self::SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES), function () {
 $direct = $this->groups()->pluck('groups.id');
 if ($direct->isEmpty()) {
 return [];
 }

 return $direct->merge(Group::ancestorIdsFor($direct))->unique()->values()->all();
 }));
 }

 public static function flushSelfServiceGroupIdsCache(int $userId): void
 {
 $version = Group::selfServiceHierarchyVersion();
 Cache::forget(self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $userId . ':' . $version);
 }

 private function selfServiceGroupIdsCacheKey(): string
 {
 return self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $this->id . ':' . Group::selfServiceHierarchyVersion();
 }

 public function availableSelfServiceTasksQuery()
 {
 $groupIds = $this->groups()->pluck('groups.id');
 $groupIds = $this->selfServiceGroupIds();

 $taskQuery = ProcessRequestToken::select(['process_request_tokens.id'])
 ->where([
Expand Down

22 changes: 22 additions & 0 deletions
ProcessMaker/Observers/GroupMemberObserver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Events\GroupMembershipChanged;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\User;

class GroupMemberObserver
{
Expand All@@ -14,6 +15,8 @@ class GroupMemberObserver
 */
 public function created(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -32,6 +35,8 @@ public function created(GroupMember $groupMember): void
 */
 public function updated(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -50,6 +55,8 @@ public function updated(GroupMember $groupMember): void
 */
 public function deleted(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -68,6 +75,8 @@ public function deleted(GroupMember $groupMember): void
 */
 public function restored(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -80,4 +89,17 @@ public function restored(GroupMember $groupMember): void
 }
 }
 }

 private function invalidateSelfServiceGroupCache(GroupMember $groupMember): void
 {
 if ($groupMember->member_type === Group::class) {
 Group::bumpSelfServiceHierarchyVersion();

 return;
 }

 if ($groupMember->member_type === User::class) {
 User::flushSelfServiceGroupIdsCache((int) $groupMember->member_id);
 }
 }
}

162 changes: 162 additions & 0 deletions
tests/Feature/SelfServiceSubgroupTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
<?php

declare(strict_types=1);

namespace Tests\Feature;

use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\User;
use Tests\TestCase;

class SelfServiceSubgroupTest extends TestCase
{
 use RefreshDatabase;

 public function test_subgroup_member_sees_and_can_claim_parent_group_self_service_task(): void
 {
 [$parent, $subgroup, $nestedUser, $directUser, $outsider] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());
 $this->assertContains($task->id, $directUser->availableSelfServiceTaskIds());
 $this->assertNotContains($task->id, $outsider->availableSelfServiceTaskIds());

 Auth::login($nestedUser);
 $this->assertTrue($nestedUser->canSelfServe($task));

 Auth::login($directUser);
 $this->assertTrue($directUser->canSelfServe($task));

 Auth::login($outsider);
 $this->assertFalse($outsider->canSelfServe($task));

 $this->assertContains($parent->id, $nestedUser->selfServiceGroupIds());
 $this->assertNotContains($subgroup->id, $outsider->selfServiceGroupIds());
 }

 public function test_two_level_nested_subgroup_member_sees_self_service_task(): void
 {
 $parent = Group::factory()->create();
 $child = Group::factory()->create();
 $grandchild = Group::factory()->create();
 $user = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $child->id,
 'member_type' => Group::class,
 ]);
 GroupMember::factory()->create([
 'group_id' => $child->id,
 'member_id' => $grandchild->id,
 'member_type' => Group::class,
 ]);
 $user->groups()->attach($grandchild);

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [(string) $parent->id]],
 ]);

 $this->assertContains($task->id, $user->availableSelfServiceTaskIds());
 Auth::login($user);
 $this->assertTrue($user->canSelfServe($task));
 }

 public function test_removing_subgroup_from_parent_drops_cached_self_service_visibility(): void
 {
 [$parent, $subgroup, $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());

 GroupMember::where('group_id', $parent->id)
 ->where('member_id', $subgroup->id)
 ->where('member_type', Group::class)
 ->first()
 ->delete();

 $this->assertNotContains($task->id, $nestedUser->fresh()->availableSelfServiceTaskIds());
 }

 public function test_exclude_qualifies_columns_with_the_model_table(): void
 {
 $task = ProcessRequestToken::factory()->create([
 'element_type' => 'task',
 ]);

 $found = ProcessRequestToken::exclude(['data'])->find($task->id);

 $this->assertNotNull($found);
 $this->assertSame($task->id, $found->id);
 $this->assertStringContainsString(
 '`process_request_tokens`.`id`',
 ProcessRequestToken::exclude(['data'])->toSql()
 );
 }

 public function test_subgroup_member_sees_parent_self_service_task_on_tasks_index(): void
 {
 [$parent, , $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'element_type' => 'task',
 'self_service_groups' => ['groups' => [(string) $parent->id], 'users' => []],
 ]);

 $response = $this->actingAs($nestedUser, 'api')->getJson(route('api.tasks.index', [
 'pmql' => '(status = "Self Service")',
 'per_page' => 15,
 'order_by' => 'ID',
 'order_direction' => 'DESC',
 'non_system' => true,
 'processesIManage' => false,
 ]));

 $response->assertOk();
 $this->assertContains($task->id, collect($response->json('data'))->pluck('id'));
 }

 /**
 * @return array{0: Group, 1: Group, 2: User, 3: User, 4: User}
 */
 private function createNestedGroups(): array
 {
 $parent = Group::factory()->create(['name' => 'Main']);
 $subgroup = Group::factory()->create(['name' => 'Sub']);
 $nestedUser = User::factory()->create();
 $directUser = User::factory()->create();
 $outsider = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $subgroup->id,
 'member_type' => Group::class,
 ]);
 $nestedUser->groups()->attach($subgroup);
 $directUser->groups()->attach($parent);

 return [$parent, $subgroup, $nestedUser, $directUser, $outsider];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-31145: Self Service tasks not visible to users in assigned subgroups#9022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

rodriquelca
wants to merge
1
commit into

base:develop
Choose a base branch

from

 Open


FOUR-31145: Self Service tasks not visible to users in assigned subgroups
#9022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 61 additions & 0 deletions
ProcessMaker/Models/Group.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Models;

use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Validation\Rule;
use ProcessMaker\Models\EmptyModel;
use ProcessMaker\Query\Traits\PMQL;
Expand DownExpand Up@@ -156,4 +158,63 @@ public function assigned()
 {
 return $this->morphMany(ProcessTaskAssignment::class, 'assigned', 'assignment_type', 'assignment_id');
 }

 /**
 * Parent group IDs for the given groups (one walk up, not one query per group).
 */
 public static function ancestorIdsFor(iterable $groupIds): Collection
 {
 $ids = collect($groupIds)->filter()->map(fn ($id) => (int) $id)->unique()->values();
 if ($ids->isEmpty()) {
 return collect();
 }

 return collect(static::computeAncestorIds($ids->all()));
 }

 public const SELF_SERVICE_HIERARCHY_VERSION_KEY = 'self_service:hierarchy_version';

 public static function selfServiceHierarchyVersion(): int
 {
 return (int) Cache::get(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }

 public static function bumpSelfServiceHierarchyVersion(): void
 {
 if (!Cache::has(self::SELF_SERVICE_HIERARCHY_VERSION_KEY)) {
 Cache::forever(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }
 Cache::increment(self::SELF_SERVICE_HIERARCHY_VERSION_KEY);
 }

 /**
 * @return array<int>
 */
 private static function computeAncestorIds(array $groupIds): array
 {
 $ancestors = [];
 $queue = $groupIds;
 $visited = array_fill_keys($groupIds, true);

 while ($queue) {
 $parents = GroupMember::query()
 ->where('member_type', self::class)
 ->whereIn('member_id', $queue)
 ->pluck('group_id')
 ->all();

 $queue = [];
 foreach ($parents as $parentId) {
 $parentId = (int) $parentId;
 if (isset($visited[$parentId])) {
 continue;
 }
 $visited[$parentId] = true;
 $ancestors[] = $parentId;
 $queue[] = $parentId;
 }
 }

 return $ancestors;
 }
}

5 changes: 3 additions & 2 deletions
ProcessMaker/Models/ProcessMakerModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,9 @@ public function scopeExclude($query, array $columns)
 }

 $columnsToShow = array_diff($this->getTableColumns(), $columns);
 $columnsToShow = array_map(function ($column) {
 return $this->table . '.' . $column;
 $table = $this->getTable();
 $columnsToShow = array_map(function ($column) use ($table) {
 return $table . '.' . $column;
 }, $columnsToShow);

 return $query->select($columnsToShow);
Expand Down

44 changes: 37 additions & 7 deletions
ProcessMaker/Models/User.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,10 @@ class User extends Authenticatable implements HasMedia
 // Session key to save request ids that the user started
 public const REQUESTS_SESSION_KEY = 'web-entry-request-ids';

 public const SELF_SERVICE_GROUP_IDS_CACHE_PREFIX = 'self_service:user_group_ids:';

 public const SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES = 10;

 /**
 * The attributes that are mass assignable.
 *
Expand DownExpand Up@@ -449,15 +453,13 @@ public function canSelfServe(ProcessRequestToken $task)
 return true;
 } elseif (array_key_exists('groups', $task->self_service_groups)) {
 return collect($task->self_service_groups['groups'])
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 } else {
 // For older processes
 return collect($task->self_service_groups)
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 }
 }

Expand All@@ -466,9 +468,37 @@ public function removeFromGroups()
 $this->groups()->detach();
 }

 /**
 * Direct group IDs plus ancestor groups. Cached per user; skipped on inbox repeats.
 */
 public function selfServiceGroupIds()
 {
 $key = $this->selfServiceGroupIdsCacheKey();

 return collect(Cache::remember($key, now()->addMinutes(self::SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES), function () {
 $direct = $this->groups()->pluck('groups.id');
 if ($direct->isEmpty()) {
 return [];
 }

 return $direct->merge(Group::ancestorIdsFor($direct))->unique()->values()->all();
 }));
 }

 public static function flushSelfServiceGroupIdsCache(int $userId): void
 {
 $version = Group::selfServiceHierarchyVersion();
 Cache::forget(self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $userId . ':' . $version);
 }

 private function selfServiceGroupIdsCacheKey(): string
 {
 return self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $this->id . ':' . Group::selfServiceHierarchyVersion();
 }

 public function availableSelfServiceTasksQuery()
 {
 $groupIds = $this->groups()->pluck('groups.id');
 $groupIds = $this->selfServiceGroupIds();

 $taskQuery = ProcessRequestToken::select(['process_request_tokens.id'])
 ->where([
Expand Down

22 changes: 22 additions & 0 deletions
ProcessMaker/Observers/GroupMemberObserver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Events\GroupMembershipChanged;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\User;

class GroupMemberObserver
{
Expand All@@ -14,6 +15,8 @@ class GroupMemberObserver
 */
 public function created(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -32,6 +35,8 @@ public function created(GroupMember $groupMember): void
 */
 public function updated(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -50,6 +55,8 @@ public function updated(GroupMember $groupMember): void
 */
 public function deleted(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -68,6 +75,8 @@ public function deleted(GroupMember $groupMember): void
 */
 public function restored(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -80,4 +89,17 @@ public function restored(GroupMember $groupMember): void
 }
 }
 }

 private function invalidateSelfServiceGroupCache(GroupMember $groupMember): void
 {
 if ($groupMember->member_type === Group::class) {
 Group::bumpSelfServiceHierarchyVersion();

 return;
 }

 if ($groupMember->member_type === User::class) {
 User::flushSelfServiceGroupIdsCache((int) $groupMember->member_id);
 }
 }
}

162 changes: 162 additions & 0 deletions
tests/Feature/SelfServiceSubgroupTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
<?php

declare(strict_types=1);

namespace Tests\Feature;

use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\User;
use Tests\TestCase;

class SelfServiceSubgroupTest extends TestCase
{
 use RefreshDatabase;

 public function test_subgroup_member_sees_and_can_claim_parent_group_self_service_task(): void
 {
 [$parent, $subgroup, $nestedUser, $directUser, $outsider] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());
 $this->assertContains($task->id, $directUser->availableSelfServiceTaskIds());
 $this->assertNotContains($task->id, $outsider->availableSelfServiceTaskIds());

 Auth::login($nestedUser);
 $this->assertTrue($nestedUser->canSelfServe($task));

 Auth::login($directUser);
 $this->assertTrue($directUser->canSelfServe($task));

 Auth::login($outsider);
 $this->assertFalse($outsider->canSelfServe($task));

 $this->assertContains($parent->id, $nestedUser->selfServiceGroupIds());
 $this->assertNotContains($subgroup->id, $outsider->selfServiceGroupIds());
 }

 public function test_two_level_nested_subgroup_member_sees_self_service_task(): void
 {
 $parent = Group::factory()->create();
 $child = Group::factory()->create();
 $grandchild = Group::factory()->create();
 $user = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $child->id,
 'member_type' => Group::class,
 ]);
 GroupMember::factory()->create([
 'group_id' => $child->id,
 'member_id' => $grandchild->id,
 'member_type' => Group::class,
 ]);
 $user->groups()->attach($grandchild);

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [(string) $parent->id]],
 ]);

 $this->assertContains($task->id, $user->availableSelfServiceTaskIds());
 Auth::login($user);
 $this->assertTrue($user->canSelfServe($task));
 }

 public function test_removing_subgroup_from_parent_drops_cached_self_service_visibility(): void
 {
 [$parent, $subgroup, $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());

 GroupMember::where('group_id', $parent->id)
 ->where('member_id', $subgroup->id)
 ->where('member_type', Group::class)
 ->first()
 ->delete();

 $this->assertNotContains($task->id, $nestedUser->fresh()->availableSelfServiceTaskIds());
 }

 public function test_exclude_qualifies_columns_with_the_model_table(): void
 {
 $task = ProcessRequestToken::factory()->create([
 'element_type' => 'task',
 ]);

 $found = ProcessRequestToken::exclude(['data'])->find($task->id);

 $this->assertNotNull($found);
 $this->assertSame($task->id, $found->id);
 $this->assertStringContainsString(
 '`process_request_tokens`.`id`',
 ProcessRequestToken::exclude(['data'])->toSql()
 );
 }

 public function test_subgroup_member_sees_parent_self_service_task_on_tasks_index(): void
 {
 [$parent, , $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'element_type' => 'task',
 'self_service_groups' => ['groups' => [(string) $parent->id], 'users' => []],
 ]);

 $response = $this->actingAs($nestedUser, 'api')->getJson(route('api.tasks.index', [
 'pmql' => '(status = "Self Service")',
 'per_page' => 15,
 'order_by' => 'ID',
 'order_direction' => 'DESC',
 'non_system' => true,
 'processesIManage' => false,
 ]));

 $response->assertOk();
 $this->assertContains($task->id, collect($response->json('data'))->pluck('id'));
 }

 /**
 * @return array{0: Group, 1: Group, 2: User, 3: User, 4: User}
 */
 private function createNestedGroups(): array
 {
 $parent = Group::factory()->create(['name' => 'Main']);
 $subgroup = Group::factory()->create(['name' => 'Sub']);
 $nestedUser = User::factory()->create();
 $directUser = User::factory()->create();
 $outsider = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $subgroup->id,
 'member_type' => Group::class,
 ]);
 $nestedUser->groups()->attach($subgroup);
 $directUser->groups()->attach($parent);

 return [$parent, $subgroup, $nestedUser, $directUser, $outsider];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-31145: Self Service tasks not visible to users in assigned subgroups#9022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

rodriquelca
wants to merge
1
commit into

base:develop
Choose a base branch

from

 Open


FOUR-31145: Self Service tasks not visible to users in assigned subgroups
#9022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 61 additions & 0 deletions
ProcessMaker/Models/Group.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Models;

use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Validation\Rule;
use ProcessMaker\Models\EmptyModel;
use ProcessMaker\Query\Traits\PMQL;
Expand DownExpand Up@@ -156,4 +158,63 @@ public function assigned()
 {
 return $this->morphMany(ProcessTaskAssignment::class, 'assigned', 'assignment_type', 'assignment_id');
 }

 /**
 * Parent group IDs for the given groups (one walk up, not one query per group).
 */
 public static function ancestorIdsFor(iterable $groupIds): Collection
 {
 $ids = collect($groupIds)->filter()->map(fn ($id) => (int) $id)->unique()->values();
 if ($ids->isEmpty()) {
 return collect();
 }

 return collect(static::computeAncestorIds($ids->all()));
 }

 public const SELF_SERVICE_HIERARCHY_VERSION_KEY = 'self_service:hierarchy_version';

 public static function selfServiceHierarchyVersion(): int
 {
 return (int) Cache::get(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }

 public static function bumpSelfServiceHierarchyVersion(): void
 {
 if (!Cache::has(self::SELF_SERVICE_HIERARCHY_VERSION_KEY)) {
 Cache::forever(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }
 Cache::increment(self::SELF_SERVICE_HIERARCHY_VERSION_KEY);
 }

 /**
 * @return array<int>
 */
 private static function computeAncestorIds(array $groupIds): array
 {
 $ancestors = [];
 $queue = $groupIds;
 $visited = array_fill_keys($groupIds, true);

 while ($queue) {
 $parents = GroupMember::query()
 ->where('member_type', self::class)
 ->whereIn('member_id', $queue)
 ->pluck('group_id')
 ->all();

 $queue = [];
 foreach ($parents as $parentId) {
 $parentId = (int) $parentId;
 if (isset($visited[$parentId])) {
 continue;
 }
 $visited[$parentId] = true;
 $ancestors[] = $parentId;
 $queue[] = $parentId;
 }
 }

 return $ancestors;
 }
}

5 changes: 3 additions & 2 deletions
ProcessMaker/Models/ProcessMakerModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,9 @@ public function scopeExclude($query, array $columns)
 }

 $columnsToShow = array_diff($this->getTableColumns(), $columns);
 $columnsToShow = array_map(function ($column) {
 return $this->table . '.' . $column;
 $table = $this->getTable();
 $columnsToShow = array_map(function ($column) use ($table) {
 return $table . '.' . $column;
 }, $columnsToShow);

 return $query->select($columnsToShow);
Expand Down

44 changes: 37 additions & 7 deletions
ProcessMaker/Models/User.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,10 @@ class User extends Authenticatable implements HasMedia
 // Session key to save request ids that the user started
 public const REQUESTS_SESSION_KEY = 'web-entry-request-ids';

 public const SELF_SERVICE_GROUP_IDS_CACHE_PREFIX = 'self_service:user_group_ids:';

 public const SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES = 10;

 /**
 * The attributes that are mass assignable.
 *
Expand DownExpand Up@@ -449,15 +453,13 @@ public function canSelfServe(ProcessRequestToken $task)
 return true;
 } elseif (array_key_exists('groups', $task->self_service_groups)) {
 return collect($task->self_service_groups['groups'])
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 } else {
 // For older processes
 return collect($task->self_service_groups)
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 }
 }

Expand All@@ -466,9 +468,37 @@ public function removeFromGroups()
 $this->groups()->detach();
 }

 /**
 * Direct group IDs plus ancestor groups. Cached per user; skipped on inbox repeats.
 */
 public function selfServiceGroupIds()
 {
 $key = $this->selfServiceGroupIdsCacheKey();

 return collect(Cache::remember($key, now()->addMinutes(self::SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES), function () {
 $direct = $this->groups()->pluck('groups.id');
 if ($direct->isEmpty()) {
 return [];
 }

 return $direct->merge(Group::ancestorIdsFor($direct))->unique()->values()->all();
 }));
 }

 public static function flushSelfServiceGroupIdsCache(int $userId): void
 {
 $version = Group::selfServiceHierarchyVersion();
 Cache::forget(self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $userId . ':' . $version);
 }

 private function selfServiceGroupIdsCacheKey(): string
 {
 return self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $this->id . ':' . Group::selfServiceHierarchyVersion();
 }

 public function availableSelfServiceTasksQuery()
 {
 $groupIds = $this->groups()->pluck('groups.id');
 $groupIds = $this->selfServiceGroupIds();

 $taskQuery = ProcessRequestToken::select(['process_request_tokens.id'])
 ->where([
Expand Down

22 changes: 22 additions & 0 deletions
ProcessMaker/Observers/GroupMemberObserver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Events\GroupMembershipChanged;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\User;

class GroupMemberObserver
{
Expand All@@ -14,6 +15,8 @@ class GroupMemberObserver
 */
 public function created(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -32,6 +35,8 @@ public function created(GroupMember $groupMember): void
 */
 public function updated(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -50,6 +55,8 @@ public function updated(GroupMember $groupMember): void
 */
 public function deleted(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -68,6 +75,8 @@ public function deleted(GroupMember $groupMember): void
 */
 public function restored(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -80,4 +89,17 @@ public function restored(GroupMember $groupMember): void
 }
 }
 }

 private function invalidateSelfServiceGroupCache(GroupMember $groupMember): void
 {
 if ($groupMember->member_type === Group::class) {
 Group::bumpSelfServiceHierarchyVersion();

 return;
 }

 if ($groupMember->member_type === User::class) {
 User::flushSelfServiceGroupIdsCache((int) $groupMember->member_id);
 }
 }
}

162 changes: 162 additions & 0 deletions
tests/Feature/SelfServiceSubgroupTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
<?php

declare(strict_types=1);

namespace Tests\Feature;

use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\User;
use Tests\TestCase;

class SelfServiceSubgroupTest extends TestCase
{
 use RefreshDatabase;

 public function test_subgroup_member_sees_and_can_claim_parent_group_self_service_task(): void
 {
 [$parent, $subgroup, $nestedUser, $directUser, $outsider] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());
 $this->assertContains($task->id, $directUser->availableSelfServiceTaskIds());
 $this->assertNotContains($task->id, $outsider->availableSelfServiceTaskIds());

 Auth::login($nestedUser);
 $this->assertTrue($nestedUser->canSelfServe($task));

 Auth::login($directUser);
 $this->assertTrue($directUser->canSelfServe($task));

 Auth::login($outsider);
 $this->assertFalse($outsider->canSelfServe($task));

 $this->assertContains($parent->id, $nestedUser->selfServiceGroupIds());
 $this->assertNotContains($subgroup->id, $outsider->selfServiceGroupIds());
 }

 public function test_two_level_nested_subgroup_member_sees_self_service_task(): void
 {
 $parent = Group::factory()->create();
 $child = Group::factory()->create();
 $grandchild = Group::factory()->create();
 $user = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $child->id,
 'member_type' => Group::class,
 ]);
 GroupMember::factory()->create([
 'group_id' => $child->id,
 'member_id' => $grandchild->id,
 'member_type' => Group::class,
 ]);
 $user->groups()->attach($grandchild);

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [(string) $parent->id]],
 ]);

 $this->assertContains($task->id, $user->availableSelfServiceTaskIds());
 Auth::login($user);
 $this->assertTrue($user->canSelfServe($task));
 }

 public function test_removing_subgroup_from_parent_drops_cached_self_service_visibility(): void
 {
 [$parent, $subgroup, $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());

 GroupMember::where('group_id', $parent->id)
 ->where('member_id', $subgroup->id)
 ->where('member_type', Group::class)
 ->first()
 ->delete();

 $this->assertNotContains($task->id, $nestedUser->fresh()->availableSelfServiceTaskIds());
 }

 public function test_exclude_qualifies_columns_with_the_model_table(): void
 {
 $task = ProcessRequestToken::factory()->create([
 'element_type' => 'task',
 ]);

 $found = ProcessRequestToken::exclude(['data'])->find($task->id);

 $this->assertNotNull($found);
 $this->assertSame($task->id, $found->id);
 $this->assertStringContainsString(
 '`process_request_tokens`.`id`',
 ProcessRequestToken::exclude(['data'])->toSql()
 );
 }

 public function test_subgroup_member_sees_parent_self_service_task_on_tasks_index(): void
 {
 [$parent, , $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'element_type' => 'task',
 'self_service_groups' => ['groups' => [(string) $parent->id], 'users' => []],
 ]);

 $response = $this->actingAs($nestedUser, 'api')->getJson(route('api.tasks.index', [
 'pmql' => '(status = "Self Service")',
 'per_page' => 15,
 'order_by' => 'ID',
 'order_direction' => 'DESC',
 'non_system' => true,
 'processesIManage' => false,
 ]));

 $response->assertOk();
 $this->assertContains($task->id, collect($response->json('data'))->pluck('id'));
 }

 /**
 * @return array{0: Group, 1: Group, 2: User, 3: User, 4: User}
 */
 private function createNestedGroups(): array
 {
 $parent = Group::factory()->create(['name' => 'Main']);
 $subgroup = Group::factory()->create(['name' => 'Sub']);
 $nestedUser = User::factory()->create();
 $directUser = User::factory()->create();
 $outsider = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $subgroup->id,
 'member_type' => Group::class,
 ]);
 $nestedUser->groups()->attach($subgroup);
 $directUser->groups()->attach($parent);

 return [$parent, $subgroup, $nestedUser, $directUser, $outsider];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
FOUR-31145: Self Service tasks not visible to users in assigned subgroups#9022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

rodriquelca
wants to merge
1
commit into

base:develop
Choose a base branch

from

 Open


FOUR-31145: Self Service tasks not visible to users in assigned subgroups
#9022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 61 additions & 0 deletions
ProcessMaker/Models/Group.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Models;

use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Validation\Rule;
use ProcessMaker\Models\EmptyModel;
use ProcessMaker\Query\Traits\PMQL;
Expand DownExpand Up@@ -156,4 +158,63 @@ public function assigned()
 {
 return $this->morphMany(ProcessTaskAssignment::class, 'assigned', 'assignment_type', 'assignment_id');
 }

 /**
 * Parent group IDs for the given groups (one walk up, not one query per group).
 */
 public static function ancestorIdsFor(iterable $groupIds): Collection
 {
 $ids = collect($groupIds)->filter()->map(fn ($id) => (int) $id)->unique()->values();
 if ($ids->isEmpty()) {
 return collect();
 }

 return collect(static::computeAncestorIds($ids->all()));
 }

 public const SELF_SERVICE_HIERARCHY_VERSION_KEY = 'self_service:hierarchy_version';

 public static function selfServiceHierarchyVersion(): int
 {
 return (int) Cache::get(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }

 public static function bumpSelfServiceHierarchyVersion(): void
 {
 if (!Cache::has(self::SELF_SERVICE_HIERARCHY_VERSION_KEY)) {
 Cache::forever(self::SELF_SERVICE_HIERARCHY_VERSION_KEY, 1);
 }
 Cache::increment(self::SELF_SERVICE_HIERARCHY_VERSION_KEY);
 }

 /**
 * @return array<int>
 */
 private static function computeAncestorIds(array $groupIds): array
 {
 $ancestors = [];
 $queue = $groupIds;
 $visited = array_fill_keys($groupIds, true);

 while ($queue) {
 $parents = GroupMember::query()
 ->where('member_type', self::class)
 ->whereIn('member_id', $queue)
 ->pluck('group_id')
 ->all();

 $queue = [];
 foreach ($parents as $parentId) {
 $parentId = (int) $parentId;
 if (isset($visited[$parentId])) {
 continue;
 }
 $visited[$parentId] = true;
 $ancestors[] = $parentId;
 $queue[] = $parentId;
 }
 }

 return $ancestors;
 }
}

5 changes: 3 additions & 2 deletions
ProcessMaker/Models/ProcessMakerModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,9 @@ public function scopeExclude($query, array $columns)
 }

 $columnsToShow = array_diff($this->getTableColumns(), $columns);
 $columnsToShow = array_map(function ($column) {
 return $this->table . '.' . $column;
 $table = $this->getTable();
 $columnsToShow = array_map(function ($column) use ($table) {
 return $table . '.' . $column;
 }, $columnsToShow);

 return $query->select($columnsToShow);
Expand Down

44 changes: 37 additions & 7 deletions
ProcessMaker/Models/User.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,10 @@ class User extends Authenticatable implements HasMedia
 // Session key to save request ids that the user started
 public const REQUESTS_SESSION_KEY = 'web-entry-request-ids';

 public const SELF_SERVICE_GROUP_IDS_CACHE_PREFIX = 'self_service:user_group_ids:';

 public const SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES = 10;

 /**
 * The attributes that are mass assignable.
 *
Expand DownExpand Up@@ -449,15 +453,13 @@ public function canSelfServe(ProcessRequestToken $task)
 return true;
 } elseif (array_key_exists('groups', $task->self_service_groups)) {
 return collect($task->self_service_groups['groups'])
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 } else {
 // For older processes
 return collect($task->self_service_groups)
 ->intersect(
 $this->groups()->pluck('groups.id')
 )->count() > 0;
 ->intersect($this->selfServiceGroupIds())
 ->count() > 0;
 }
 }

Expand All@@ -466,9 +468,37 @@ public function removeFromGroups()
 $this->groups()->detach();
 }

 /**
 * Direct group IDs plus ancestor groups. Cached per user; skipped on inbox repeats.
 */
 public function selfServiceGroupIds()
 {
 $key = $this->selfServiceGroupIdsCacheKey();

 return collect(Cache::remember($key, now()->addMinutes(self::SELF_SERVICE_GROUP_IDS_CACHE_TTL_MINUTES), function () {
 $direct = $this->groups()->pluck('groups.id');
 if ($direct->isEmpty()) {
 return [];
 }

 return $direct->merge(Group::ancestorIdsFor($direct))->unique()->values()->all();
 }));
 }

 public static function flushSelfServiceGroupIdsCache(int $userId): void
 {
 $version = Group::selfServiceHierarchyVersion();
 Cache::forget(self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $userId . ':' . $version);
 }

 private function selfServiceGroupIdsCacheKey(): string
 {
 return self::SELF_SERVICE_GROUP_IDS_CACHE_PREFIX . $this->id . ':' . Group::selfServiceHierarchyVersion();
 }

 public function availableSelfServiceTasksQuery()
 {
 $groupIds = $this->groups()->pluck('groups.id');
 $groupIds = $this->selfServiceGroupIds();

 $taskQuery = ProcessRequestToken::select(['process_request_tokens.id'])
 ->where([
Expand Down

22 changes: 22 additions & 0 deletions
ProcessMaker/Observers/GroupMemberObserver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Events\GroupMembershipChanged;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\User;

class GroupMemberObserver
{
Expand All@@ -14,6 +15,8 @@ class GroupMemberObserver
 */
 public function created(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -32,6 +35,8 @@ public function created(GroupMember $groupMember): void
 */
 public function updated(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -50,6 +55,8 @@ public function updated(GroupMember $groupMember): void
 */
 public function deleted(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -68,6 +75,8 @@ public function deleted(GroupMember $groupMember): void
 */
 public function restored(GroupMember $groupMember): void
 {
 $this->invalidateSelfServiceGroupCache($groupMember);

 // Only handle group-to-group relationships, not user-to-group
 if ($groupMember->member_type === Group::class) {
 $group = Group::find($groupMember->member_id);
Expand All@@ -80,4 +89,17 @@ public function restored(GroupMember $groupMember): void
 }
 }
 }

 private function invalidateSelfServiceGroupCache(GroupMember $groupMember): void
 {
 if ($groupMember->member_type === Group::class) {
 Group::bumpSelfServiceHierarchyVersion();

 return;
 }

 if ($groupMember->member_type === User::class) {
 User::flushSelfServiceGroupIdsCache((int) $groupMember->member_id);
 }
 }
}

162 changes: 162 additions & 0 deletions
tests/Feature/SelfServiceSubgroupTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
<?php

declare(strict_types=1);

namespace Tests\Feature;

use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\GroupMember;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\User;
use Tests\TestCase;

class SelfServiceSubgroupTest extends TestCase
{
 use RefreshDatabase;

 public function test_subgroup_member_sees_and_can_claim_parent_group_self_service_task(): void
 {
 [$parent, $subgroup, $nestedUser, $directUser, $outsider] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());
 $this->assertContains($task->id, $directUser->availableSelfServiceTaskIds());
 $this->assertNotContains($task->id, $outsider->availableSelfServiceTaskIds());

 Auth::login($nestedUser);
 $this->assertTrue($nestedUser->canSelfServe($task));

 Auth::login($directUser);
 $this->assertTrue($directUser->canSelfServe($task));

 Auth::login($outsider);
 $this->assertFalse($outsider->canSelfServe($task));

 $this->assertContains($parent->id, $nestedUser->selfServiceGroupIds());
 $this->assertNotContains($subgroup->id, $outsider->selfServiceGroupIds());
 }

 public function test_two_level_nested_subgroup_member_sees_self_service_task(): void
 {
 $parent = Group::factory()->create();
 $child = Group::factory()->create();
 $grandchild = Group::factory()->create();
 $user = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $child->id,
 'member_type' => Group::class,
 ]);
 GroupMember::factory()->create([
 'group_id' => $child->id,
 'member_id' => $grandchild->id,
 'member_type' => Group::class,
 ]);
 $user->groups()->attach($grandchild);

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [(string) $parent->id]],
 ]);

 $this->assertContains($task->id, $user->availableSelfServiceTaskIds());
 Auth::login($user);
 $this->assertTrue($user->canSelfServe($task));
 }

 public function test_removing_subgroup_from_parent_drops_cached_self_service_visibility(): void
 {
 [$parent, $subgroup, $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'self_service_groups' => ['groups' => [$parent->id]],
 ]);

 $this->assertContains($task->id, $nestedUser->availableSelfServiceTaskIds());

 GroupMember::where('group_id', $parent->id)
 ->where('member_id', $subgroup->id)
 ->where('member_type', Group::class)
 ->first()
 ->delete();

 $this->assertNotContains($task->id, $nestedUser->fresh()->availableSelfServiceTaskIds());
 }

 public function test_exclude_qualifies_columns_with_the_model_table(): void
 {
 $task = ProcessRequestToken::factory()->create([
 'element_type' => 'task',
 ]);

 $found = ProcessRequestToken::exclude(['data'])->find($task->id);

 $this->assertNotNull($found);
 $this->assertSame($task->id, $found->id);
 $this->assertStringContainsString(
 '`process_request_tokens`.`id`',
 ProcessRequestToken::exclude(['data'])->toSql()
 );
 }

 public function test_subgroup_member_sees_parent_self_service_task_on_tasks_index(): void
 {
 [$parent, , $nestedUser] = $this->createNestedGroups();

 $task = ProcessRequestToken::factory()->create([
 'is_self_service' => true,
 'status' => 'ACTIVE',
 'user_id' => null,
 'element_type' => 'task',
 'self_service_groups' => ['groups' => [(string) $parent->id], 'users' => []],
 ]);

 $response = $this->actingAs($nestedUser, 'api')->getJson(route('api.tasks.index', [
 'pmql' => '(status = "Self Service")',
 'per_page' => 15,
 'order_by' => 'ID',
 'order_direction' => 'DESC',
 'non_system' => true,
 'processesIManage' => false,
 ]));

 $response->assertOk();
 $this->assertContains($task->id, collect($response->json('data'))->pluck('id'));
 }

 /**
 * @return array{0: Group, 1: Group, 2: User, 3: User, 4: User}
 */
 private function createNestedGroups(): array
 {
 $parent = Group::factory()->create(['name' => 'Main']);
 $subgroup = Group::factory()->create(['name' => 'Sub']);
 $nestedUser = User::factory()->create();
 $directUser = User::factory()->create();
 $outsider = User::factory()->create();

 GroupMember::factory()->create([
 'group_id' => $parent->id,
 'member_id' => $subgroup->id,
 'member_type' => Group::class,
 ]);
 $nestedUser->groups()->attach($subgroup);
 $directUser->groups()->attach($parent);

 return [$parent, $subgroup, $nestedUser, $directUser, $outsider];
 }
}
Loading