Fix validating document template metamodel version

Author: vknaisl

shared-common/src/Shared/DocumentTemplate/Constant/DocumentTemplate.hs

@@ -4,3 +4,12 @@ import Shared.Common.Model.Common.SemVer2Tuple
 
 documentTemplateMetamodelVersion :: SemVer2Tuple
 documentTemplateMetamodelVersion = SemVer2Tuple 17 0
+
+isDocumentTemplateSupported :: SemVer2Tuple -> Bool
+isDocumentTemplateSupported metamodelVersion
+  | metamodelVersion == documentTemplateMetamodelVersion = True
+  | metamodelVersion.major == documentTemplateMetamodelVersion.major && metamodelVersion.minor < documentTemplateMetamodelVersion.minor = True
+  | otherwise = False
+
+isDocumentTemplateUnsupported :: SemVer2Tuple -> Bool
+isDocumentTemplateUnsupported = not . isDocumentTemplateSupported

wizard-server/src/Wizard/Database/Mapping/Project/ProjectDetailSettings.hs

@@ -82,7 +82,7 @@ instance FromRow ProjectDetailSettings where
     let documentTemplateState =
           case mDocumentTemplateMetamodelVersion of
             Just metamodelVersion ->
-              if metamodelVersion /= documentTemplateMetamodelVersion
+              if isDocumentTemplateUnsupported metamodelVersion
                 then Just UnsupportedMetamodelVersionDocumentTemplateState
                 else Just DefaultDocumentTemplateState
             _ -> Nothing

wizard-server/src/Wizard/Service/DocumentTemplate/DocumentTemplateService.hs

@@ -12,6 +12,7 @@ import Shared.Common.Model.Common.Sort
 import Shared.Common.Model.Error.Error
 import Shared.Coordinate.Service.Coordinate.CoordinateValidation
 import Shared.DocumentTemplate.Api.Resource.DocumentTemplate.DocumentTemplateSuggestionDTO
+import Shared.DocumentTemplate.Constant.DocumentTemplate
 import Shared.DocumentTemplate.Database.DAO.DocumentTemplate.DocumentTemplateAssetDAO
 import Shared.DocumentTemplate.Database.DAO.DocumentTemplate.DocumentTemplateDAO hiding (findDocumentTemplatesFiltered)
 import Shared.DocumentTemplate.Database.DAO.DocumentTemplate.DocumentTemplateFormatDAO
@@ -66,7 +67,7 @@ getDocumentTemplateSuggestions mPkgId includeUnsupportedMetamodelVersion mPhase
   where
     filterDocumentTemplatesInGroup :: [DocumentTemplateSuggestion] -> [DocumentTemplateSuggestion]
     filterDocumentTemplatesInGroup =
-      filter (isDocumentTemplateSupported includeUnsupportedMetamodelVersion)
+      filter (\dt -> includeUnsupportedMetamodelVersion || isDocumentTemplateSupported dt.metamodelVersion)
         . filter (isDocumentTemplateInPhase mPhase)
         . filterDocumentTemplates mPkgId
 

wizard-server/src/Wizard/Service/DocumentTemplate/DocumentTemplateUtil.hs

@@ -13,13 +13,13 @@ import Wizard.Model.Registry.RegistryTemplate
 
 computeDocumentTemplateState :: [RegistryTemplate] -> DocumentTemplate -> DocumentTemplateState
 computeDocumentTemplateState tmlsFromRegistry tml =
-  if not (isDocumentTemplateSupported False tml)
+  if not (isDocumentTemplateSupported tml.metamodelVersion)
     then UnsupportedMetamodelVersionDocumentTemplateState
     else DefaultDocumentTemplateState
 
 computeDocumentTemplateState' :: DocumentTemplateList -> DocumentTemplateState
 computeDocumentTemplateState' tml
-  | not (isDocumentTemplateSupported False tml) = UnsupportedMetamodelVersionDocumentTemplateState
+  | not (isDocumentTemplateSupported tml.metamodelVersion) = UnsupportedMetamodelVersionDocumentTemplateState
   | otherwise = DefaultDocumentTemplateState
 
 selectDocumentTemplateByOrgIdAndTmlId tml =
@@ -31,9 +31,6 @@ getUsableKnowledgeModelPackagesForDocumentTemplate tml = chooseTheNewest . group
   where
     filterPackages tml = filter (\pkg -> not . null $ filterDocumentTemplates (Just pkg.pId) [tml])
 
-isDocumentTemplateSupported True tml = True
-isDocumentTemplateSupported False tml = tml.metamodelVersion == documentTemplateMetamodelVersion
-
 isDocumentTemplateInPhase (Just phase) tml = tml.phase == phase
 isDocumentTemplateInPhase _ _ = True
 

wizard-server/src/Wizard/Service/DocumentTemplate/DocumentTemplateValidation.hs

@@ -74,7 +74,7 @@ validateUsageBySomeDocument tmlId = do
 validateMetamodelVersion :: DocumentTemplate -> AppContextM ()
 validateMetamodelVersion tml =
   when
-    (tml.metamodelVersion /= documentTemplateMetamodelVersion)
+    (isDocumentTemplateUnsupported tml.metamodelVersion)
     ( throwError . UserError $
         _ERROR_VALIDATION__TEMPLATE_UNSUPPORTED_METAMODEL_VERSION tml.tId (show tml.metamodelVersion) (show documentTemplateMetamodelVersion)
     )

wizard-server/src/Wizard/Service/Project/ProjectMapper.hs

@@ -230,7 +230,7 @@ toProjectDetailTemplateState :: Maybe DocumentTemplate -> Maybe DocumentTemplate
 toProjectDetailTemplateState =
   fmap
     ( \tml ->
-        if tml.metamodelVersion /= documentTemplateMetamodelVersion
+        if isDocumentTemplateUnsupported tml.metamodelVersion
           then UnsupportedMetamodelVersionDocumentTemplateState
           else DefaultDocumentTemplateState
     )