From ed4fde4f006281c48880ff24ba997dc83b097bdd Mon Sep 17 00:00:00 2001
From: kirrg001 <katharina.irrgang@googlemail.com>
Date: Wed, 7 Feb 2018 12:31:21 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=20Fixed=20migrating=20from=20<?=
 =?UTF-8?q?=201.13=20to=201.21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

no issue

- discovered while testing
- the fixture utility needed a protection against non existent roles in the database
  - it tries to fetch the contributor role from the database, which does not exist yet
---
 core/server/data/schema/fixtures/utils.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/server/data/schema/fixtures/utils.js b/core/server/data/schema/fixtures/utils.js
index c976dee62e..3a2ff4a631 100644
--- a/core/server/data/schema/fixtures/utils.js
+++ b/core/server/data/schema/fixtures/utils.js
@@ -2,6 +2,7 @@
 // Standalone file which can be required to help with advanced operations on the fixtures.json file
 var _ = require('lodash'),
     Promise = require('bluebird'),
+    common = require('../../../lib/common'),
     models = require('../../../models'),
     baseUtils = require('../../../models/base/utils'),
     sequence = require('../../../lib/promise/sequence'),
@@ -140,6 +141,14 @@ addFixturesForRelation = function addFixturesForRelation(relationFixture, option
         _.each(relationFixture.entries, function processEntries(entry, key) {
             var fromItem = data.from.find(matchFunc(relationFixture.from.match, key));
 
+            // CASE: You add new fixtures e.g. a new role in a new release.
+            // As soon as an **older** migration script wants to add permissions for any resource, it iterates over the
+            // permissions for each role. But if the role does not exist yet, it won't find the matching db entry and breaks.
+            if (!fromItem) {
+                common.logging.warn('Skip: Target database entry not found for key: ' + key);
+                return Promise.resolve();
+            }
+
             _.each(entry, function processEntryValues(value, key) {
                 var toItems = data.to.filter(matchFunc(relationFixture.to.match, key, value));
                 max += toItems.length;