Merge remote-tracking branch 'upstream/develop' into develop

OpenBankProject · Jul 14, 2023 · c6a654d · c6a654d
2 parents f4784c0 + f4fc319
commit c6a654d
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/obp-api/src/main/scala/code/api/util/migration/Migration.scala b/obp-api/src/main/scala/code/api/util/migration/Migration.scala
@@ -63,7 +63,7 @@ object Migration extends MdcLoggable {
       dummyScript()
       addAccountAccessConsumerId()
       populateTableViewDefinition()
-      populateMigrationOfViewDefinitionPermissions()
+      populateMigrationOfViewDefinitionPermissions(startedBeforeSchemifier)
       populateTableAccountAccess()
       generateAndPopulateMissingCustomerUUIDs(startedBeforeSchemifier)
       generateAndPopulateMissingConsumersUUIDs(startedBeforeSchemifier)
@@ -129,10 +129,15 @@ object Migration extends MdcLoggable {
     }  
 
 
-    private def populateMigrationOfViewDefinitionPermissions(): Boolean = {
-      val name = nameOf(populateMigrationOfViewDefinitionPermissions)
-      runOnce(name) {
-        MigrationOfViewDefinitionPermissions.populate(name)
+    private def populateMigrationOfViewDefinitionPermissions(startedBeforeSchemifier: Boolean): Boolean = {
+      if (startedBeforeSchemifier == true) {
+        logger.warn(s"Migration.database.populateMigrationOfViewDefinitionPermissions(true) cannot be run before Schemifier.")
+        true
+      } else {
+        val name = nameOf(populateMigrationOfViewDefinitionPermissions(startedBeforeSchemifier))
+        runOnce(name) {
+          MigrationOfViewDefinitionPermissions.populate(name)
+        }
       }
     }