improvement: a flow added for owner users to make it possible for them to participate in treatments or tasks.

backend/src/modules/tasks/tasks.service.ts

@@ -13,6 +13,7 @@ import {
 } from '../catalog/catalog-label.service';
 import { normalizeTaskTeeth } from '../cases/lab-case-task.util';
 import { ListLabTasksDto, UpdateLabTaskDto } from './dto/tasks.dto';
+import { hasEffectivePermission } from '../../common/membership-permissions';
 
 const taskListInclude = {
   lastStatusChangedBy: { select: { id: true, name: true } },
@@ -288,9 +289,10 @@ export class TasksService {
     if (!m) {
       throw new ForbiddenException('You are not a member of this organization');
     }
-    if (m.isOwner) return;
-    const names = m.permissions.map((p) => p.permission.name);
-    if (names.includes('TAB_TASKS_READ') || names.includes('TAB_TASKS_EDIT')) {
+    if (
+      hasEffectivePermission(m, 'TAB_TASKS_READ') ||
+      hasEffectivePermission(m, 'TAB_TASKS_EDIT')
+    ) {
       return;
     }
     throw new ForbiddenException('You do not have access to tasks');
@@ -301,9 +303,7 @@ export class TasksService {
     if (!m) {
       throw new ForbiddenException('You are not a member of this organization');
     }
-    if (m.isOwner) return;
-    const names = m.permissions.map((p) => p.permission.name);
-    if (names.includes('TAB_TASKS_EDIT')) {
+    if (hasEffectivePermission(m, 'TAB_TASKS_EDIT')) {
       return;
     }
     throw new ForbiddenException('You cannot update tasks');
@@ -311,8 +311,15 @@ export class TasksService {
 
   private async getMembership(userId: string, organizationId: string) {
     return this.prisma.membership.findFirst({
-      where: { userId, organizationId, isActive: true },
-      include: { permissions: { include: { permission: true } } },
+      where: {
+        userId,
+        organizationId,
+        OR: [{ isOwner: true }, { isActive: true }],
+      },
+      include: {
+        permissions: { include: { permission: true } },
+        organization: { include: { type: true, plan: true } },
+      },
     });
   }
 }