theopensystemslab · DafyddLlyr · Dec 1, 2023 · Nov 30, 2023 · Nov 30, 2023 · Nov 30, 2023
diff --git a/.env.example b/.env.example
@@ -62,7 +62,6 @@ PRODUCTION_PG_URL_FOR_USER_GITHUB_ACTIONS=👻
 SHAREDB_PORT=7003
 
 # Integrations (local and pull request environments point to third party staging environments)
-BOPS_API_ROOT_DOMAIN=👻
 BOPS_API_TOKEN=👻
 
 GOVUK_NOTIFY_API_KEY=👻
@@ -88,26 +87,16 @@ SUPPRESS_LOGS=true
 ## Lambeth
 GOV_UK_PAY_TOKEN_LAMBETH=👻
 UNIFORM_CLIENT_LAMBETH=👻
-BOPS_SUBMISSION_URL_LAMBETH=https://lambeth.${BOPS_API_ROOT_DOMAIN}
 
 ## Southwark
 GOV_UK_PAY_TOKEN_SOUTHWARK=👻
 UNIFORM_CLIENT_SOUTHWARK=👻
-BOPS_SUBMISSION_URL_SOUTHWARK=https://southwark.${BOPS_API_ROOT_DOMAIN}
 
 ## Buckinghamshire
 GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE=👻
 UNIFORM_CLIENT_AYLESBURY_VALE=👻
 UNIFORM_CLIENT_CHILTERN=👻
 UNIFORM_CLIENT_WYCOMBE=👻
-BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE=https://buckinghamshire.${BOPS_API_ROOT_DOMAIN}
-
-## Camden
-BOPS_SUBMISSION_URL_CAMDEN=https://camden.${BOPS_API_ROOT_DOMAIN}
-
-## Gloucester
-BOPS_SUBMISSION_URL_GLOUCESTER=https://gloucester.${BOPS_API_ROOT_DOMAIN}
 
 ## End-to-end test team (borrows Lambeth's details)
 GOV_UK_PAY_TOKEN_E2E=👻
-BOPS_SUBMISSION_URL_E2E=https://lambeth.${BOPS_API_ROOT_DOMAIN}
diff --git a/api.planx.uk/.env.test.example b/api.planx.uk/.env.test.example
@@ -24,7 +24,6 @@ HASURA_GRAPHQL_URL=http://hasura:8080/v1/graphql
 HASURA_PLANX_API_KEY=👻
 
 # Integrations
-BOPS_API_ROOT_DOMAIN=👻
 BOPS_API_TOKEN=👻
 
 GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE=👻
@@ -41,18 +40,9 @@ SLACK_WEBHOOK_URL=👻
 # Local authority specific integrations
 ## Lambeth
 GOV_UK_PAY_TOKEN_LAMBETH=👻
-BOPS_SUBMISSION_URL_LAMBETH=https://lambeth.${BOPS_API_ROOT_DOMAIN}
 
 ## Southwark
 GOV_UK_PAY_TOKEN_SOUTHWARK=👻
-BOPS_SUBMISSION_URL_SOUTHWARK=https://southwark.${BOPS_API_ROOT_DOMAIN}
 
 ## Buckinghamshire
-GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE=👻
-BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE=https://buckinghamshire.${BOPS_API_ROOT_DOMAIN}
-
-## Camden
-BOPS_SUBMISSION_URL_CAMDEN=https://camden.${BOPS_API_ROOT_DOMAIN}
-
-## Gloucester
-BOPS_SUBMISSION_URL_GLOUCESTER=https://gloucester.${BOPS_API_ROOT_DOMAIN}
+GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE=👻
diff --git a/api.planx.uk/modules/send/bops/bops.test.ts b/api.planx.uk/modules/send/bops/bops.test.ts
@@ -27,9 +27,9 @@ jest.mock("@opensystemslab/planx-core", () => {
   };
 });
 
