Fikset feil på tester. Lagt til test. Fikset route for merge av filer. Lagt til midlertidig konsoll logging for å følge språk valg.

Author: nils-arne

packages/fyllut-backend/src/services/documents/applicationService.ts

@@ -42,14 +42,16 @@ const createPdf = async (
     logger.warn(`Language code "${language}" is not supported. Language code will be defaulted to "nb".`);
   }
 
-  language = localizationUtils.getLanguageCodeAsIso639_1(language);
+  console.log(`Language "${language}" requested`);
+  const languageCode = localizationUtils.getLanguageCodeAsIso639_1(language.toLowerCase());
+  console.log(`LanguageCode "${languageCode}" to use`);
 
   const translate = (text: string, textReplacements?: I18nTranslationReplacements) =>
     translationUtils.translateWithTextReplacements({
       translations,
       originalText: text,
       params: textReplacements,
-      currentLanguage: language,
+      currentLanguage: languageCode,
     });
 
   const html = createHtmlFromSubmission(form, submission, submissionMethod, translate, language);

packages/fyllut-backend/src/services/documents/documentsService.test.ts

@@ -100,4 +100,62 @@ describe('[endpoint] documents', () => {
     expect(skjemabyggingproxyScope.isDone()).toBe(true);
     expect(mergePdfScope.isDone()).toBe(true);
   }, 10000);
+
+  it('Create front page and application  - english', async () => {
+    vi.spyOn(forstesideUtils, 'genererFoerstesideData').mockImplementation(
+      () =>
+        ({
+          foerstesidetype: 'ETTERSENDELSE',
+          navSkjemaId: 'NAV 10.10.10',
+          spraakkode: 'en',
+          overskriftstittel: 'Tittel',
+          arkivtittel: 'Tittel',
+          tema: 'HJE',
+        }) as ForstesideRequestBody,
+    );
+
+    const forstesidePdf = readFileSync(filePathForsteside);
+    const soknadPdf = readFileSync(filePathSoknad);
+    const mergedPdf = readFileSync(filePathMerged);
+    const encodedForstesidedPdf = forstesidePdf.toString('base64');
+    const encodedSoknadPdf = soknadPdf.toString('base64');
+
+    const recipientsMock = nock(formsApiUrl).get('/v1/recipients').reply(200, []);
+    const generateFileMock = nock(skjemabyggingProxyUrl!)
+      .post('/foersteside')
+      .reply(200, { foersteside: encodedForstesidedPdf });
+    const skjemabyggingproxyScope = nock(process.env.SKJEMABYGGING_PROXY_URL as string)
+      .post('/exstream')
+      .reply(200, { data: { result: [{ content: { data: encodedSoknadPdf } }] } });
+
+    const mergePdfScope = nock(process.env.GOTENBERG_URL_EN as string)
+      .intercept('/forms/pdfengines/merge', 'POST', (body) => {
+        return body != null;
+      })
+      .reply(200, mergedPdf, { 'content-type': 'application/pdf' });
+
+    const req = mockRequest({
+      headers: {
+        AzureAccessToken: '',
+      },
+      body: {
+        form: JSON.stringify({
+          title: formTitle,
+          components: [],
+          properties: { mottaksadresseId: 'mottaksadresseId', path: '12345', skjemanummer: 'NAV 12.34-56' },
+        }),
+        submissionMethod: 'paper',
+        language: 'EN',
+        submission: JSON.stringify({ data: {} }),
+        translations: JSON.stringify({}),
+      },
+    });
+
+    await documents.coverPageAndApplication(req, mockResponse(), mockNext());
+
+    expect(recipientsMock.isDone()).toBe(true);
+    expect(generateFileMock.isDone()).toBe(true);
+    expect(skjemabyggingproxyScope.isDone()).toBe(true);
+    expect(mergePdfScope.isDone()).toBe(true);
+  }, 10000);
 });

packages/fyllut-backend/src/services/documents/documentsService.ts

@@ -76,7 +76,7 @@ const coverPageAndApplication = async (props: CoverPageAndApplicationProps) => {
   const mergedFile = await mergeFiles(
     coverPageResponse.navSkjemaId,
     coverPageResponse.overskriftstittel,
-    coverPageResponse.spraakkode,
+    language,
     documents,
     { pdfa: true, pdfua: true },
   );

packages/fyllut-backend/src/services/documents/gotenbergService.ts

@@ -23,6 +23,7 @@ export const mergeFiles = async (
       formData.append('files', buffer, `file${index}.pdf`);
     }
   });
+  formData.append('merge', 'true');
   // Add Gotenberg-specific options
   formData.append('pdfa', options.pdfa ? 'PDF/A-2b' : '');
   formData.append('pdfua', options.pdfua ? 'true' : '');
@@ -42,7 +43,7 @@ export const mergeFiles = async (
 
   // Hvordan sette språk? En engelsk og en norsk Gotenberg installasjon?
   logger.info(`Skal kalle Gotenberg for å merge filer`);
-  return await callGotenberg(language, '/forms/pdfengines/merge', formData);
+  return await callGotenberg(language, '/forms/libreoffice/convert', formData);
 };
 
 const formatPDFDate = (date: Date) => {

packages/fyllut-backend/src/test/test.env

@@ -13,7 +13,9 @@ NORG2_URL=https://norg2.unittest.nav.no
 SEND_INN_TOKEN_X_CLIENT_ID=test-gcp:soknad:send-inn
 FORMS_API_URL=https://forms-api-test.nav.no
 GOTENBERG_URL=https://convert-to-pdf.intern.dev.nav.no
-//GOTENBERG_URL=http://127.0.0.1:3000
+# GOTENBERG_URL=http://127.0.0.1:3000
+GOTENBERG_URL_EN=https://convert-to-pdf-en.intern.dev.nav.no
+# GOTENBERG_URL_EN=http://127.0.0.1:3000
 
 # FYLLUT_BACKEND_LOGLEVEL=debug