Merge pull request #233 from ds-wizard/release/4.9.1

vknaisl · web-flow · commit 0215ba1dd5d1 · 2024-08-08T16:26:34.000+02:00
Release 4.9.1
diff --git a/registry-public/package.yaml b/registry-public/package.yaml
@@ -1,5 +1,5 @@
 name: registry-public
-version: '4.9.0'
+version: '4.9.1'
 synopsis: Registry Public
 description: Registry Public
 category: Web
diff --git a/registry-server/package.yaml b/registry-server/package.yaml
@@ -1,5 +1,5 @@
 name: registry-server
-version: '4.9.0'
+version: '4.9.1'
 synopsis: Engine Registry
 description: Engine Registry
 category: Web
diff --git a/registry-server/src/Registry/Api/Handler/Swagger/Api.hs b/registry-server/src/Registry/Api/Handler/Swagger/Api.hs
@@ -38,7 +38,7 @@ swagger =
             s._swaggerInfo
               { _infoTitle = "Registry API"
               , _infoDescription = Just "API specification for Registry"
-              , _infoVersion = "4.9.0"
+              , _infoVersion = "4.9.1"
               , _infoLicense =
                   Just $
                     License
diff --git a/shared-common/package.yaml b/shared-common/package.yaml
@@ -1,5 +1,5 @@
 name: shared-common
-version: '4.9.0'
+version: '4.9.1'
 synopsis: Engine Shared
 description: Engine Shared
 category: Web
diff --git a/wizard-common/package.yaml b/wizard-common/package.yaml
@@ -1,5 +1,5 @@
 name: wizard-common
-version: '4.9.0'
+version: '4.9.1'
 synopsis: Wizard Engine
 description: Wizard Engine
 category: Web
diff --git a/wizard-public/package.yaml b/wizard-public/package.yaml
@@ -1,5 +1,5 @@
 name: wizard-public
-version: '4.9.0'
+version: '4.9.1'
 synopsis: Wizard Public
 description: Wizard Public
 category: Web
diff --git a/wizard-server/package.yaml b/wizard-server/package.yaml
@@ -1,5 +1,5 @@
 name: wizard-server
-version: '4.9.0'
+version: '4.9.1'
 synopsis: Engine Wizard
 description: Engine Wizard
 category: Web
diff --git a/wizard-server/src/Wizard/Api/Handler/Swagger/Api.hs b/wizard-server/src/Wizard/Api/Handler/Swagger/Api.hs
@@ -139,7 +139,7 @@ swagger =
             s._swaggerInfo
               { _infoTitle = "Wizard API"
               , _infoDescription = Just "API specification for Wizard"
-              , _infoVersion = "4.9.0"
+              , _infoVersion = "4.9.1"
               , _infoLicense =
                   Just $
                     License
diff --git a/wizard-server/src/Wizard/Api/Resource/Questionnaire/Version/QuestionnaireVersionChangeSM.hs b/wizard-server/src/Wizard/Api/Resource/Questionnaire/Version/QuestionnaireVersionChangeSM.hs
@@ -8,4 +8,4 @@ import Wizard.Api.Resource.Questionnaire.Version.QuestionnaireVersionChangeJM ()
 import Wizard.Database.Migration.Development.Questionnaire.Data.QuestionnaireVersions
 
 instance ToSchema QuestionnaireVersionChangeDTO where
-  declareNamedSchema = toSwagger questionnaireVersion1ChangeDto
+  declareNamedSchema = toSwagger questionnaireVersion2ChangeDto
diff --git a/wizard-server/src/Wizard/Database/Migration/Development/Questionnaire/Data/QuestionnaireVersions.hs b/wizard-server/src/Wizard/Database/Migration/Development/Questionnaire/Data/QuestionnaireVersions.hs
@@ -35,9 +35,6 @@ questionnaireVersion1 =
 questionnaireVersion1Dto :: QuestionnaireVersionDTO
 questionnaireVersion1Dto = toVersionDTO questionnaireVersion1 (Just userAlbert)
 
-questionnaireVersion1ChangeDto :: QuestionnaireVersionChangeDTO
-questionnaireVersion1ChangeDto = toVersionChangeDTO questionnaireVersion1
-
 questionnaireVersion1Edited :: QuestionnaireVersion
 questionnaireVersion1Edited =
   questionnaireVersion1
@@ -54,3 +51,17 @@ questionnaireVersion1EditedChangeDto = toVersionChangeDTO questionnaireVersion1E
 
 questionnaireVersion1RevertDto :: QuestionnaireVersionRevertDTO
 questionnaireVersion1RevertDto = toVersionRevertDTO sre_rQ2.uuid
+
+questionnaireVersion2 :: QuestionnaireVersion
+questionnaireVersion2 =
+  QuestionnaireVersion
+    { uuid = u' "1e57564e-77ff-438e-952c-515f1d45b24f"
+    , name = "Version 2"
+    , description = Just "Version 2 description"
+    , eventUuid = sre_rQ11.uuid
+    , createdBy = userAlbert.uuid
+    , createdAt = UTCTime (fromJust $ fromGregorianValid 2018 1 21) 0
+    , updatedAt = UTCTime (fromJust $ fromGregorianValid 2018 1 21) 0
+    }
+questionnaireVersion2ChangeDto :: QuestionnaireVersionChangeDTO
+questionnaireVersion2ChangeDto = toVersionChangeDTO questionnaireVersion2
diff --git a/wizard-server/src/Wizard/Localization/Messages/Public.hs b/wizard-server/src/Wizard/Localization/Messages/Public.hs
@@ -186,6 +186,12 @@ _ERROR_SERVICE_QTN_VERSION__NON_EXISTENT_EVENT_UUID eventUuid =
     "You can't create version for non-existent event (eventUuid: '%s')"
     [eventUuid]
 
+_ERROR_SERVICE_QTN_VERSION__VERSION_UNIQUENESS eventUuid =
+  LocaleRecord
+    "error.service.qtn.version.version_uniqueness"
+    "There is already a version for the event (eventUuid: '%s')"
+    [eventUuid]
+
 _ERROR_SERVICE_QTN__UNABLE_TO_GENERATE_DOCUMENT_PREVIEW workerLog =
   LocaleRecord "error.service.qtn.unable_to_generate_document_preview" "%s" [fromMaybe "no log provided" workerLog]
 
diff --git a/wizard-server/src/Wizard/Service/Questionnaire/Version/QuestionnaireVersionValidation.hs b/wizard-server/src/Wizard/Service/Questionnaire/Version/QuestionnaireVersionValidation.hs
@@ -11,9 +11,21 @@ import Wizard.Localization.Messages.Public
 import Wizard.Model.Context.AppContext
 import Wizard.Model.Questionnaire.Questionnaire
 import Wizard.Model.Questionnaire.QuestionnaireEventLenses ()
+import Wizard.Model.Questionnaire.QuestionnaireVersion
 
 validateQuestionnaireVersion :: QuestionnaireVersionChangeDTO -> Questionnaire -> AppContextM ()
-validateQuestionnaireVersion reqDto qtn =
+validateQuestionnaireVersion reqDto qtn = do
+  validateQuestionnaireVersionEventExistence reqDto qtn
+  validateQuestionnaireVersionUniqueness reqDto qtn
+
+validateQuestionnaireVersionUniqueness :: QuestionnaireVersionChangeDTO -> Questionnaire -> AppContextM ()
+validateQuestionnaireVersionUniqueness reqDto qtn =
+  case L.find (\v -> v.eventUuid == reqDto.eventUuid) qtn.versions of
+    Just _ -> throwError . UserError $ _ERROR_SERVICE_QTN_VERSION__VERSION_UNIQUENESS (U.toString $ reqDto.eventUuid)
+    Nothing -> return ()
+
+validateQuestionnaireVersionEventExistence :: QuestionnaireVersionChangeDTO -> Questionnaire -> AppContextM ()
+validateQuestionnaireVersionEventExistence reqDto qtn =
   case L.find (\e -> getUuid e == reqDto.eventUuid) qtn.events of
     Just _ -> return ()
     Nothing ->
diff --git a/wizard-server/test/Wizard/Specs/API/Questionnaire/Version/List_POST.hs b/wizard-server/test/Wizard/Specs/API/Questionnaire/Version/List_POST.hs
@@ -43,7 +43,7 @@ reqUrl = "/wizard-api/questionnaires/af984a75-56e3-49f8-b16f-d6b99599910a/versio
 
 reqHeaders = [reqAuthHeader, reqCtHeader]
 
-reqDto = questionnaireVersion1ChangeDto
+reqDto = questionnaireVersion2ChangeDto
 
 reqBody = encode reqDto
 
@@ -56,7 +56,7 @@ test_201 appContext =
     do
       let expStatus = 201
       let expHeaders = resCtHeaderPlain : resCorsHeadersPlain
-      let expDto = questionnaireVersion1Dto
+      let expDto = questionnaireVersion2
       let expBody = encode expDto
       -- AND: Run migrations
       runInContextIO TML.runMigration appContext
@@ -69,7 +69,7 @@ test_201 appContext =
       assertResHeaders headers expHeaders
       compareQuestionnaireVersionCreateDtos resBody expDto
       -- AND: Find a result in DB
-      let updatedVersions = [questionnaireVersion1, questionnaireVersion1 {uuid = resBody.uuid} :: QuestionnaireVersion]
+      let updatedVersions = [questionnaireVersion1, questionnaireVersion2 {uuid = resBody.uuid} :: QuestionnaireVersion]
       assertExistenceOfQuestionnaireInDB appContext (questionnaire1 {versions = updatedVersions})
 
 -- ----------------------------------------------------