-const submissionURL = process.env.BOPS_SUBMISSION_URL_SOUTHWARK;
-
 describe(`sending an application to BOPS`, () => {
+  const submissionURL = "https://test.bops-test.com";
+
   beforeEach(() => {
     queryMock.mockQuery({
       name: "FindApplication",
@@ -46,6 +46,38 @@ describe(`sending an application to BOPS`, () => {
         insertBopsApplication: { id: 22 },
       },
     });
+
+    queryMock.mockQuery({
+      name: "GetStagingBopsSubmissionURL",
+      data: {
+        teams: [
+          {
+            integrations: {
+              bopsSubmissionURL: submissionURL,
+            },
+          },
+        ],
+      },
+      variables: {
+        slug: "southwark",
+      },
+    });
+
+    queryMock.mockQuery({
+      name: "GetStagingBopsSubmissionURL",
+      data: {
+        teams: [
+          {
+            integrations: {
+              bopsSubmissionURL: null,
+            },
+          },
+        ],
+      },
+      variables: {
+        slug: "unsupported-team",
+      },
+    });
   });
 
   it("proxies request and returns hasura id", async () => {

diff --git a/api.planx.uk/modules/send/bops/bops.ts b/api.planx.uk/modules/send/bops/bops.ts
@@ -43,8 +43,11 @@ const sendToBOPS = async (req: Request, res: Response, next: NextFunction) => {
   // a local or staging API instance should send to the BOPS staging endpoint
   // production should send to the BOPS production endpoint
   const localAuthority = req.params.localAuthority;
-  const bopsSubmissionURLEnvName = `BOPS_SUBMISSION_URL_${localAuthority.toUpperCase()}`;
-  const bopsSubmissionURL = process.env[bopsSubmissionURLEnvName];
+  const env = process.env.NODE_ENV === "production" ? "production" : "staging";
+  const bopsSubmissionURL = await $api.team.getBopsSubmissionURL(
+    localAuthority,
+    env,
+  );
   const isSupported = Boolean(bopsSubmissionURL);
   if (!isSupported) {
     return next(

diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@airbrake/node": "^2.1.8",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e19754f",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",

diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml
diff --git a/api.planx.uk/server.ts b/api.planx.uk/server.ts
@@ -76,11 +76,6 @@ app.use(helmet());
 assert(process.env.GOVUK_NOTIFY_API_KEY);
 assert(process.env.HASURA_PLANX_API_KEY);
 assert(process.env.BOPS_API_TOKEN);
-assert(process.env.BOPS_SUBMISSION_URL_LAMBETH);
-assert(process.env.BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE);
-assert(process.env.BOPS_SUBMISSION_URL_SOUTHWARK);
-assert(process.env.BOPS_SUBMISSION_URL_CAMDEN);
-assert(process.env.BOPS_SUBMISSION_URL_GLOUCESTER);
 assert(process.env.UNIFORM_TOKEN_URL);
 assert(process.env.UNIFORM_SUBMISSION_URL);
 

diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml
@@ -29,5 +29,4 @@ services:
       UNIFORM_SUBMISSION_URL: http://mock-server:8080
       UNIFORM_TOKEN_URL: http://mock-server:8080
       UNIFORM_CLIENT_E2E: e2e:123
-      GOV_UK_PAY_TOKEN_E2E: ${GOV_UK_PAY_TOKEN_E2E}
-      BOPS_SUBMISSION_URL_E2E: http://mock-server:8080
+      GOV_UK_PAY_TOKEN_E2E: ${GOV_UK_PAY_TOKEN_E2E}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -144,21 +144,14 @@ services:
       # Lambeth
       GOV_UK_PAY_TOKEN_LAMBETH: ${GOV_UK_PAY_TOKEN_LAMBETH}
       UNIFORM_CLIENT_LAMBETH: ${UNIFORM_CLIENT_LAMBETH}
-      BOPS_SUBMISSION_URL_LAMBETH: ${BOPS_SUBMISSION_URL_LAMBETH}
       # Southwark
       GOV_UK_PAY_TOKEN_SOUTHWARK: ${GOV_UK_PAY_TOKEN_SOUTHWARK}
       UNIFORM_CLIENT_SOUTHWARK: ${UNIFORM_CLIENT_SOUTHWARK}
-      BOPS_SUBMISSION_URL_SOUTHWARK: ${BOPS_SUBMISSION_URL_SOUTHWARK}
       # Buckinghamshire
       GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE: ${GOV_UK_PAY_TOKEN_BUCKINGHAMSHIRE}
       UNIFORM_CLIENT_AYLESBURY_VALE: ${UNIFORM_CLIENT_AYLESBURY_VALE}
       UNIFORM_CLIENT_CHILTERN: ${UNIFORM_CLIENT_CHILTERN}
       UNIFORM_CLIENT_WYCOMBE: ${UNIFORM_CLIENT_WYCOMBE}
-      BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE: ${BOPS_SUBMISSION_URL_BUCKINGHAMSHIRE}
-      # Camden
-      BOPS_SUBMISSION_URL_CAMDEN: ${BOPS_SUBMISSION_URL_CAMDEN}
-      # Gloucester
-      BOPS_SUBMISSION_URL_GLOUCESTER: ${BOPS_SUBMISSION_URL_GLOUCESTER}
 
   sharedb:
     restart: unless-stopped

diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@cucumber/cucumber": "^9.3.0",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e19754f",
     "axios": "^1.6.0",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",

diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml
diff --git a/e2e/tests/api-driven/src/invite-to-pay/helpers.ts b/e2e/tests/api-driven/src/invite-to-pay/helpers.ts
@@ -161,6 +161,7 @@ export async function cleanup({
 
 export const setup = async () => {
   await setUpMocks();
+  // TODO: Setup team_integrations
   const world = {
     teamId: await createTeam(),
     userId: await createUser(),

diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json
@@ -8,7 +8,7 @@
     "postinstall": "./install-dependencies.sh"
   },
   "dependencies": {
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e19754f",
     "axios": "^1.6.0",
     "dotenv": "^16.3.1",
     "eslint": "^8.44.0",

diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml
diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json
@@ -14,7 +14,7 @@
     "@mui/styles": "^5.14.5",
     "@mui/utils": "^5.14.5",
     "@opensystemslab/map": "^0.7.5",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#e19754f",
     "@tiptap/core": "^2.0.3",
     "@tiptap/extension-bold": "^2.0.3",
     "@tiptap/extension-bubble-menu": "^2.1.6",

diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml
diff --git a/infrastructure/application/Pulumi.production.yaml b/infrastructure/application/Pulumi.production.yaml
@@ -3,7 +3,6 @@ config:
     secure: AAABAE+ZtQZO26XlmfAS7tG1DkwQ+G5OP82Roe4EOuk/tG1bMsI=
   application:airbrake-project-key:
     secure: AAABAPIGB+gWevPn0SzWnuSuV1RmdwpLOlWKnu8cM/kxLfslvdCIRcU0n0M0XNJ3jwj4EdFn7/llsL1Kg2XnDA==
-  application:bops-api-root-domain: bops.services
   application:bops-api-token:
     secure: AAABALRtSjQMRjERtkHs6WBOI7MBMw4bFOuHO8qLLPe9Pfg8Nlbp61XalZA1pmXsRt/T+59fGcdqbKA5WRkOZVibhFo=
   application:cloudflare-zone-id: a9b9933f28e786ec4cfd4bb596f5a519

diff --git a/infrastructure/application/Pulumi.sandbox.yaml b/infrastructure/application/Pulumi.sandbox.yaml
@@ -2,7 +2,6 @@ config:
   application:airbrake-project-id: "329753"
   application:airbrake-project-key:
     secure: AAABAO8NgmVNdkwajWpiKwi+dxGicFACbAQzK66FREUCp+OUbSRyNAb9dSQHq/n9fZb8xWBdvYBCQ9eBr2jqPQ==
-  application:bops-api-root-domain: bops-staging.services
   application:bops-api-token:
     secure: AAABAHLQf7CFOK073geL2TbTYycQCzPYUy3Xi66UniwIrTlOAqve2YBikJXzMJ2xS9v4dGUZMUmwUba0OpTz8KAMXJ8=
   application:cloudflare-zone-id: 9cdfc35484748e96b0ed2b1d303a694f

diff --git a/infrastructure/application/Pulumi.staging.yaml b/infrastructure/application/Pulumi.staging.yaml
@@ -3,7 +3,6 @@ config:
     secure: AAABABxcp8r3CZAw1kXuXkwPZ8cKRDQyOg4+gVvqzKuCFWb8BEU=
   application:airbrake-project-key:
     secure: AAABABujxMHxU8Abj4QpyQTz7bLt3AP2wBFaypVkDZ2khzc6eh6lHLljTEkzpLUncno3gNNDXnrmxzXvqKnQdQ==
-  application:bops-api-root-domain: bops-staging.services
   application:bops-api-token:
     secure: AAABAJx2KnnFeuEmwRB5VyE790TeYxiKmWFuVXVY8Lb7+HDNRYND8Pfd9d61zjwPzi9Jf2ZlT0OH++1MXYafhdQO28Y=
   application:cloudflare-zone-id: