fix: ensure DB migration runs (#1120)

* ensure DB migration runs

* add beta to branch QA

.github/workflows/branch--lint-unit-and-smoke-test.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - beta
     paths-ignore:
       - "docs/**"
       - "**/README.md"

submitter/src/submission/createServer.ts

@@ -1,6 +1,5 @@
 import hapi, { ServerOptions } from "@hapi/hapi";
 import { pluginLogging } from "./plugins/logging";
-import { pluginQueue } from "./plugins/queue";
 import config from "../config";
 import { QueueService, WebhookService } from "./services";
 import Schmervice from "schmervice";
@@ -37,7 +36,6 @@ export async function createServer(): Promise<hapi.Server> {
   const server = hapi.server(serverOptions);
 
   await server.register(pluginLogging);
-  await server.register(pluginQueue);
   await server.register(Schmervice);
 
   server.registerService([WebhookService, QueueService]);

submitter/src/submission/index.ts

@@ -1,10 +1,16 @@
 import { createServer } from "./createServer";
+import { setupDatabase } from "./setupDatabase";
 
 async function initApp() {
-  const server = await createServer();
+  await setupDatabase();
 
-  await server.start();
-  process.send && process.send("online");
+  const server = await createServer();
+  try {
+    await server.start();
+    process?.send?.("online");
+  } catch (e) {
+    throw e;
+  }
 }
 
 initApp().catch((err) => {

submitter/src/submission/retention/redactSubmissions.ts

@@ -8,7 +8,9 @@ let RETENTION_PERIOD = 365;
 
 try {
   RETENTION_PERIOD = parseInt(config.retentionPeriod);
-  logger.info(`config.retentionPeriod set to ${config.rentionPeriod}`);
+  logger.info(
+    `config.retentionPeriod set to ${config.rentionPeriod}, defaulting to ${RETENTION_PERIOD} instead`
+  );
 } catch (e) {
   logger.error(R_ERRORS.CONFIG);
 }

submitter/src/submission/setupDatabase.ts

@@ -0,0 +1,29 @@
+import { spawnSync } from "child_process";
+import pino from "pino";
+const logger = pino();
+
+export function setupDatabase() {
+  const schemaLocation = require.resolve(
+    "@xgovformbuilder/queue-model/schema.prisma"
+  );
+
+  const child = spawnSync(
+    "prisma",
+    ["migrate", "deploy", "--schema", schemaLocation],
+    {
+      encoding: "utf-8",
+      stdio: "inherit",
+    }
+  );
+
+  if (child.status === 1) {
+    logger.error("Could not connect to database, exiting");
+    logger.error(child.error);
+    process.exit(1);
+  }
+
+  if (child.stdout) {
+    logger.info(child.stdout);
+    logger.info("Database migration was successful, continuing");
+  }
+}