[HUMAN App] feat: enhance API for new UI

packages/apps/human-app/server/.env.example

@@ -18,7 +18,7 @@ HUMAN_APP_SECRET_KEY=sk_example_1VwUpBMO8H0v4Pmu4TPiWFEwuMguW4PkozSban4Rfbc
 # Redis
 REDIS_HOST=0.0.0.0
 REDIS_PORT=6380
-REIDS_DB=1
+REDIS_DB=1
 # Flush DB on startup
 IS_CACHE_TO_RESTART=false
 

packages/apps/human-app/server/src/common/enums/global-common.ts

@@ -1,11 +1,3 @@
-export enum JobDiscoveryFieldName {
-  JobDescription = 'job_description',
-  RewardAmount = 'reward_amount',
-  RewardToken = 'reward_token',
-  CreatedAt = 'created_at',
-  UpdatedAt = 'updated_at',
-}
-
 export enum JobStatus {
   ACTIVE = 'active',
   COMPLETED = 'completed',
@@ -21,13 +13,6 @@ export enum AssignmentStatus {
   REJECTED = 'rejected',
 }
 
-export enum JobDiscoverySortField {
-  CHAIN_ID = 'chain_id',
-  JOB_TYPE = 'job_type',
-  REWARD_AMOUNT = 'reward_amount',
-  CREATED_AT = 'created_at',
-}
-
 export enum SortOrder {
   ASC = 'asc',
   DESC = 'desc',

packages/apps/human-app/server/src/common/utils/pageable.model.ts

@@ -40,6 +40,7 @@ export abstract class PageableDto {
   @IsOptional()
   abstract sort_field?: any;
 }
+
 export abstract class PageableParams {
   @AutoMap()
   page?: number;
@@ -52,6 +53,7 @@ export abstract class PageableParams {
 
   abstract sortField?: any;
 }
+
 export abstract class PageableData {
   @AutoMap()
   page?: number;
@@ -64,6 +66,7 @@ export abstract class PageableData {
 
   abstract sort_field?: any;
 }
+
 export abstract class PageableResponse {
   page: number;
   page_size: number;

packages/apps/human-app/server/src/integrations/exchange-oracle/exchange-oracle.gateway.ts

@@ -5,8 +5,8 @@ import { Injectable } from '@nestjs/common';
 import { AxiosError, AxiosRequestConfig } from 'axios';
 import { lastValueFrom } from 'rxjs';
 import { HttpMethod } from '../../common/enums/http-method';
-import { toCleanObjParams } from '../../common/utils/gateway-common.utils';
 import * as errorUtils from '../../common/utils/error';
+import { toCleanObjParams } from '../../common/utils/gateway-common.utils';
 import logger from '../../logger';
 import {
   JobAssignmentCommand,
@@ -20,12 +20,6 @@ import {
   ResignJobCommand,
   ResignJobData,
 } from '../../modules/job-assignment/model/job-assignment.model';
-import {
-  JobsDiscoveryParams,
-  JobsDiscoveryParamsCommand,
-  JobsDiscoveryParamsData,
-  JobsDiscoveryResponse,
-} from '../../modules/jobs-discovery/model/jobs-discovery.model';
 import {
   OracleStatisticsCommand,
   OracleStatisticsResponse,
@@ -40,6 +34,12 @@ import {
 } from '../../modules/user-worker/model/worker-registration.model';
 import { EscrowUtilsGateway } from '../escrow/escrow-utils-gateway.service';
 import { KvStoreGateway } from '../kv-store/kv-store.gateway';
+import {
+  FetchJobsCommand,
+  FetchJobsParams,
+  FetchJobsParamsData,
+  FetchJobsResponse,
+} from './model/exchange-oracle.model';
 
 @Injectable()
 export class ExchangeOracleGateway {
@@ -169,15 +169,13 @@ export class ExchangeOracleGateway {
     return this.callExternalHttpUtilRequest(options);
   }
 
-  async fetchJobs(
-    command: JobsDiscoveryParamsCommand,
-  ): Promise<JobsDiscoveryResponse> {
-    const jobsDiscoveryParamsData = this.mapper.map(
+  async fetchJobs(command: FetchJobsCommand): Promise<FetchJobsResponse> {
+    const fetchJobsParamsData = this.mapper.map(
       command.data,
-      JobsDiscoveryParams,
-      JobsDiscoveryParamsData,
+      FetchJobsParams,
+      FetchJobsParamsData,
     );
-    const reducedParams = toCleanObjParams(jobsDiscoveryParamsData);
+    const reducedParams = toCleanObjParams(fetchJobsParamsData);
     const options: AxiosRequestConfig = {
       method: HttpMethod.GET,
       url: `${await this.kvStoreGateway.getExchangeOracleUrlByAddress(
@@ -189,7 +187,7 @@ export class ExchangeOracleGateway {
         Accept: 'application/json',
       },
     };
-    return this.callExternalHttpUtilRequest<JobsDiscoveryResponse>(options);
+    return this.callExternalHttpUtilRequest<FetchJobsResponse>(options);
   }
 
   async sendRegistrationInExchangeOracle(

packages/apps/human-app/server/src/integrations/exchange-oracle/exchange-oracle.mapper.profile.ts

@@ -1,5 +1,3 @@
-import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
-import { Injectable } from '@nestjs/common';
 import {
   CamelCaseNamingConvention,
   createMap,
@@ -9,6 +7,8 @@ import {
   namingConventions,
   SnakeCaseNamingConvention,
 } from '@automapper/core';
+import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
+import { Injectable } from '@nestjs/common';
 import {
   JobAssignmentData,
   JobAssignmentParams,
@@ -17,14 +17,14 @@ import {
   ResignJobCommand,
   ResignJobData,
 } from '../../modules/job-assignment/model/job-assignment.model';
-import {
-  JobsDiscoveryParams,
-  JobsDiscoveryParamsData,
-} from '../../modules/jobs-discovery/model/jobs-discovery.model';
 import {
   RegistrationInExchangeOracleCommand,
   RegistrationInExchangeOracleData,
 } from '../../modules/user-worker/model/worker-registration.model';
+import {
+  FetchJobsParams,
+  FetchJobsParamsData,
+} from './model/exchange-oracle.model';
 
 @Injectable()
 export class ExchangeOracleProfile extends AutomapperProfile {
@@ -63,8 +63,8 @@ export class ExchangeOracleProfile extends AutomapperProfile {
       );
       createMap(
         mapper,
-        JobsDiscoveryParams,
-        JobsDiscoveryParamsData,
+        FetchJobsParams,
+        FetchJobsParamsData,
         // Automapper has problem with mapping arrays, thus explicit conversion
         forMember(
           (destination) => destination.fields,

packages/apps/human-app/server/src/integrations/exchange-oracle/model/exchange-oracle.model.ts

@@ -0,0 +1,95 @@
+import { AutoMap } from '@automapper/classes';
+import { JobStatus } from '../../../common/enums/global-common';
+import {
+  PageableData,
+  PageableParams,
+  PageableResponse,
+} from '../../../common/utils/pageable.model';
+
+export enum FetchJobsFieldName {
+  JobDescription = 'job_description',
+  RewardAmount = 'reward_amount',
+  RewardToken = 'reward_token',
+  CreatedAt = 'created_at',
+}
+
+export enum FetchJobsSortField {
+  CHAIN_ID = 'chain_id',
+  JOB_TYPE = 'job_type',
+  REWARD_AMOUNT = 'reward_amount',
+  CREATED_AT = 'created_at',
+}
+
+export class FetchJobsParams extends PageableParams {
+  @AutoMap()
+  escrowAddress?: string;
+
+  @AutoMap()
+  chainId?: number;
+
+  @AutoMap()
+  sortField?: FetchJobsSortField;
+
+  @AutoMap()
+  jobType?: string;
+
+  @AutoMap()
+  fields: FetchJobsFieldName[];
+
+  @AutoMap()
+  status: JobStatus;
+
+  @AutoMap()
+  updatedAfter?: string;
+
+  qualifications?: string[];
+}
+
+export class FetchJobsCommand {
+  @AutoMap()
+  oracleAddress: string;
+  @AutoMap()
+  token: string;
+  @AutoMap()
+  data: FetchJobsParams;
+}
+
+export class FetchJobsParamsData extends PageableData {
+  @AutoMap()
+  escrow_address?: string;
+
+  @AutoMap()
+  chain_id?: number;
+
+  @AutoMap()
+  sort_field?: FetchJobsSortField;
+
+  @AutoMap()
+  job_type?: string;
+
+  @AutoMap()
+  fields: FetchJobsFieldName[];
+
+  @AutoMap()
+  status: JobStatus;
+
+  @AutoMap()
+  updated_after?: string;
+}
+
+export type FetchJobsResponseItem = {
+  escrow_address: string;
+  chain_id: number;
+  job_type: string;
+  status: JobStatus;
+  job_description?: string;
+  reward_amount?: string;
+  reward_token?: string;
+  created_at?: string;
+  updated_at?: string;
+  qualifications: string[];
+};
+
+export class FetchJobsResponse extends PageableResponse {
+  results: FetchJobsResponseItem[];
+}

packages/apps/human-app/server/src/integrations/exchange-oracle/spec/exchange-oracle.fixtures.ts

@@ -0,0 +1,100 @@
+import { JobStatus, SortOrder } from '../../../common/enums/global-common';
+import {
+  FetchJobsCommand,
+  FetchJobsFieldName,
+  FetchJobsParamsData,
+  FetchJobsResponse,
+  FetchJobsResponseItem,
+  FetchJobsSortField,
+} from '../model/exchange-oracle.model';
+
+const ESCROW_ADDRESS = 'test_address';
+const CHAIN_ID = 1;
+const PAGE_SIZE = 10;
+const PAGE = 0;
+const SORT = SortOrder.ASC;
+const SORT_FIELD = FetchJobsSortField.CREATED_AT;
+const JOB_TYPE = 'FORTUNE';
+const EXCHANGE_ORACLE_ADDRESS = '0x3dfa342';
+const STATUS = JobStatus.ACTIVE;
+const FIELDS = [
+  FetchJobsFieldName.CreatedAt,
+  FetchJobsFieldName.JobDescription,
+];
+
+export const fetchJobsCommandFixture: FetchJobsCommand = {
+  data: {
+    chainId: CHAIN_ID,
+    pageSize: PAGE_SIZE,
+    page: PAGE,
+    sort: SORT,
+    sortField: SORT_FIELD,
+    jobType: JOB_TYPE,
+    status: STATUS,
+    fields: FIELDS,
+  },
+  token: 'jwt-token',
+  oracleAddress: EXCHANGE_ORACLE_ADDRESS,
+};
+
+export const paramsDataFixture: FetchJobsParamsData = {
+  chain_id: CHAIN_ID,
+  page_size: PAGE_SIZE,
+  page: PAGE,
+  sort: SORT,
+  sort_field: SORT_FIELD,
+  job_type: JOB_TYPE,
+  fields: FIELDS,
+  status: STATUS,
+};
+export const paramsDataFixtureAsString = `?escrow_address=${paramsDataFixture.escrow_address}&chain_id=${paramsDataFixture.chain_id}&page_size=${paramsDataFixture.page_size}&page=${paramsDataFixture.page}&sort=${paramsDataFixture.sort}&sort_field=${paramsDataFixture.sort_field}&job_type=${paramsDataFixture.job_type}&fields=${paramsDataFixture.fields.join(',')}`;
+
+export const responseItemFixture1: FetchJobsResponseItem = {
+  escrow_address: ESCROW_ADDRESS,
+  chain_id: CHAIN_ID,
+  job_type: JOB_TYPE,
+  status: JobStatus.ACTIVE,
+  created_at: '2025-03-18T03:00:00.000Z',
+  qualifications: [],
+  job_description: 'Response item fixture 1 description',
+  reward_amount: '42.1',
+  reward_token: 'hmt',
+  updated_at: '2025-03-18T03:00:00.000Z',
+};
+export const responseItemFixture2: FetchJobsResponseItem = {
+  escrow_address: ESCROW_ADDRESS,
+  chain_id: CHAIN_ID,
+  job_type: JOB_TYPE,
+  status: JobStatus.COMPLETED,
+  created_at: '2025-03-18T02:00:00.000Z',
+  qualifications: [],
+  job_description: 'Response item fixture 2 description',
+  reward_amount: '42.2',
+  reward_token: 'hmt',
+  updated_at: '2025-03-18T02:00:00.000Z',
+};
+export const responseItemFixture3: FetchJobsResponseItem = {
+  escrow_address: ESCROW_ADDRESS,
+  chain_id: CHAIN_ID,
+  job_type: JOB_TYPE,
+  status: JobStatus.ACTIVE,
+  created_at: '2025-03-18T01:00:00.000Z',
+  qualifications: [],
+  job_description: 'Response item fixture 3 description',
+  reward_amount: '42.3',
+  reward_token: 'hmt',
+  updated_at: '2025-03-18T01:00:00.000Z',
+};
+export const responseItemsFixture: FetchJobsResponseItem[] = [
+  responseItemFixture1,
+  responseItemFixture2,
+  responseItemFixture3,
+];
+
+export const responseFixture: FetchJobsResponse = {
+  results: responseItemsFixture,
+  page: PAGE,
+  page_size: PAGE_SIZE,
+  total_pages: 34,
+  total_results: 4,
+};