From ae994f387ba6048ee38baf221d93fe3e176dc138 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Thu, 13 Jul 2023 23:09:37 +0800
Subject: [PATCH] bugfix/tweaked the position to run
 populateMigrationOfViewDefinitionPermissions

---
 .../scala/code/api/util/migration/Migration.scala | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 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
index d028d873be..82d8a3edc7 100644
--- 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)
+        }
       }
     }