Fix non-updating metamodel version in metamodel migration

Author: vknaisl

wizard-server/src/Wizard/Database/DAO/KnowledgeModel/KnowledgeModelEditorDAO.hs

@@ -147,6 +147,15 @@ updateKnowledgeModelEditorByUuid kmEditor = do
   let action conn = execute conn sql params
   runDB action
 
+updateKnowledgeModelEditorMetamodelVersion :: U.UUID -> Int -> AppContextM Int64
+updateKnowledgeModelEditorMetamodelVersion uuid metamodelVersion = do
+  tenantUuid <- asks currentTenantUuid
+  let sql = fromString "UPDATE knowledge_model_editor SET metamodel_version = ? WHERE tenant_uuid = ? AND uuid = ?"
+  let params = [toField metamodelVersion, toField tenantUuid, toField uuid]
+  logQuery sql params
+  let action conn = execute conn sql params
+  runDB action
+
 deleteKnowledgeModelEditors :: AppContextM Int64
 deleteKnowledgeModelEditors = createDeleteEntitiesFn entityName
 

wizard-server/src/Wizard/Database/DAO/KnowledgeModel/KnowledgeModelPackageDAO.hs

@@ -150,6 +150,15 @@ countPackageSuggestions mQuery selectCondition excludeCondition mSelectIdsLike m
     [count] -> return . fromOnly $ count
     _ -> return 0
 
+updatePackageMetamodelVersion :: String -> Int -> AppContextM Int64
+updatePackageMetamodelVersion pkgId metamodelVersion = do
+  tenantUuid <- asks currentTenantUuid
+  let sql = fromString "UPDATE knowledge_model_package SET metamodel_version = ? WHERE tenant_uuid = ? AND id = ?"
+  let params = [toField metamodelVersion, toField tenantUuid, toField pkgId]
+  logQuery sql params
+  let action conn = execute conn sql params
+  runDB action
+
 updatePackagePhaseById :: String -> KnowledgeModelPackagePhase -> AppContextM Int64
 updatePackagePhaseById pkgId phase = do
   tenantUuid <- asks currentTenantUuid

wizard-server/src/Wizard/Database/Migration/Production/Migration.hs

@@ -63,6 +63,7 @@ import qualified Wizard.Database.Migration.Production.Migration_0058_documentTem
 import qualified Wizard.Database.Migration.Production.Migration_0059_integrationReplyFix.Migration as M_0059
 import qualified Wizard.Database.Migration.Production.Migration_0060_knowledgeModelRefactor.Migration as M_0060
 import qualified Wizard.Database.Migration.Production.Migration_0061_news.Migration as M_0061
+import qualified Wizard.Database.Migration.Production.Migration_0062_metamodelFix.Migration as M_0062
 
 migrationDefinitions :: [MigrationDefinition]
 migrationDefinitions =
@@ -127,4 +128,5 @@ migrationDefinitions =
   , M_0059.definition
   , M_0060.definition
   , M_0061.definition
+  , M_0062.definition
   ]

wizard-server/src/Wizard/Database/Migration/Production/Migration_0062_metamodelFix/Migration.hs

@@ -0,0 +1,27 @@
+module Wizard.Database.Migration.Production.Migration_0062_metamodelFix.Migration (
+  definition,
+) where
+
+import Control.Monad.Logger
+import Control.Monad.Reader (liftIO)
+import Data.Pool (Pool, withResource)
+import Database.PostgreSQL.Migration.Entity
+import Database.PostgreSQL.Simple
+
+definition = (meta, migrate)
+
+meta = MigrationMeta {mmNumber = 62, mmName = "Fix metamodel version", mmDescription = "Fix metamodel version"}
+
+migrate :: Pool Connection -> LoggingT IO (Maybe Error)
+migrate dbPool = do
+  let sql =
+        "UPDATE knowledge_model_package \
+        \SET metamodel_version = 19 \
+        \WHERE tenant_uuid IN (SELECT uuid FROM tenant WHERE state = 'ReadyForUseTenantState'); \
+        \ \
+        \UPDATE knowledge_model_editor \
+        \SET metamodel_version = 19 \
+        \WHERE tenant_uuid IN (SELECT uuid FROM tenant WHERE state = 'ReadyForUseTenantState');"
+  let action conn = execute_ conn sql
+  liftIO $ withResource dbPool action
+  return Nothing

wizard-server/src/Wizard/Service/KnowledgeModel/Metamodel/Migrator/KnowledgeModelEditorMigrator.hs

@@ -2,6 +2,7 @@ module Wizard.Service.KnowledgeModel.Metamodel.Migrator.KnowledgeModelEditorMigr
   migrateAll,
 ) where
 
+import Control.Monad (void)
 import Control.Monad.Reader (asks)
 import qualified Data.Aeson as A
 import Data.Foldable (traverse_)
@@ -39,3 +40,4 @@ migrateOneInDB tenantUuid editor = do
         deleteKnowledgeModelEventsByEditorUuid editor.uuid
         let kmEventsMigrated = fmap (toKnowledgeModelEditorRawEvent editor.uuid tenantUuid) eventsMigrated
         traverse_ insertKnowledgeModelRawEvent kmEventsMigrated
+        void $ updateKnowledgeModelEditorMetamodelVersion editor.uuid knowledgeModelMetamodelVersion

wizard-server/src/Wizard/Service/KnowledgeModel/Metamodel/Migrator/KnowledgeModelPackageMigrator.hs

@@ -2,6 +2,7 @@ module Wizard.Service.KnowledgeModel.Metamodel.Migrator.KnowledgeModelPackageMig
   migrateAll,
 ) where
 
+import Control.Monad (void)
 import Control.Monad.Reader (asks)
 import qualified Data.Aeson as A
 import Data.Foldable (traverse_)
@@ -14,6 +15,7 @@ import Shared.KnowledgeModel.Database.DAO.Package.KnowledgeModelPackageDAO
 import Shared.KnowledgeModel.Database.DAO.Package.KnowledgeModelPackageEventDAO
 import Shared.KnowledgeModel.Model.KnowledgeModel.Package.KnowledgeModelPackage
 import Shared.KnowledgeModel.Service.KnowledgeModel.Package.KnowledgeModelPackageMapper
+import Wizard.Database.DAO.KnowledgeModel.KnowledgeModelPackageDAO
 import Wizard.Model.Context.AppContext
 import Wizard.Service.KnowledgeModel.Metamodel.Migrator.CommonDB
 
@@ -39,3 +41,4 @@ migrateOneInDB tenantUuid pkg = do
         let kmEventsMigrated = fmap (toPackageRawEvent pkg.pId tenantUuid) eventsMigrated
         deletePackageEventsById pkg.pId
         traverse_ insertPackageRawEvent kmEventsMigrated
+        void $ updatePackageMetamodelVersion pkg.pId knowledgeModelMetamodelVersion