[Job Launcher] Update job creation to use manifest JSON

packages/apps/job-launcher/client/src/components/Jobs/Create/CryptoPayForm.tsx

@@ -226,6 +226,7 @@ export const CryptoPayForm = ({
             paymentTokenSymbol,
             Number(amount),
             fundTokenSymbol,
+            fundAmount,
           );
         } else if (jobType === JobType.CVAT && cvatRequest) {
           await jobService.createCvatJob(

packages/apps/job-launcher/client/src/components/Jobs/Create/FiatPayForm.tsx

@@ -253,6 +253,7 @@ export const FiatPayForm = ({
           CURRENCY.usd,
           amount,
           tokenSymbol,
+          fundAmount,
         );
       } else if (jobType === JobType.CVAT && cvatRequest) {
         await createCvatJob(

packages/apps/job-launcher/client/src/services/job.ts

@@ -1,34 +1,48 @@
 import { ChainId } from '@human-protocol/sdk';
 import {
-  CreateFortuneJobRequest,
+  CreateJobRequest,
   CreateCvatJobRequest,
   FortuneRequest,
   CvatRequest,
   JobStatus,
   JobDetailsResponse,
   FortuneFinalResult,
+  FortuneManifest,
+  JobType,
 } from '../types';
 import api from '../utils/api';
 import { getFilenameFromContentDisposition } from '../utils/string';
 
+const buildFortuneManifest = (
+  data: FortuneRequest,
+  fundAmount: number,
+): FortuneManifest => ({
+  submissionsRequired: Number(data.fortunesRequested),
+  requesterTitle: data.title,
+  requesterDescription: data.description,
+  fundAmount,
+  requestType: JobType.FORTUNE,
+  qualifications: data.qualifications,
+});
+
 export const createFortuneJob = async (
   chainId: number,
   data: FortuneRequest,
   paymentCurrency: string,
   paymentAmount: number | string,
   escrowFundToken: string,
+  fundAmount: number,
 ) => {
-  const body: CreateFortuneJobRequest = {
+  const body: CreateJobRequest<FortuneManifest> = {
     chainId,
-    submissionsRequired: Number(data.fortunesRequested),
-    requesterTitle: data.title,
-    requesterDescription: data.description,
+    requestType: JobType.FORTUNE,
     paymentCurrency,
     paymentAmount: Number(paymentAmount),
     escrowFundToken,
     qualifications: data.qualifications,
+    manifest: buildFortuneManifest(data, fundAmount),
   };
-  await api.post('/job/fortune', body);
+  await api.post('/job', body);
 };
 
 export const createCvatJob = async (

packages/apps/job-launcher/client/src/types/index.ts

@@ -39,15 +39,23 @@ export type FiatPaymentRequest = {
   paymentMethodId: string;
 };
 
-export type CreateFortuneJobRequest = {
-  chainId: number;
+export type FortuneManifest = {
   submissionsRequired: number;
   requesterTitle: string;
   requesterDescription: string;
+  fundAmount: number;
+  requestType: JobType.FORTUNE;
+  qualifications?: string[];
+};
+
+export type CreateJobRequest<TManifest = Record<string, unknown>> = {
+  chainId: number;
+  requestType: JobType;
   paymentCurrency: string;
   paymentAmount: number;
   escrowFundToken: string;
   qualifications?: string[];
+  manifest: TManifest;
 };
 
 export type CreateCvatJobRequest = {

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

@@ -2,7 +2,8 @@ import { faker } from '@faker-js/faker';
 import { ChainId } from '@human-protocol/sdk';
 import { EscrowFundToken, FortuneJobType } from '../../common/enums/job';
 import { PaymentCurrency } from '../../common/enums/payment';
-import { JobFortuneDto } from './job.dto';
+import { createMockFortuneManifest } from '../manifest/fixtures';
+import { JobManifestDto } from './job.dto';
 import { JobEntity } from './job.entity';
 import { JobStatus } from '../../common/enums/job';
 
@@ -14,11 +15,10 @@ const escrowFundTokens = (
   Object.values(EscrowFundToken) as EscrowFundToken[]
 ).filter((c) => c !== EscrowFundToken.HMT);
 
-export const createFortuneJobDto = (overrides = {}): JobFortuneDto => ({
+export const createJobManifestDto = (overrides = {}): JobManifestDto => ({
   chainId: ChainId.POLYGON_AMOY,
-  submissionsRequired: faker.number.int({ min: 1, max: 10 }),
-  requesterTitle: faker.lorem.words(3),
-  requesterDescription: faker.lorem.sentence(),
+  requestType: FortuneJobType.FORTUNE,
+  manifest: createMockFortuneManifest(),
   paymentAmount: faker.number.float({ min: 1, max: 100, fractionDigits: 6 }),
   paymentCurrency: faker.helpers.arrayElement(paymentCurrencies),
   escrowFundToken: faker.helpers.arrayElement(escrowFundTokens),