Improvements after code review

apps/api/src/app/order/order.controller.ts

@@ -41,15 +41,11 @@ export class OrderController {
     @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
-  @Delete(':id')
+  @Delete()
   @UseGuards(AuthGuard('jwt'))
-  public async deleteOrder(@Param('id') id: string): Promise<OrderModel> {
-    const order = await this.orderService.order({ id });
-
+  public async deleteOrders(): Promise<number> {
     if (
-      !hasPermission(this.request.user.permissions, permissions.deleteOrder) ||
-      !order ||
-      order.userId !== this.request.user.id
+      !hasPermission(this.request.user.permissions, permissions.deleteOrder)
     ) {
       throw new HttpException(
         getReasonPhrase(StatusCodes.FORBIDDEN),
@@ -57,16 +53,20 @@ export class OrderController {
       );
     }
 
-    return this.orderService.deleteOrder({
-      id
+    return this.orderService.deleteOrders({
+      userId: this.request.user.id
     });
   }
 
-  @Delete()
+  @Delete(':id')
   @UseGuards(AuthGuard('jwt'))
-  public async deleteOrders(): Promise<number> {
+  public async deleteOrder(@Param('id') id: string): Promise<OrderModel> {
+    const order = await this.orderService.order({ id });
+
     if (
-      !hasPermission(this.request.user.permissions, permissions.deleteOrder)
+      !hasPermission(this.request.user.permissions, permissions.deleteOrder) ||
+      !order ||
+      order.userId !== this.request.user.id
     ) {
       throw new HttpException(
         getReasonPhrase(StatusCodes.FORBIDDEN),
@@ -74,8 +74,8 @@ export class OrderController {
       );
     }
 
-    return this.orderService.deleteOrders({
-      userId: this.request.user.id
+    return this.orderService.deleteOrder({
+      id
     });
   }
 

apps/client/src/app/services/data.service.ts

@@ -146,14 +146,14 @@ export class DataService {
     return this.http.delete<any>(`/api/v1/account/${aId}`);
   }
 
-  public deleteOrder(aId: string) {
-    return this.http.delete<any>(`/api/v1/order/${aId}`);
-  }
-
   public deleteAllOrders() {
     return this.http.delete<any>(`/api/v1/order/`);
   }
 
+  public deleteOrder(aId: string) {
+    return this.http.delete<any>(`/api/v1/order/${aId}`);
+  }
+
   public deleteUser(aId: string) {
     return this.http.delete<any>(`/api/v1/user/${aId}`);
   }

libs/ui/src/lib/activities-table/activities-table.component.html

@@ -59,7 +59,7 @@
       (click)="onDeleteAllActivities()"
     >
       <ion-icon class="mr-2" name="trash-outline"></ion-icon>
-      <span i18n>Delete all activities</span>
+      <span i18n>Delete all Activities</span>
     </button>
   </mat-menu>
 </div>

libs/ui/src/lib/activities-table/activities-table.component.ts

@@ -49,10 +49,10 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit {
   @Output() activityDeleted = new EventEmitter<string>();
   @Output() activityToClone = new EventEmitter<OrderWithAccount>();
   @Output() activityToUpdate = new EventEmitter<OrderWithAccount>();
+  @Output() deleteAllActivities = new EventEmitter<void>();
   @Output() export = new EventEmitter<string[]>();
   @Output() exportDrafts = new EventEmitter<string[]>();
   @Output() import = new EventEmitter<void>();
-  @Output() deleteAllActivities = new EventEmitter<void>();
   @Output() importDividends = new EventEmitter<UniqueAsset>();
   @Output() selectedActivities = new EventEmitter<Activity[]>();