Revert "Add prison api builder to test memory (#202)"

This reverts commit 04caac5.

server/data/index.ts

@@ -3,37 +3,19 @@
  * Do appinsights first as it does some magic instrumentation work, i.e. it affects other 'require's
  * In particular, applicationinsights automatically collects bunyan logs
  */
-import config, { ApiConfig } from '../config'
 import { buildAppInsightsClient, initialiseAppInsights } from '../utils/azureAppInsights'
 import HmppsAuthClient from './hmppsAuthClient'
-import { PrisonApiClient } from './interfaces/prisonApiClient'
-import PrisonApiRestClientTwo from './prisonApiClientTwo'
 
 import { createRedisClient } from './redisClient'
-import RestClient, { RestClientBuilder as CreateRestClientBuilder } from './restClient'
 import TokenStore from './tokenStore'
 
 initialiseAppInsights()
 buildAppInsightsClient()
 
 type RestClientBuilder<T> = (token: string) => T
 
-export default function restClientBuilder<T>(
-  name: string,
-  options: ApiConfig,
-  constructor: new (client: RestClient) => T,
-): RestClientBuilder<T> {
-  const restClient = CreateRestClientBuilder(name, options)
-  return token => new constructor(restClient(token))
-}
-
 export const dataAccess = () => ({
   hmppsAuthClient: new HmppsAuthClient(new TokenStore(createRedisClient())),
-  prisonApiClientBuilder: restClientBuilder<PrisonApiClient>(
-    'Prison API',
-    config.apis.prisonApi,
-    PrisonApiRestClientTwo,
-  ),
 })
 
 export type DataAccess = ReturnType<typeof dataAccess>

server/data/restClient.ts

@@ -30,10 +30,6 @@ interface StreamRequest {
   errorLogger?: (e: UnsanitisedError) => void
 }
 
-export function RestClientBuilder(name: string, config: ApiConfig) {
-  return (token: string): RestClient => new RestClient(name, config, token)
-}
-
 export default class RestClient {
   agent: Agent
 

server/services/index.ts

@@ -5,9 +5,9 @@ import PrisonerSearchService from './prisonerSearch'
 import UserService from './userService'
 
 export const services = () => {
-  const { hmppsAuthClient, prisonApiClientBuilder } = dataAccess()
+  const { hmppsAuthClient } = dataAccess()
   const userService = new UserService(hmppsAuthClient)
-  const offenderService = new OffenderService(prisonApiClientBuilder)
+  const offenderService = new OffenderService()
   const commonApiRoutes = new CommonApiRoutes(offenderService)
 
   return {

server/services/offenderService.ts

@@ -1,15 +1,12 @@
 import { Readable } from 'stream'
-import { RestClientBuilder } from '../data'
-import { PrisonApiClient } from '../data/interfaces/prisonApiClient'
+import PrisonApiClient from '../data/prisonApiClient'
 
 export default class OffenderService {
-  constructor(private readonly prisonClientBuilder: RestClientBuilder<PrisonApiClient>) {}
-
   getPrisonerImage(token: string, offenderNumber: string): Promise<Readable> {
-    return this.prisonClientBuilder(token).getPrisonerImage(offenderNumber, true)
+    return new PrisonApiClient(token).getPrisonerImage(offenderNumber, true)
   }
 
   getImage(token: string, imageId: string): Promise<Readable> {
-    return this.prisonClientBuilder(token).getImage(imageId, true)
+    return new PrisonApiClient(token).getImage(imageId, true)
   }
 }