Merge pull request #1470 from navikt/feature/forms-api-bulk-publishing

Feature/forms api bulk publishing

Author: akgagnat

packages/bygger-backend/src/Backend.ts

@@ -13,19 +13,16 @@ import {
   performChangesOnSeparateBranch,
   pushFilesAndUpdateMonorepoRefCallback,
 } from './repoUtils.js';
-import { FormioService } from './services/formioService';
 
 const BULK_PUBLISH_REGEXP = /^\[bulk-publisering\] (\d+) skjemaer publisert, monorepo ref: (.*)$/;
 const PUBLISH_REGEXP = /^\[publisering\] skjema "(.*)", monorepo ref: (.*)$/;
 const UNPUBLISH_REGEXP = /^\[avpublisering\] skjema (.*), monorepo ref: (.*)$/;
 
 export class Backend {
   private readonly config: ConfigType;
-  private readonly formioService: FormioService;
 
-  constructor(config: ConfigType, formioService: FormioService) {
+  constructor(config: ConfigType) {
     this.config = config;
-    this.formioService = formioService;
   }
 
   private async createGitHubRepo() {
@@ -127,11 +124,6 @@ export class Backend {
     );
   }
 
-  async bulkPublishForms(formPaths: string[]) {
-    const forms: any = await this.formioService.getForms(formPaths);
-    return this.publishForms(forms);
-  }
-
   async publishForms(forms: NavFormType[]) {
     const skjemautfyllingRepo = await this.createGitHubRepo();
     const branchName = `bulkpublish--${uuidv4()}`;

packages/bygger-backend/src/fetchUtils.ts

@@ -3,11 +3,13 @@ import { logger } from './logging/logger';
 
 export class HttpError extends Error {
   readonly response: Response;
+  readonly bodyErrorMessage?: string;
 
-  constructor(fetchResponse: Response) {
+  constructor(fetchResponse: Response, bodyErrorMessage?: string) {
     super(`${fetchResponse.status} ${fetchResponse.statusText} fetching: ${fetchResponse.url}`);
     this.name = this.constructor.name;
     this.response = fetchResponse;
+    this.bodyErrorMessage = bodyErrorMessage;
   }
 }
 

packages/bygger-backend/src/routers/api/deprecated-publish-bulk.ts

@@ -1,6 +1,9 @@
 import { formioFormsApiUtils, TranslationLang } from '@navikt/skjemadigitalisering-shared-domain';
 import { RequestHandler } from 'express';
+import { logger } from '../../../logging/logger';
 import { formPublicationsService, formsService } from '../../../services';
+import { FormPublication } from '../../../services/formPublications/types';
+import { BadRequest } from '../helpers/errors';
 import { mapLanguageCodeToFormioFormat } from './utils';
 
 const getAll: RequestHandler = async (req, res, next) => {
@@ -28,12 +31,14 @@ const post: RequestHandler = async (req, res, next) => {
   const accessToken = req.headers.AzureAccessToken as string;
 
   try {
+    logger.info(`Publishing form ${formPath}...`);
     const form = await formPublicationsService.post(
       formPath,
       languageCodes as TranslationLang[],
       parseInt(revision as string),
       accessToken,
     );
+    logger.info(`Form ${formPath} published successfully`);
     const { translations } = await formPublicationsService.getTranslations(
       formPath,
       languageCodes as TranslationLang[],
@@ -53,6 +58,36 @@ const post: RequestHandler = async (req, res, next) => {
   }
 };
 
+const postBulk: RequestHandler = async (req, res, next) => {
+  const { formPaths } = req.body.payload;
+  const accessToken = req.headers.AzureAccessToken as string;
+
+  if (!Array.isArray(formPaths) || formPaths.length === 0) {
+    next(new BadRequest('Request is missing formPaths'));
+    return;
+  }
+
+  try {
+    const allForms = await formsService.getAll('path,revision');
+    const formPublications: FormPublication[] = allForms
+      .filter((form) => formPaths.includes(form.path))
+      .map((form) => ({ path: form.path, revision: form.revision! }));
+    logger.info(`Bulk-publishing ${formPublications.length}...`, { formPaths });
+
+    const bulkPublicationResult = await formPublicationsService.postAll(formPublications, accessToken);
+    const successCounter = bulkPublicationResult.filter((r) => r.status === 'ok');
+    const failureCounter = bulkPublicationResult.filter((r) => r.status !== 'ok');
+    logger.info(`Published ${successCounter.length} forms (failed: ${failureCounter.length})`, {
+      bulkPublicationResult,
+    });
+
+    req.body = { bulkPublicationResult };
+    next();
+  } catch (error) {
+    next(error);
+  }
+};
+
 const unpublish: RequestHandler = async (req, _res, next) => {
   try {
     const { formPath } = req.params;
@@ -77,6 +112,6 @@ const getTranslations = async (req, res, next) => {
   }
 };
 
-const formPublications = { getAll, get, post, delete: unpublish, getTranslations };
+const formPublications = { getAll, get, post, postBulk, delete: unpublish, getTranslations };
 
 export default formPublications;

packages/bygger-backend/src/routers/api/deprecated-publish-form.ts

@@ -1,13 +1,15 @@
 import express from 'express';
 import authHandlers from '../helpers/authHandlers';
 import publishForm from '../publish-form';
+import publishForms from '../publish-forms';
 import unpublishForm from '../unpublish-form';
 import formPublications from './form-publications';
 
 const formPublicationsRouter = express.Router();
 const { formsApiAuthHandler } = authHandlers;
 
 formPublicationsRouter.get('/', formPublications.getAll);
+formPublicationsRouter.post('/', formsApiAuthHandler, formPublications.postBulk, publishForms);
 formPublicationsRouter.get('/:formPath', formPublications.get);
 formPublicationsRouter.post('/:formPath', formsApiAuthHandler, formPublications.post, publishForm);
 formPublicationsRouter.delete('/:formPath', formsApiAuthHandler, formPublications.delete, unpublishForm);

packages/bygger-backend/src/routers/api/deprecated-unpublish-form.ts

@@ -1,11 +1,9 @@
 import appConfig from '../../../config';
-import authorizedPublisher from './authorizedPublisher';
 import azureOnBehalfOfTokenHandler from './azureOnBehalfOfTokenHandler';
 
 const { naisClusterName, formsApi } = appConfig;
 
 const authHandlers = {
-  authorizedPublisher,
   formsApiAuthHandler: azureOnBehalfOfTokenHandler(`${naisClusterName}.fyllut-sendinn.forms-api`, formsApi.devToken),
 };
 

packages/bygger-backend/src/routers/api/form-publications/form-publications.ts

@@ -1,9 +1,6 @@
 import express from 'express';
 import { rateLimiter } from '../../middleware/ratelimit';
 import config from './config';
-import deprecatedPublishBulk from './deprecated-publish-bulk';
-import deprecatedPublishForm from './deprecated-publish-form';
-import deprecatedUnpublishForm from './deprecated-unpublish-form';
 import enhetsliste from './enhetsliste';
 import formPublicationsRouter from './form-publications';
 import formDiff from './formDiff';
@@ -16,27 +13,16 @@ import log from './log';
 import migrate from './migrate';
 import migratePreview from './migrate-preview';
 import migrateUpdate from './migrate-update';
-import publishForm from './publish-form';
-import publishForms from './publish-forms';
-import publishResource from './publish-resource';
 import publishedForms from './published-forms';
 import recipientsRouter from './recipients';
 import reportsRouter from './reports';
 import temakoder from './temakoder';
-import unpublishForm from './unpublish-form';
 
 const apiRouter = express.Router();
-const { authorizedPublisher, formsApiAuthHandler } = authHandlers;
+const { formsApiAuthHandler } = authHandlers;
 
 apiRouter.get('/config', config);
-apiRouter.put('/publish/:formPath', authorizedPublisher, deprecatedPublishForm);
-apiRouter.delete('/publish/:formPath', authorizedPublisher, deprecatedUnpublishForm);
-apiRouter.put('/published-forms/:formPath', authorizedPublisher, publishForm);
 apiRouter.get('/published-forms/:formPath', publishedForms.get);
-apiRouter.delete('/published-forms/:formPath', authorizedPublisher, unpublishForm);
-apiRouter.post('/published-forms', authorizedPublisher, publishForms);
-apiRouter.post('/publish-bulk', authorizedPublisher, deprecatedPublishBulk);
-apiRouter.put('/published-resource/:resourceName', authorizedPublisher, publishResource);
 apiRouter.get('/enhetsliste', enhetsliste);
 apiRouter.get('/temakoder', temakoder);
 apiRouter.use('/reports', reportsRouter);