PR feedback: typos & renaming

Author: vas3a

src/api/repository/identiti-verification.repo.ts renamed to src/api/repository/identity-verification.repo.ts

@@ -3,7 +3,7 @@ import { WalletController } from './wallet.controller';
 import { WalletService } from './wallet.service';
 import { TaxFormRepository } from '../repository/taxForm.repo';
 import { PaymentMethodRepository } from '../repository/paymentMethod.repo';
-import { IdentityVerificationRepository } from '../repository/identiti-verification.repo';
+import { IdentityVerificationRepository } from '../repository/identity-verification.repo';
 
 @Module({
   imports: [],

src/api/wallet/wallet.module.ts

@@ -12,7 +12,7 @@ import {
   TrolleyService,
 } from 'src/shared/global/trolley.service';
 import { Logger } from 'src/shared/global';
-import { IdentityVerificationRepository } from '../repository/identiti-verification.repo';
+import { IdentityVerificationRepository } from '../repository/identity-verification.repo';
 
 /**
  * The winning service.
@@ -59,7 +59,7 @@ export class WalletService {
       const winnings = await this.getWinningsTotalsByWinnerID(userId);
 
       const hasActiveTaxForm = await this.taxFormRepo.hasActiveTaxForm(userId);
-      const completedIdentityVerification =
+      const isIdentityVerified =
         await this.identityVerificationRepo.completedIdentityVerification(
           userId,
         );
@@ -98,7 +98,7 @@ export class WalletService {
           isSetupComplete: hasActiveTaxForm,
         },
         identityVerification: {
-          isSetupComplete: completedIdentityVerification,
+          isSetupComplete: isIdentityVerified,
         },
         ...(taxWithholdingDetails ?? {}),
       };

src/api/wallet/wallet.service.ts

@@ -6,7 +6,7 @@ import { WinningsRepository } from '../repository/winnings.repo';
 import { TaxFormRepository } from '../repository/taxForm.repo';
 import { PaymentMethodRepository } from '../repository/paymentMethod.repo';
 import { TopcoderModule } from 'src/shared/topcoder/topcoder.module';
-import { IdentityVerificationRepository } from '../repository/identiti-verification.repo';
+import { IdentityVerificationRepository } from '../repository/identity-verification.repo';
 
 @Module({
   imports: [TopcoderModule],

src/api/winnings/winnings.module.ts

@@ -19,7 +19,7 @@ import { BASIC_MEMBER_FIELDS } from 'src/shared/topcoder';
 import { ENV_CONFIG } from 'src/config';
 import { Logger } from 'src/shared/global';
 import { TopcoderEmailService } from 'src/shared/topcoder/tc-email.service';
-import { IdentityVerificationRepository } from '../repository/identiti-verification.repo';
+import { IdentityVerificationRepository } from '../repository/identity-verification.repo';
 
 /**
  * The winning service.
@@ -184,7 +184,7 @@ export class WinningsService {
       const hasConnectedPaymentMethod = Boolean(
         await this.paymentMethodRepo.getConnectedPaymentMethod(body.winnerId),
       );
-      const completedIdentityVerification =
+      const isIdentityVerified =
         await this.identityVerificationRepo.completedIdentityVerification(
           userId,
         );
@@ -204,9 +204,7 @@ export class WinningsService {
 
         paymentModel.net_amount = Prisma.Decimal(detail.grossAmount);
         paymentModel.payment_status =
-          hasConnectedPaymentMethod &&
-          hasActiveTaxForm &&
-          completedIdentityVerification
+          hasConnectedPaymentMethod && hasActiveTaxForm && isIdentityVerified
             ? PaymentStatus.OWED
             : PaymentStatus.ON_HOLD;
 

src/api/winnings/winnings.service.ts

@@ -5,7 +5,7 @@ import { WithdrawalService } from './withdrawal.service';
 import { TaxFormRepository } from '../repository/taxForm.repo';
 import { PaymentMethodRepository } from '../repository/paymentMethod.repo';
 import { TopcoderModule } from 'src/shared/topcoder/topcoder.module';
-import { IdentityVerificationRepository } from '../repository/identiti-verification.repo';
+import { IdentityVerificationRepository } from '../repository/identity-verification.repo';
 
 @Module({
   imports: [PaymentsModule, TopcoderModule],

src/api/withdrawal/withdrawal.module.ts

@@ -3,7 +3,7 @@ import { ENV_CONFIG } from 'src/config';
 import { PrismaService } from 'src/shared/global/prisma.service';
 import { TaxFormRepository } from '../repository/taxForm.repo';
 import { PaymentMethodRepository } from '../repository/paymentMethod.repo';
-import { IdentityVerificationRepository } from '../repository/identiti-verification.repo';
+import { IdentityVerificationRepository } from '../repository/identity-verification.repo';
 import { payment_releases, payment_status, Prisma } from '@prisma/client';
 import { TrolleyService } from 'src/shared/global/trolley.service';
 import { PaymentsService } from 'src/shared/payments';
@@ -200,12 +200,12 @@ export class WithdrawalService {
       );
     }
 
-    const completedIdentityVerification =
+    const isIdentityVerified =
       await this.identityVerificationRepo.completedIdentityVerification(userId);
 
-    if (!completedIdentityVerification) {
+    if (!isIdentityVerified) {
       throw new Error(
-        'Please compelte identity verification before making a withdrawal.',
+        'Please complete identity verification before making a withdrawal.',
       );
     }
 

src/api/withdrawal/withdrawal.service.ts

@@ -40,7 +40,7 @@ export class PaymentsService {
         END as "setupComplete"
       FROM user_payment_methods upm
       LEFT JOIN user_tax_form_associations utx ON upm.user_id = utx.user_id AND utx.tax_form_status = 'ACTIVE'
-      LEFT JOIN user_identity_verification_associations uiv ON upm.user_id = uiv.user_id
+      LEFT JOIN user_identity_verification_associations uiv ON upm.user_id = uiv.user_id AND uiv.verification_status::text = 'ACTIVE'
       WHERE upm.user_id IN (${Prisma.join(uniq(userIds))})
       `;