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

backend/src/modules/treatments/treatments.service.ts

@@ -21,6 +21,7 @@ import {
   normalizeTeeth,
 } from './treatment.utils';
 import { assertCompleteToothProsthesisMap } from './lab-case-send.validation';
+import { hasEffectivePermission } from '../../common/membership-permissions';
 
 const treatmentInclude = {
   details: {
@@ -923,9 +924,10 @@ export class TreatmentsService {
     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_TREATMENT_READ') || names.includes('TAB_TREATMENT_EDIT')) {
+    if (
+      hasEffectivePermission(m, 'TAB_TREATMENT_READ') ||
+      hasEffectivePermission(m, 'TAB_TREATMENT_EDIT')
+    ) {
       return;
     }
     throw new ForbiddenException('You do not have access to treatments');
@@ -936,9 +938,7 @@ export class TreatmentsService {
     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_TREATMENT_EDIT')) {
+    if (hasEffectivePermission(m, 'TAB_TREATMENT_EDIT')) {
       return;
     }
     throw new ForbiddenException('You cannot edit treatments');
@@ -946,8 +946,15 @@ export class TreatmentsService {
 
   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 } },
+      },
     });
   }
 }