Migrate to new delete permission check (#2976)

Author: CarsonF

src/components/budget/budget.service.ts

@@ -10,7 +10,6 @@ import {
   Order,
   ServerException,
   Session,
-  UnauthorizedException,
   viewOfChangeset,
 } from '../../common';
 import { HandleIdLookup, ILogger, Logger, ResourceResolver } from '../../core';
@@ -288,15 +287,7 @@ export class BudgetService {
   async delete(id: ID, session: Session): Promise<void> {
     const budget = await this.readOne(id, session);
 
-    if (!budget) {
-      throw new NotFoundException('Could not find Budget');
-    }
-
-    const canDelete = await this.budgetRepo.checkDeletePermission(id, session);
-    if (!canDelete)
-      throw new UnauthorizedException(
-        'You do not have the permission to delete this Budget',
-      );
+    this.privileges.for(session, Budget, budget).verifyCan('delete');
 
     // cascade delete each budget record in this budget
     await Promise.all(
@@ -320,19 +311,7 @@ export class BudgetService {
       viewOfChangeset(changeset),
     );
 
-    if (!br) {
-      throw new NotFoundException('Could not find Budget Record');
-    }
-
-    const canDelete = await this.budgetRecordsRepo.checkDeletePermission(
-      id,
-      session,
-    );
-
-    if (!canDelete)
-      throw new UnauthorizedException(
-        'You do not have the permission to delete this Budget Record',
-      );
+    this.privileges.for(session, BudgetRecord, br).verifyCan('delete');
 
     try {
       await this.budgetRecordsRepo.deleteNode(br, changeset);

src/components/ceremony/ceremony.service.ts

@@ -2,11 +2,9 @@ import { Injectable } from '@nestjs/common';
 import {
   ID,
   InputException,
-  NotFoundException,
   ObjectView,
   ServerException,
   Session,
-  UnauthorizedException,
   UnsecuredDto,
 } from '../../common';
 import { HandleIdLookup, ILogger, Logger } from '../../core';
@@ -83,19 +81,8 @@ export class CeremonyService {
   async delete(id: ID, session: Session): Promise<void> {
     const object = await this.readOne(id, session);
 
-    if (!object) {
-      throw new NotFoundException('Could not find ceremony', 'ceremony.id');
-    }
-
-    const canDelete = await this.ceremonyRepo.checkDeletePermission(
-      id,
-      session,
-    );
-
-    if (!canDelete)
-      throw new UnauthorizedException(
-        'You do not have the permission to delete this Ceremony',
-      );
+    // Only called internally, not exposed directly to users
+    // this.privileges.for(session, Ceremony, object).verifyCan('delete');
 
     try {
       await this.ceremonyRepo.deleteNode(object);

src/components/engagement/engagement.service.ts

@@ -8,7 +8,6 @@ import {
   SecuredList,
   ServerException,
   Session,
-  UnauthorizedException,
   UnsecuredDto,
   viewOfChangeset,
 } from '../../common';
@@ -365,14 +364,9 @@ export class EngagementService {
   async delete(id: ID, session: Session, changeset?: ID): Promise<void> {
     const object = await this.readOne(id, session);
 
-    if (!object) {
-      throw new NotFoundException('Could not find engagement', 'engagement.id');
-    }
-
-    if (!object.canDelete)
-      throw new UnauthorizedException(
-        'You do not have the permission to delete this Engagement',
-      );
+    this.privileges
+      .for(session, resolveEngagementType(object), object)
+      .verifyCan('delete');
 
     await this.verifyProjectStatus(object.project, session, changeset);
 

src/components/ethno-art/ethno-art.service.ts

@@ -2,11 +2,9 @@ import { Injectable } from '@nestjs/common';
 import {
   DuplicateException,
   ID,
-  NotFoundException,
   ObjectView,
   ServerException,
   Session,
-  UnauthorizedException,
 } from '../../common';
 import { DbTypeOf, HandleIdLookup, ILogger, Logger } from '../../core';
 import { ifDiff } from '../../core/database/changes';
@@ -114,16 +112,7 @@ export class EthnoArtService {
   async delete(id: ID, session: Session): Promise<void> {
     const ethnoArt = await this.readOne(id, session);
 
-    if (!ethnoArt) {
-      throw new NotFoundException('Could not find Ethno Art');
-    }
-
-    const canDelete = await this.repo.checkDeletePermission(id, session);
-    if (!canDelete) {
-      throw new UnauthorizedException(
-        'You do not have permissions to delete this Ethno Art',
-      );
-    }
+    this.privileges.for(session, EthnoArt, ethnoArt).verifyCan('delete');
 
     try {
       await this.repo.deleteNode(ethnoArt);

src/components/field-region/field-region.service.ts

@@ -2,12 +2,10 @@ import { Injectable } from '@nestjs/common';
 import {
   DuplicateException,
   ID,
-  NotFoundException,
   ObjectView,
   SecuredList,
   ServerException,
   Session,
-  UnauthorizedException,
   UnsecuredDto,
 } from '../../common';
 import { HandleIdLookup, ILogger, Logger } from '../../core';
@@ -99,16 +97,7 @@ export class FieldRegionService {
   async delete(id: ID, session: Session): Promise<void> {
     const object = await this.readOne(id, session);
 
-    if (!object) {
-      throw new NotFoundException('Could not find Field Region');
-    }
-
-    const canDelete = await this.repo.checkDeletePermission(id, session);
-
-    if (!canDelete)
-      throw new UnauthorizedException(
-        'You do not have the permission to delete this Field Region',
-      );
+    this.privileges.for(session, FieldRegion, object).verifyCan('delete');
 
     try {
       await this.repo.deleteNode(object);

src/components/field-zone/field-zone.service.ts

@@ -2,12 +2,10 @@ import { Injectable } from '@nestjs/common';
 import {
   DuplicateException,
   ID,
-  NotFoundException,
   ObjectView,
   SecuredList,
   ServerException,
   Session,
-  UnauthorizedException,
   UnsecuredDto,
 } from '../../common';
 import { HandleIdLookup, ILogger, Logger } from '../../core';
@@ -91,16 +89,7 @@ export class FieldZoneService {
   async delete(id: ID, session: Session): Promise<void> {
     const object = await this.readOne(id, session);
 
-    if (!object) {
-      throw new NotFoundException('Could not find Field Zone');
-    }
-
-    const canDelete = await this.repo.checkDeletePermission(id, session);
-
-    if (!canDelete)
-      throw new UnauthorizedException(
-        'You do not have the permission to delete this Field Zone',
-      );
+    this.privileges.for(session, FieldZone, object).verifyCan('delete');
 
     try {
       await this.repo.deleteNode(object);

src/components/file/file.repository.ts

@@ -13,13 +13,7 @@ import {
 import { Direction } from 'cypher-query-builder/dist/typings/clauses/order-by';
 import { AnyConditions } from 'cypher-query-builder/dist/typings/clauses/where-utils';
 import { DateTime } from 'luxon';
-import {
-  ID,
-  NotFoundException,
-  ServerException,
-  Session,
-  UnauthorizedException,
-} from '../../common';
+import { ID, NotFoundException, ServerException, Session } from '../../common';
 import {
   CommonRepository,
   ILogger,
@@ -572,14 +566,7 @@ export class FileRepository extends CommonRepository {
     }
   }
 
-  async delete(fileNode: FileNode, session: Session): Promise<void> {
-    const canDelete = await this.db.checkDeletePermission(fileNode.id, session);
-
-    if (!canDelete)
-      throw new UnauthorizedException(
-        'You do not have the permission to delete this File item',
-      );
-
+  async delete(fileNode: FileNode, _session: Session): Promise<void> {
     try {
       await this.db.deleteNode(fileNode);
     } catch (exception) {

src/components/film/film.service.ts

@@ -2,12 +2,10 @@ import { Injectable } from '@nestjs/common';
 import {
   DuplicateException,
   ID,
-  NotFoundException,
   ObjectView,
   SecuredList,
   ServerException,
   Session,
-  UnauthorizedException,
 } from '../../common';
 import { DbTypeOf, HandleIdLookup, ILogger, Logger } from '../../core';
 import { ifDiff } from '../../core/database/changes';
@@ -114,16 +112,7 @@ export class FilmService {
   async delete(id: ID, session: Session): Promise<void> {
     const film = await this.readOne(id, session);
 
-    if (!film) {
-      throw new NotFoundException('Could not find Film');
-    }
-
-    const canDelete = await this.repo.checkDeletePermission(id, session);
-
-    if (!canDelete)
-      throw new UnauthorizedException(
-        'You do not have the permission to delete this Film',
-      );
+    this.privileges.for(session, Film, film).verifyCan('delete');
 
     try {
       await this.repo.deleteNode(film);

src/components/funding-account/funding-account.service.ts

@@ -7,7 +7,6 @@ import {
   SecuredList,
   ServerException,
   Session,
-  UnauthorizedException,
   UnsecuredDto,
 } from '../../common';
 import { HandleIdLookup, ILogger, Logger } from '../../core';
@@ -107,16 +106,7 @@ export class FundingAccountService {
   async delete(id: ID, session: Session): Promise<void> {
     const object = await this.readOne(id, session);
 
-    if (!object) {
-      throw new NotFoundException('Could not find Funding Account');
-    }
-
-    const canDelete = await this.repo.checkDeletePermission(id, session);
-
-    if (!canDelete)
-      throw new UnauthorizedException(
-        'You do not have the permission to delete this Funding Account',
-      );
+    this.privileges.for(session, FundingAccount, object).verifyCan('delete');
 
     try {
       await this.repo.deleteNode(object);

src/components/language/language.service.ts

@@ -5,12 +5,10 @@ import {
   DuplicateException,
   ID,
   InputException,
-  NotFoundException,
   ObjectView,
   SecuredDate,
   ServerException,
   Session,
-  UnauthorizedException,
   UnsecuredDto,
 } from '../../common';
 import { HandleIdLookup, ILogger, Logger, UniquenessError } from '../../core';
@@ -157,16 +155,7 @@ export class LanguageService {
   async delete(id: ID, session: Session): Promise<void> {
     const object = await this.readOne(id, session);
 
-    if (!object) {
-      throw new NotFoundException('Could not find language', 'language.id');
-    }
-
-    const canDelete = await this.repo.checkDeletePermission(id, session);
-
-    if (!canDelete)
-      throw new UnauthorizedException(
-        'You do not have the permission to delete this Language',
-      );
+    this.privileges.for(session, Language, object).verifyCan('delete');
 
     try {
       await this.repo.deleteNode(object);