Merge pull request #6075 from espoon-voltti/mocked-time-support-for-d…

…ev-api-calls

Mocked time -tuki generoiduille dev-API-clienteille

frontend/src/e2e-test/dev-api/index.ts

@@ -4,17 +4,14 @@
 
 import * as fs from 'fs/promises'
 
-import axios, {
-  AxiosHeaders,
-  AxiosResponse,
-  InternalAxiosRequestConfig
-} from 'axios'
+import axios, { AxiosResponse, InternalAxiosRequestConfig } from 'axios'
 import FormData from 'form-data'
 import { BaseError } from 'make-error-cause'
 
 import HelsinkiDateTime from 'lib-common/helsinki-date-time'
 
 import config from '../config'
+import { runJobs, simpleAction } from '../generated/api-clients'
 import { DevPerson, MockVtjDataset } from '../generated/api-types'
 
 export class DevApiError extends BaseError {
@@ -32,12 +29,6 @@ export class DevApiError extends BaseError {
   }
 }
 
-function clockHeader(now: HelsinkiDateTime): AxiosHeaders {
-  return new AxiosHeaders({
-    EvakaMockedTime: now.formatIso()
-  })
-}
-
 function formatRequest(config: InternalAxiosRequestConfig | undefined): string {
   if (!config || !config.url) return ''
   const url = new URL(config.url, config.baseURL)
@@ -72,13 +63,7 @@ export async function execSimpleApplicationAction(
   mockedTime: HelsinkiDateTime
 ): Promise<void> {
   try {
-    await devClient.post(
-      `/applications/${applicationId}/actions/${action}`,
-      null,
-      {
-        headers: clockHeader(mockedTime)
-      }
-    )
+    await simpleAction({ applicationId, action }, { mockedTime })
   } catch (e) {
     throw new DevApiError(e)
   }
@@ -91,17 +76,14 @@ export async function execSimpleApplicationActions(
 ): Promise<void> {
   for (const action of actions) {
     await execSimpleApplicationAction(applicationId, action, mockedTime)
-    await runPendingAsyncJobs(mockedTime)
   }
 }
 
 export async function runPendingAsyncJobs(
   mockedTime: HelsinkiDateTime
 ): Promise<void> {
   try {
-    await devClient.post(`/run-jobs`, null, {
-      headers: clockHeader(mockedTime)
-    })
+    await runJobs({ mockedTime })
   } catch (e) {
     throw new DevApiError(e)
   }