Merge pull request #306 from kmcwebdev/development

Refactor code to handle new request approver validation and improve s…
kmcwebdev · Sep 30, 2023 · 3f6e180 · 3f6e180
2 parents 3b7e8e4 + e924fa1
commit 3f6e180
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/finance/services/memphis/reimbursement.memphis.new-request.service.ts b/src/finance/services/memphis/reimbursement.memphis.new-request.service.ts
@@ -1,5 +1,11 @@
 import { ConfigService } from '@nestjs/config';
-import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
+import {
+  HttpException,
+  HttpStatus,
+  Injectable,
+  Logger,
+  OnModuleInit,
+} from '@nestjs/common';
 import { catchError, firstValueFrom } from 'rxjs';
 import { HttpService } from '@nestjs/axios';
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
@@ -189,6 +195,21 @@ export class ReimbursementMemphisNewRequestService implements OnModuleInit {
             const approvers = newRequest.dynamic_approvers.split(',');
             approvers.forEach(async (email) => {
               await this.pgsql.transaction().execute(async (trx) => {
+                const IamMyManagerStupidMotherFucker = await trx
+                  .selectFrom('users')
+                  .select('users.email')
+                  .where('users.user_id', '=', newRequest.requestor_id)
+                  .executeTakeFirst();
+
+                if (IamMyManagerStupidMotherFucker) {
+                  if (IamMyManagerStupidMotherFucker.email === email) {
+                    throw new HttpException(
+                      'Nope not gonna happen 🤪',
+                      HttpStatus.BAD_REQUEST,
+                    );
+                  }
+                }
+
                 const propelauthUser =
                   await this.usersApiService.fetchUserInPropelauthByEmail(
                     email,

diff --git a/src/finance/services/reimbursement.for-approval.service.ts b/src/finance/services/reimbursement.for-approval.service.ts
@@ -218,6 +218,10 @@ export class ReimbursementForApprovalService {
         'users.hrbp_approver_email',
         'users.payroll_account',
         'finance_reimbursement_requests.created_at',
+        sql<number>`ts_rank(to_tsvector('english', finance_reimbursement_requests.reference_no || ' ' || coalesce(users.full_name, '') || ' ' || users.email || ' ' ||  
+         coalesce(users.client_name, '') || ' ' || coalesce(users.hrbp_approver_email, '')), plainto_tsquery(${
+           filter?.text_search || 'r'
+         }))`.as('rank'),
       ]);
 
     query = query.where(
@@ -259,7 +263,7 @@ export class ReimbursementForApprovalService {
     if (filter?.text_search) {
       query = query.where(
         sql`to_tsvector('english', finance_reimbursement_requests.reference_no || ' ' || coalesce(users.full_name, '') || ' ' || users.email || ' ' ||  
-         coalesce(users.client_name, '') || ' ' || coalesce(users.hrbp_approver_email, '')) @@ websearch_to_tsquery(${filter.text_search})`,
+         coalesce(users.client_name, '') || ' ' || coalesce(users.hrbp_approver_email, '')) @@ plainto_tsquery(${filter.text_search})`,
       );
     }