Fix code for new MediaDownloadFailure type

guardian · Oct 10, 2024 · f2b17c6 · f2b17c6
1 parent 706ea26
commit f2b17c6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts
@@ -80,14 +80,14 @@ export const TranscriptionOutputSuccess = TranscriptionOutputBase.extend({
 
 export const MediaDownloadFailure = z.object({
 	id: z.string(),
-	status: z.literal('FAILURE'),
+	status: z.literal('MEDIA_DOWNLOAD_FAILURE'),
 	url: z.string(),
 });
 
 export type MediaDownloadFailure = z.infer<typeof MediaDownloadFailure>;
 
 export const TranscriptionOutputFailure = TranscriptionOutputBase.extend({
-	status: z.literal('FAILURE'),
+	status: z.literal('TRANSCRIPTION_FAILURE'),
 });
 
 export const TranscriptionOutput = z.union([
@@ -108,6 +108,11 @@ export const transcriptionOutputIsSuccess = (
 	output: TranscriptionOutput,
 ): output is TranscriptionOutputSuccess => output.status === 'SUCCESS';
 
+export const transcriptionOutputIsTranscriptionFailure = (
+	output: TranscriptionOutput,
+): output is TranscriptionOutputSuccess =>
+	output.status === 'TRANSCRIPTION_FAILURE';
+
 export type TranscriptionOutput = z.infer<typeof TranscriptionOutput>;
 
 export const SignedUrlResponseBody = z.object({

diff --git a/packages/media-download/src/index.ts b/packages/media-download/src/index.ts
@@ -56,7 +56,7 @@ const reportDownloadFailure = async (
 ) => {
 	const mediaDownloadFailure: MediaDownloadFailure = {
 		id: job.id,
-		status: 'FAILURE',
+		status: 'MEDIA_DOWNLOAD_FAILURE',
 		url: job.url,
 	};
 	const result = await sendMessage(

diff --git a/packages/output-handler/src/index.ts b/packages/output-handler/src/index.ts
@@ -5,6 +5,7 @@ import {
 	logger,
 	getConfig,
 	TranscriptionConfig,
+	getSignedDownloadUrl,
 } from '@guardian/transcription-service-backend-common';
 import {
 	getDynamoClient,
@@ -16,6 +17,7 @@ import {
 	transcriptionOutputIsSuccess,
 	TranscriptionOutputSuccess,
 	TranscriptionOutputFailure,
+	transcriptionOutputIsTranscriptionFailure,
 } from '@guardian/transcription-service-common';
 import {
 	MetricsService,
@@ -28,23 +30,27 @@ const successMessageBody = (
 	originalFilename: string,
 	rootUrl: string,
 	isTranslation: boolean,
+	sourceMediaDownloadUrl: string,
 ): string => {
 	const exportUrl = `${rootUrl}/export?transcriptId=${transcriptId}`;
 	return `
 		<h1>${isTranslation ? 'English translation ' : 'Transcription'} for ${originalFilename} ready</h1>
 		<p>Click <a href="${exportUrl}">here</a> to export to a google doc.</p>
-		<p><b>Note:</b> transcripts will expire after 7 days. Export your transcript to a doc now if you want to keep it. </p>
+		<p>Click <a href="${sourceMediaDownloadUrl}"> to download the input media.</p>
+		<p><b>Note:</b> transcripts and input media will expire after 7 days. Export your transcript to a doc now if you want to keep it. </p>
 	`;
 };
 
 const failureMessageBody = (
 	originalFilename: string,
 	id: string,
 	isTranslation: boolean,
+	sourceMediaDownloadUrl: string,
 ): string => {
 	return `
 		<h1>${isTranslation ? 'English translation ' : 'Transcription'}for ${originalFilename} has failed.</h1>
 		<p>Please make sure that the file is a valid audio or video file.</p>
+		<p>Click <a href="${sourceMediaDownloadUrl}"> to download the input media.</p>
 		<p>Contact the digital investigations team for support.</p>
 		<p>Transcription ID: ${id}</p>
 	`;
@@ -55,6 +61,7 @@ const handleTranscriptionSuccess = async (
 	transcriptionOutput: TranscriptionOutputSuccess,
 	sesClient: SESClient,
 	metrics: MetricsService,
+	sourceMediaDownloadUrl: string,
 ) => {
 	const dynamoItem: TranscriptionDynamoItem = {
 		id: transcriptionOutput.id,
@@ -86,6 +93,7 @@ const handleTranscriptionSuccess = async (
 				transcriptionOutput.originalFilename,
 				config.app.rootUrl,
 				transcriptionOutput.isTranslation,
+				sourceMediaDownloadUrl,
 			),
 		);
 
@@ -108,6 +116,7 @@ const handleTranscriptionFailure = async (
 	transcriptionOutput: TranscriptionOutputFailure,
 	sesClient: SESClient,
 	metrics: MetricsService,
+	sourceMediaDownloadUrl: string,
 ) => {
 	try {
 		await sendEmail(
@@ -119,6 +128,7 @@ const handleTranscriptionFailure = async (
 				transcriptionOutput.originalFilename,
 				transcriptionOutput.id,
 				transcriptionOutput.isTranslation,
+				sourceMediaDownloadUrl,
 			),
 		);
 
@@ -154,21 +164,29 @@ const processMessage = async (event: unknown) => {
 
 	for (const record of parsedEvent.data.Records) {
 		const transcriptionOutput = record.body;
+		const sourceMediaDownloadUrl = await getSignedDownloadUrl(
+			config.aws.region,
+			config.app.sourceMediaBucket,
+			transcriptionOutput.id,
+			7 * 24 * 60 * 60,
+		);
 		if (transcriptionOutputIsSuccess(transcriptionOutput)) {
 			logger.info('handling transcription success');
 			await handleTranscriptionSuccess(
 				config,
 				transcriptionOutput,
 				sesClient,
 				metrics,
+				sourceMediaDownloadUrl,
 			);
-		} else {
+		} else if (transcriptionOutputIsTranscriptionFailure(transcriptionOutput)) {
 			logger.info('handling transcription failure');
 			await handleTranscriptionFailure(
 				config,
 				transcriptionOutput,
 				sesClient,
 				metrics,
+				sourceMediaDownloadUrl,
 			);
 		}
 	}

diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
@@ -110,7 +110,7 @@ const publishTranscriptionOutputFailure = async (
 	logger.info('publishing transcription output failed');
 	const failureMessage: TranscriptionOutputFailure = {
 		id: job.id,
-		status: 'FAILURE',
+		status: 'TRANSCRIPTION_FAILURE',
 		userEmail: job.userEmail,
 		originalFilename: job.originalFilename,
 		isTranslation: job.translate,