Skip to content

Commit d01a0bf

Browse files
committed
chore: fixing url and preparing mock server endpoints
1 parent c0f72a3 commit d01a0bf

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

src/app/(fhir)/fhir/resources/sykmelding/write-to-ehr/route.ts

+10-17
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
} from '@fhir/fhir-data/schema/documentReference'
88
import { sykInnApiService } from '@services/syk-inn-api/SykInnApiService'
99
import { serverFhirResources } from '@fhir/fhir-data/fhir-data-server'
10-
import { isE2E, isLocalOrDemo } from '@utils/env'
1110

1211
type DocRefResponseResult = FhirDocumentReferenceResponse | [{ errors: { message: string } }]
1312

@@ -22,12 +21,6 @@ export async function POST(request: Request): Promise<Response | DocRefResponseR
2221
return new Response('Missing sykmeldingId header', { status: 400 })
2322
}
2423

25-
if (isLocalOrDemo || isE2E) {
26-
logger.warn('Is in demo, local or e2e, returning mocked sykmelding data')
27-
28-
return handleMockedRoute()
29-
}
30-
3124
const sykmeldingPdf = await sykInnApiService.getSykmeldingPdf(sykmeldingId)
3225
if ('errorType' in sykmeldingPdf) {
3326
return new Response('Failed to retrieve sykmelding pdf', { status: 500 })
@@ -80,13 +73,13 @@ export async function POST(request: Request): Promise<Response | DocRefResponseR
8073
return Response.json(verifiedCreatedDocRef.data satisfies DocRefResponseResult)
8174
}
8275

83-
function handleMockedRoute(): Response {
84-
return Response.json({
85-
resourceType: 'DocumentReference',
86-
id: 'aa66036d-b63c-4c5a-b3d5-b1d1f812da8d',
87-
meta: {
88-
versionId: '1',
89-
lastUpdated: '2025-03-04T03:21:36.880-05:00',
90-
},
91-
})
92-
}
76+
// function handleMockedRoute(): Response {
77+
// return Response.json({
78+
// resourceType: 'DocumentReference',
79+
// id: 'aa66036d-b63c-4c5a-b3d5-b1d1f812da8d',
80+
// meta: {
81+
// versionId: '1',
82+
// lastUpdated: '2025-03-04T03:21:36.880-05:00',
83+
// },
84+
// })
85+
// }
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
//TODO her skal vi mocke shit for document ref get og post
2+
3+
// export async function GET(request: Request): Promise<Response> {
4+
// return Response.json({ mordi: 'mormi' })
5+
// }

src/data-fetcher/data-service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export type DataService = {
3636
}
3737
mutation: {
3838
sendSykmelding: (sykmelding: unknown) => Promise<NySykmelding>
39-
writeToEhr: (sykmelding: unknown) => Promise<DocumentReferenceResponse>
39+
writeToEhr: (sykmeldingId: string) => Promise<DocumentReferenceResponse>
4040
}
4141
}
4242

src/devtools/useAPIOverride.ts

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export function withFailInterceptor(dataService: DataService): DataService {
3131
},
3232
mutation: {
3333
sendSykmelding: failIfOverride('mutation', 'sendSykmelding', dataService.mutation.sendSykmelding),
34+
writeToEhr: failIfOverride('mutation', 'writeToEhr', dataService.mutation.writeToEhr),
3435
},
3536
}
3637
}

src/fhir/fhir-data/fhir-data-server.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ export const serverFhirResources = {
3535
}
3636
const documentReference = prepareDocRefWithB64Data(practitionerId, patientId, encounterId, pdf, title)
3737

38-
const documentReferenceResponse = await fetch(`DocumentReference/`, {
38+
const resourcePath = `${currentSession.issuer}/DocumentReference/`
39+
const documentReferenceResponse = await fetch(resourcePath, {
3940
method: 'POST',
4041
body: JSON.stringify(documentReference),
4142
headers: {
@@ -73,8 +74,10 @@ export const serverFhirResources = {
7374
if (currentSession == null) {
7475
throw new Error('Active session is required')
7576
}
76-
77-
const documentReferenceResponse = await fetch(`DocumentReference/${sykmeldingId}`, {
77+
// her kan vi bruke mocken. currentSession er meg sjølv.
78+
// shit , ta med resten av url
79+
const resourcePath = `${currentSession.issuer}/DocumentReference/${sykmeldingId}`
80+
const documentReferenceResponse = await fetch(resourcePath, {
7881
method: 'GET',
7982
headers: {
8083
Authorization: `Bearer ${currentSession.accessToken}`,

src/fhir/fhir-data/fhir-data-service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export function createFhirDataService(behandler: BehandlerInfo): DataService {
1919
},
2020
mutation: {
2121
sendSykmelding: (sykmelding) => nonFhirResources.sendSykmelding(sykmelding, behandler.hpr),
22-
writeToEhr: (sykmelding) => nonFhirResources.writeToEhr(sykmelding),
22+
writeToEhr: (sykmeldingId) => nonFhirResources.writeToEhr(sykmeldingId),
2323
},
2424
}
2525
}

0 commit comments

Comments
 (0)