From aea535b0aafc2d4d77059f1297db360e7fae8040 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 13 Aug 2020 01:02:44 +0200
Subject: [PATCH] catalog-backend: fix migration script not using uuid for ID

---
 .../migrations/20200809202832_add_bootstrap_location.js      | 5 +++--
 .../src/catalog/DatabaseLocationsCatalog.test.ts             | 2 +-
 plugins/catalog-backend/src/database/CommonDatabase.test.ts  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/catalog-backend/migrations/20200809202832_add_bootstrap_location.js b/plugins/catalog-backend/migrations/20200809202832_add_bootstrap_location.js
index 3d13a4219a..379928493d 100644
--- a/plugins/catalog-backend/migrations/20200809202832_add_bootstrap_location.js
+++ b/plugins/catalog-backend/migrations/20200809202832_add_bootstrap_location.js
@@ -23,7 +23,7 @@ exports.up = async function up(knex) {
   // Adds a single 'bootstrap' location that can be used to trigger work in processors.
   // This is primarily here to fulfill foreign key constraints.
   await knex('locations').insert({
-    id: 'bootstrap',
+    id: require('uuid').v4(),
     type: 'bootstrap',
     target: 'bootstrap',
   });
@@ -35,7 +35,8 @@ exports.up = async function up(knex) {
 exports.down = async function down(knex) {
   await knex('locations')
     .where({
-      id: 'bootstrap',
+      type: 'bootstrap',
+      target: 'bootstrap',
     })
     .del();
 };
diff --git a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts
index 456f06b334..958e864a8e 100644
--- a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts
+++ b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts
@@ -18,7 +18,7 @@ import { DatabaseManager } from '../database';
 import { DatabaseLocationsCatalog } from './DatabaseLocationsCatalog';
 
 const bootstrapLocation = {
-  id: 'bootstrap',
+  id: expect.any(String),
   type: 'bootstrap',
   target: 'bootstrap',
 };
diff --git a/plugins/catalog-backend/src/database/CommonDatabase.test.ts b/plugins/catalog-backend/src/database/CommonDatabase.test.ts
index 94dfc25aa4..b86b4ef959 100644
--- a/plugins/catalog-backend/src/database/CommonDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/CommonDatabase.test.ts
@@ -25,7 +25,7 @@ import type {
 } from './types';
 
 const bootstrapLocation = {
-  id: 'bootstrap',
+  id: expect.any(String),
   type: 'bootstrap',
   target: 'bootstrap',
   message: null,
@@ -98,7 +98,7 @@ describe('CommonDatabase', () => {
       expect.arrayContaining([output, bootstrapLocation]),
     );
     const location = await db.location(
-      locations.find(l => l.id !== 'bootstrap')!.id,
+      locations.find(l => l.type !== 'bootstrap')!.id,
     );
     expect(location).toEqual(output);