Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions apps/backend/src/factory/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,27 @@ export type XLSXMetaBase = MetaBase & { columns: string[] };

const ENDPOINT = process.env.USER_OFFICE_FACTORY_ENDPOINT;

async function throwFactoryError(
factoryResp: globalThis.Response,
downloadType: DownloadType,
type: PDFType | XLSXType | ZIPType
) {
const body = await factoryResp.text();

let parsed: { message?: string } | undefined;
try {
parsed = JSON.parse(body);
} catch {
parsed = undefined;
}

const detail = typeof parsed?.message === 'string' ? parsed.message : body;

throw new Error(
`Factory service failed to generate ${downloadType}/${type}: ${detail}`
);
}

export default async function callFactoryService<TData, TMeta extends MetaBase>(
downloadType: DownloadType,
type: PDFType | XLSXType | ZIPType,
Expand Down Expand Up @@ -90,7 +111,7 @@ export default async function callFactoryService<TData, TMeta extends MetaBase>(
);

if (!factoryResp.ok) {
throw new Error(await factoryResp.text());
await throwFactoryError(factoryResp, downloadType, type);
}

factoryRespBody = factoryResp.body;
Expand All @@ -110,6 +131,7 @@ export default async function callFactoryService<TData, TMeta extends MetaBase>(
});
span.setStatus({ code: 2, message: String(err) });
}
throw err;
} finally {
span.end();
}
Expand All @@ -124,7 +146,7 @@ export default async function callFactoryService<TData, TMeta extends MetaBase>(
});

if (!factoryResp.ok) {
throw new Error(await factoryResp.text());
await throwFactoryError(factoryResp, downloadType, type);
}

factoryRespBody = factoryResp.body;
Expand All @@ -141,7 +163,7 @@ export default async function callFactoryService<TData, TMeta extends MetaBase>(

readableStream.on('error', (err) => {
next({
error: err.toString(),
error: err,
message: `Could not download generated ${downloadType}/${type}`,
});
});
Expand Down
13 changes: 11 additions & 2 deletions apps/backend/src/middlewares/factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,26 @@ factoryDownloadRouter.use(
next: NextFunction
) => {
let message: string;
let underlyingError: Error | undefined;

if (err instanceof Error) {
message = err.message;
underlyingError = err;
} else if (typeof err === 'string') {
message = err;
} else if (err.error instanceof Error) {
message = err.error.message;
underlyingError = err.error;
} else {
message = err.message;
}

err instanceof Error
? logger.logException(err.message, err, getLogContextFromRequest(req))
underlyingError
? logger.logException(
message,
underlyingError,
getLogContextFromRequest(req)
)
: logger.logError(defaultErrorMessage, {
err,
...getLogContextFromRequest(req),
Expand Down
Loading