Skip to content
/ engine-backend Public

Commit 4cd776e

Browse files
vknaislvknaisl
authored
Merge pull request #313 from ds-wizard/release/4.28.0
Release 4.28.0
2 parents 57216b9 + b7c245d commit 4cd776e

File tree

493 files changed

+3964
-5719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

493 files changed

+3964
-5719
lines changed

‎registry-public/package.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: registry-public
2-
version: '4.27.1'
2+
version: '4.28.0'
33
synopsis: Registry Public
44
description: Registry Public
55
category: Web

‎registry-public/src/RegistryLib/Api/Resource/DocumentTemplate/DocumentTemplateSimpleDTO.hs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
module RegistryLib.Api.Resource.DocumentTemplate.DocumentTemplateSimpleDTO where
22

33
import Data.Time
4+
import qualified Data.UUID as U
45
import GHC.Generics
56

67
import RegistryLib.Model.Organization.OrganizationSimple
78

89
data DocumentTemplateSimpleDTO = DocumentTemplateSimpleDTO
9-
{ tId :: String
10+
{ uuid :: U.UUID
1011
, name :: String
1112
, organizationId :: String
1213
, templateId :: String

‎registry-public/src/RegistryLib/Api/Resource/Package/KnowledgeModelPackageSimpleDTO.hs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
module RegistryLib.Api.Resource.Package.KnowledgeModelPackageSimpleDTO where
22

33
import Data.Time
4+
import qualified Data.UUID as U
45
import GHC.Generics
56

67
import RegistryLib.Model.Organization.OrganizationSimple
78

89
data KnowledgeModelPackageSimpleDTO = KnowledgeModelPackageSimpleDTO
9-
{ pId :: String
10+
{ uuid :: U.UUID
1011
, name :: String
1112
, organizationId :: String
1213
, kmId :: String

‎registry-server/package.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: registry-server
2-
version: '4.27.1'
2+
version: '4.28.0'
33
synopsis: Engine Registry
44
description: Engine Registry
55
category: Web

‎registry-server/src/Registry/Api/Handler/DocumentTemplate/Detail_Bundle_GET.hs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,31 @@ import Registry.Model.Context.BaseContext
1010
import Registry.Service.DocumentTemplate.Bundle.DocumentTemplateBundleService
1111
import Shared.Common.Api.Handler.Common
1212
import Shared.Common.Model.Context.TransactionState
13+
import Shared.Coordinate.Api.Resource.Coordinate.CoordinateJM ()
14+
import Shared.Coordinate.Model.Coordinate.Coordinate
1315

1416
type Detail_Bundle_GET =
1517
Header "Authorization" String
1618
:> "document-templates"
17-
:> Capture "documentTemplateId" String
19+
:> Capture "coordinate" Coordinate
1820
:> "bundle"
1921
:> Get '[OctetStream] (Headers '[Header "x-trace-uuid" String, Header "Content-Disposition" String] FileStreamLazy)
2022

2123
type Templates__Detail_Bundle_GET =
2224
Header "Authorization" String
2325
:> "templates"
24-
:> Capture "documentTemplateId" String
26+
:> Capture "coordinate" Coordinate
2527
:> "bundle"
2628
:> Get '[OctetStream] (Headers '[Header "x-trace-uuid" String, Header "Content-Disposition" String] FileStreamLazy)
2729

2830
detail_bundle_GET
2931
:: Maybe String
30-
-> String
32+
-> Coordinate
3133
-> BaseContextM (Headers '[Header "x-trace-uuid" String, Header "Content-Disposition" String] FileStreamLazy)
32-
detail_bundle_GET mTokenHeader tmlId =
34+
detail_bundle_GET mTokenHeader documentTemplateId =
3335
getAuthServiceExecutor mTokenHeader $ \runInAuthService ->
3436
runInAuthService NoTransaction $ do
35-
zipFile <- exportBundle tmlId
37+
zipFile <- exportBundle documentTemplateId
3638
let cdHeader = "attachment;filename=\"template.zip\""
3739
traceUuid <- asks traceUuid
3840
return . addHeader (U.toString traceUuid) . addHeader cdHeader . FileStreamLazy $ zipFile

‎registry-server/src/Registry/Api/Handler/DocumentTemplate/Detail_GET.hs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ import Registry.Model.Context.ContextLenses ()
1010
import Registry.Service.DocumentTemplate.DocumentTemplateService
1111
import Shared.Common.Api.Handler.Common
1212
import Shared.Common.Model.Context.TransactionState
13+
import Shared.Coordinate.Model.Coordinate.Coordinate
1314

1415
type Detail_GET =
1516
"document-templates"
16-
:> Capture "documentTemplateId" String
17+
:> Capture "coordinate" Coordinate
1718
:> Get '[SafeJSON] (Headers '[Header "x-trace-uuid" String] DocumentTemplateDetailDTO)
1819

19-
detail_GET :: String -> BaseContextM (Headers '[Header "x-trace-uuid" String] DocumentTemplateDetailDTO)
20-
detail_GET tmlId = runInUnauthService NoTransaction $ addTraceUuidHeader =<< getDocumentTemplateById tmlId
20+
detail_GET :: Coordinate -> BaseContextM (Headers '[Header "x-trace-uuid" String] DocumentTemplateDetailDTO)
21+
detail_GET coordinate = runInUnauthService NoTransaction $ addTraceUuidHeader =<< getDocumentTemplateByCoordinate coordinate

‎registry-server/src/Registry/Api/Handler/DocumentTemplate/List_Bundle_POST.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ import Servant
44
import Servant.Multipart
55

66
import Registry.Api.Handler.Common
7-
import Registry.Api.Resource.DocumentTemplate.DocumentTemplateDetailDTO
8-
import Registry.Api.Resource.DocumentTemplate.DocumentTemplateDetailJM ()
97
import Registry.Model.Context.BaseContext
108
import Registry.Service.DocumentTemplate.Bundle.DocumentTemplateBundleService
119
import Shared.Common.Api.Handler.Common
1210
import Shared.Common.Api.Resource.Common.FileDTO
1311
import Shared.Common.Api.Resource.Common.FileJM ()
1412
import Shared.Common.Model.Context.TransactionState
13+
import Shared.DocumentTemplate.Api.Resource.DocumentTemplate.DocumentTemplateSimpleJM ()
14+
import Shared.DocumentTemplate.Model.DocumentTemplate.DocumentTemplateSimple
1515

1616
type List_Bundle_POST =
1717
Header "Authorization" String
1818
:> MultipartForm Mem FileDTO
1919
:> "document-templates"
2020
:> "bundle"
21-
:> PostCreated '[SafeJSON] (Headers '[Header "x-trace-uuid" String] DocumentTemplateDetailDTO)
21+
:> PostCreated '[SafeJSON] (Headers '[Header "x-trace-uuid" String] DocumentTemplateSimple)
2222

2323
list_bundle_POST
2424
:: Maybe String
2525
-> FileDTO
26-
-> BaseContextM (Headers '[Header "x-trace-uuid" String] DocumentTemplateDetailDTO)
26+
-> BaseContextM (Headers '[Header "x-trace-uuid" String] DocumentTemplateSimple)
2727
list_bundle_POST mTokenHeader reqDto =
2828
getAuthServiceExecutor mTokenHeader $ \runInAuthService ->
2929
runInAuthService Transactional $

‎registry-server/src/Registry/Api/Handler/KnowledgeModelPackage/Detail_Bundle_GET.hs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ import Registry.Model.KnowledgeModel.Bundle.KnowledgeModelBundle
1010
import Registry.Service.KnowledgeModel.Bundle.KnowledgeModelBundleService
1111
import Shared.Common.Api.Handler.Common
1212
import Shared.Common.Model.Context.TransactionState
13+
import Shared.Coordinate.Model.Coordinate.Coordinate
1314

1415
type Detail_Bundle_GET =
1516
Header "Authorization" String
1617
:> "knowledge-model-packages"
17-
:> Capture "id" String
18+
:> Capture "coordinate" Coordinate
1819
:> "bundle"
1920
:> Get '[SafeJSON] (Headers '[Header "x-trace-uuid" String] KnowledgeModelBundle)
2021

21-
detail_bundle_GET :: Maybe String -> String -> BaseContextM (Headers '[Header "x-trace-uuid" String] KnowledgeModelBundle)
22+
detail_bundle_GET :: Maybe String -> Coordinate -> BaseContextM (Headers '[Header "x-trace-uuid" String] KnowledgeModelBundle)
2223
detail_bundle_GET mTokenHeader kmpId =
2324
getAuthServiceExecutor mTokenHeader $ \runInAuthService ->
2425
runInAuthService NoTransaction $ addTraceUuidHeader =<< exportBundle kmpId

‎registry-server/src/Registry/Api/Handler/KnowledgeModelPackage/Detail_GET.hs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ import Registry.Model.Context.ContextLenses ()
1010
import Registry.Service.KnowledgeModel.Package.KnowledgeModelPackageService
1111
import Shared.Common.Api.Handler.Common
1212
import Shared.Common.Model.Context.TransactionState
13+
import Shared.Coordinate.Model.Coordinate.Coordinate
1314

1415
type Detail_GET =
1516
"knowledge-model-packages"
16-
:> Capture "id" String
17+
:> Capture "coordinate" Coordinate
1718
:> Get '[SafeJSON] (Headers '[Header "x-trace-uuid" String] KnowledgeModelPackageDetailDTO)
1819

19-
detail_GET :: String -> BaseContextM (Headers '[Header "x-trace-uuid" String] KnowledgeModelPackageDetailDTO)
20-
detail_GET kmpId = runInUnauthService NoTransaction $ addTraceUuidHeader =<< getPackageById kmpId
20+
detail_GET :: Coordinate -> BaseContextM (Headers '[Header "x-trace-uuid" String] KnowledgeModelPackageDetailDTO)
21+
detail_GET coordinate = runInUnauthService NoTransaction $ addTraceUuidHeader =<< getPackageByCoordinate coordinate

‎registry-server/src/Registry/Api/Handler/Locale/Detail_Bundle_GET.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import Shared.Coordinate.Model.Coordinate.Coordinate
1616
type Detail_Bundle_GET =
1717
Header "Authorization" String
1818
:> "locales"
19-
:> Capture "id" Coordinate
19+
:> Capture "coordinate" Coordinate
2020
:> "bundle"
2121
:> Get '[OctetStream] (Headers '[Header "x-trace-uuid" String, Header "Content-Disposition" String] FileStreamLazy)
2222

0 commit comments

Comments
 (0)