swapped req parameters

bcgov · Oct 27, 2023 · 3f50d0f · 3f50d0f
1 parent 2645188
commit 3f50d0f
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 82 deletions.
diff --git a/src/api/common/base.service.ts b/src/api/common/base.service.ts
@@ -1,6 +1,7 @@
 import { Request } from 'express';
 import { compact } from 'lodash';
 import { FilterQuery, Model } from 'mongoose';
+import { UserProfile } from 'src/auth/dto/user-profile.dto';
 import { CountDto } from './dto/count.dto';
 export class BaseService<T> {
   constructor(protected model: Model<T>) {}
@@ -34,7 +35,10 @@ export class BaseService<T> {
     return res[0] ?? { count: 0 };
   }
 
-  findAll(filter: any = {}): Promise<T[]> {
+  findAll(
+    filter: any = {},
+    req?: Request & { user: UserProfile },
+  ): Promise<T[]> {
     let { where, fields, order, skip, limit } = filter;
     if (fields instanceof Array) {
       fields = fields.reduce((p, c) => {
@@ -69,7 +73,10 @@ export class BaseService<T> {
       .exec();
   }
 
-  async findOne(filter: any = {}): Promise<T> {
+  async findOne(
+    filter: any = {},
+    req?: Request & { user: UserProfile },
+  ): Promise<T> {
     const res = await this.findAll({ ...filter, limit: 1 });
     return res && res[0];
   }
@@ -165,7 +172,10 @@ export class BaseService<T> {
     this.model.findByIdAndRemove(id).exec();
   }
 
-  async removeAll(filter?: FilterQuery<T>) {
+  async removeAll(
+    filter?: FilterQuery<T>,
+    req?: Request & { user: UserProfile },
+  ) {
     const castedFilter = this.model.countDocuments(filter).cast();
     const res = await this.model
       .aggregate(

diff --git a/src/api/notifications/notifications.controller.ts b/src/api/notifications/notifications.controller.ts
@@ -130,9 +130,12 @@ export class NotificationsController extends BaseController {
       if (!currUser) {
         throw new HttpException(undefined, HttpStatus.FORBIDDEN);
       }
-      const instance = await this.notificationsService.findOne(this.req, {
-        where: { id },
-      });
+      const instance = await this.notificationsService.findOne(
+        {
+          where: { id },
+        },
+        this.req,
+      );
       if (instance?.channel !== 'inApp') {
         throw new HttpException(undefined, HttpStatus.FORBIDDEN);
       }
@@ -187,20 +190,26 @@ export class NotificationsController extends BaseController {
     @JsonQuery('filter')
     filter: Omit<FilterDto<Notification>, 'where'>,
   ): Promise<Notification | null> {
-    return this.notificationsService.findOne(this.req, {
-      ...filter,
-      where: { id },
-    });
+    return this.notificationsService.findOne(
+      {
+        ...filter,
+        where: { id },
+      },
+      this.req,
+    );
   }
 
   @Delete(':id')
   @ApiNoContentResponse({ description: 'Notification DELETE success' })
   @ApiForbiddenResponse({ description: 'Forbidden' })
   @HttpCode(204)
   async deleteById(@Param('id') id: string): Promise<void> {
-    const data = await this.notificationsService.findOne(this.req, {
-      where: { id },
-    });
+    const data = await this.notificationsService.findOne(
+      {
+        where: { id },
+      },
+      this.req,
+    );
     if (!data) throw new HttpException(undefined, HttpStatus.NOT_FOUND);
     data.state = 'deleted';
     await this.updateById(id, data);
@@ -230,7 +239,7 @@ export class NotificationsController extends BaseController {
     @JsonQuery('filter')
     filter: FilterDto<Notification>,
   ): Promise<Notification[]> {
-    const res = await this.notificationsService.findAll(this.req, filter);
+    const res = await this.notificationsService.findAll(filter, this.req);
     if (res.length === 0) {
       return res;
     }
@@ -277,9 +286,12 @@ export class NotificationsController extends BaseController {
         this.chunkRequestAborted = true;
       });
     }
-    const notification = await this.notificationsService.findOne(this.req, {
-      where: { id },
-    });
+    const notification = await this.notificationsService.findOne(
+      {
+        where: { id },
+      },
+      this.req,
+    );
     if (!notification) throw new HttpException(undefined, HttpStatus.NOT_FOUND);
     this.req['args'] = { data: notification };
     this.req['NotifyBC.startIdx'] = startIdx;
@@ -445,12 +457,12 @@ export class NotificationsController extends BaseController {
             data.dispatch?.skipped ?? [],
           );
           const subscribers = await this.subscriptionsService.findAll(
-            this.req,
             {
               where: {
                 id: { $in: subChunk },
               },
             },
+            this.req,
           );
           const notificationMsgCB = async (err: any, e: Subscription) => {
             if (err) {
@@ -605,16 +617,19 @@ export class NotificationsController extends BaseController {
           // main request
           const postBroadcastProcessing = async () => {
             data = await this.notificationsService.findById(data.id);
-            const res = await this.subscriptionsService.findAll(this.req, {
-              fields: {
-                userChannelId: true,
-              },
-              where: {
-                id: {
-                  $in: data.dispatch?.successful,
+            const res = await this.subscriptionsService.findAll(
+              {
+                fields: {
+                  userChannelId: true,
+                },
+                where: {
+                  id: {
+                    $in: data.dispatch?.successful,
+                  },
                 },
               },
-            });
+              this.req,
+            );
             const userChannelIds = res.map((e) => e.userChannelId);
             const errUserChannelIds = (data.dispatch?.failed || []).map(
               (e: { userChannelId: any }) => e.userChannelId,
@@ -649,7 +664,6 @@ export class NotificationsController extends BaseController {
           };
 
           const subCandidates = await this.subscriptionsService.findAll(
-            this.req,
             {
               where: {
                 serviceName: data.serviceName,
@@ -658,6 +672,7 @@ export class NotificationsController extends BaseController {
               },
               fields: ['id'],
             },
+            this.req,
           );
           data.dispatch = data.dispatch ?? {};
           data.dispatch.candidates =
@@ -854,9 +869,12 @@ export class NotificationsController extends BaseController {
     }
 
     try {
-      const subscription = await this.subscriptionsService.findOne(this.req, {
-        where: whereClause,
-      });
+      const subscription = await this.subscriptionsService.findOne(
+        {
+          where: whereClause,
+        },
+        this.req,
+      );
       if (!subscription) {
         throw new HttpException('invalid user', HttpStatus.FORBIDDEN);
       }

diff --git a/src/api/notifications/notifications.service.ts b/src/api/notifications/notifications.service.ts
@@ -45,16 +45,16 @@ export class NotificationsService extends BaseService<Notification> {
   }
 
   findAll(
-    req: Request & { user: UserProfile },
     filter: FilterDto<Notification> = {},
+    req: Request & { user: UserProfile },
   ) {
     filter.where = this.accessInterceptor(req, filter.where);
     return super.findAll(filter);
   }
 
   async findOne(
-    req: Request & { user: UserProfile },
     filter: FilterDto<Notification> = {},
+    req: Request & { user: UserProfile },
   ): Promise<Notification> {
     filter.where = this.accessInterceptor(req, filter.where);
     return super.findOne(filter);
@@ -70,8 +70,8 @@ export class NotificationsService extends BaseService<Notification> {
   }
 
   async removeAll(
-    req: Request & { user: UserProfile },
-    where?: FilterQuery<Notification>,
+    where: FilterQuery<Notification>,
+    req?: Request & { user: UserProfile },
   ) {
     where = this.accessInterceptor(req, where);
     return super.removeAll(where);