Merge pull request #3211 from humanprotocol/develop

[Job Launcher] Fix payment creation order and enable whitelist check

Author: portuu3

packages/apps/job-launcher/server/src/common/constants/errors.ts

@@ -4,7 +4,7 @@
 export enum ErrorJob {
   NotFound = 'Job not found',
   NotCreated = 'Job has not been created',
-  NotActiveCard = 'Credit card not found',
+  NotActiveCard = 'Credit card not found. Please, add a credit card to your account.',
   ManifestNotFound = 'Manifest not found',
   ManifestValidationFailed = 'Manifest validation failed',
   ResultNotFound = 'Result not found',

packages/apps/job-launcher/server/src/modules/job/job.service.ts

@@ -878,13 +878,6 @@ export class JobService {
       });
     }
 
-    const paymentEntity = await this.paymentService.createWithdrawalPayment(
-      user.id,
-      totalPaymentAmount,
-      dto.paymentCurrency,
-      paymentCurrencyRate,
-    );
-
     const { createManifest } = this.createJobSpecificActions[requestType];
 
     let jobEntity = new JobEntity();
@@ -923,6 +916,13 @@ export class JobService {
       jobEntity.manifestHash = hash;
     }
 
+    const paymentEntity = await this.paymentService.createWithdrawalPayment(
+      user.id,
+      totalPaymentAmount,
+      dto.paymentCurrency,
+      paymentCurrencyRate,
+    );
+
     jobEntity.chainId = chainId;
     jobEntity.reputationOracle = reputationOracle;
     jobEntity.exchangeOracle = exchangeOracle;

packages/apps/job-launcher/server/src/modules/whitelist/whitelist.service.spec.ts

@@ -37,16 +37,16 @@ describe('WhitelistService', () => {
       expect(result).toBe(true);
     });
 
-    // it('should return false if user is not whitelisted', async () => {
-    //   const userId = 2;
-    //   jest
-    //     .spyOn(whitelistRepository, 'findOneByUserId')
-    //     .mockResolvedValue(null);
+    it('should return false if user is not whitelisted', async () => {
+      const userId = 2;
+      jest
+        .spyOn(whitelistRepository, 'findOneByUserId')
+        .mockResolvedValue(null);
 
-    //   const result = await whitelistService.isUserWhitelisted(userId);
+      const result = await whitelistService.isUserWhitelisted(userId);
 
-    //   expect(whitelistRepository.findOneByUserId).toHaveBeenCalledWith(userId);
-    //   expect(result).toBe(false);
-    // });
+      expect(whitelistRepository.findOneByUserId).toHaveBeenCalledWith(userId);
+      expect(result).toBe(false);
+    });
   });
 });

packages/apps/job-launcher/server/src/modules/whitelist/whitelist.service.ts

@@ -6,8 +6,6 @@ export class WhitelistService {
   constructor(private readonly whitelistRepository: WhitelistRepository) {}
 
   async isUserWhitelisted(userId: number): Promise<boolean> {
-    // TODO: Enable it when billing system is active
-    return true;
     const user = await this.whitelistRepository.findOneByUserId(userId);
     return !!user;
   }