Skip to content
/ engine-backend Public

Commit bb7b297

Browse files
vknaislvknaisl
committed
Switch from id to uuid in knowledge model
1 parent eb31ce9 commit bb7b297

File tree

237 files changed

+1830
-1800
lines changed

Some content is hidden

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

237 files changed

+1830
-1800
lines changed

‎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/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/Resource/KnowledgeModel/Package/KnowledgeModelPackageDetailDTO.hs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
module Registry.Api.Resource.KnowledgeModel.Package.KnowledgeModelPackageDetailDTO where
22

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

67
import RegistryLib.Model.Organization.OrganizationSimple
8+
import Shared.Coordinate.Model.Coordinate.Coordinate
79
import Shared.KnowledgeModel.Model.KnowledgeModel.Package.KnowledgeModelPackage
810

911
data KnowledgeModelPackageDetailDTO = KnowledgeModelPackageDetailDTO
10-
{ pId :: String
12+
{ uuid :: U.UUID
1113
, name :: String
1214
, organizationId :: String
1315
, kmId :: String
@@ -17,9 +19,9 @@ data KnowledgeModelPackageDetailDTO = KnowledgeModelPackageDetailDTO
1719
, readme :: String
1820
, license :: String
1921
, metamodelVersion :: Int
20-
, previousPackageId :: Maybe String
21-
, forkOfPackageId :: Maybe String
22-
, mergeCheckpointPackageId :: Maybe String
22+
, previousPackageUuid :: Maybe U.UUID
23+
, forkOfPackageId :: Maybe Coordinate
24+
, mergeCheckpointPackageId :: Maybe Coordinate
2325
, versions :: [String]
2426
, organization :: OrganizationSimple
2527
, createdAt :: UTCTime

‎registry-server/src/Registry/Api/Resource/KnowledgeModel/Package/KnowledgeModelPackageDetailJM.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Data.Aeson
55
import Registry.Api.Resource.KnowledgeModel.Package.KnowledgeModelPackageDetailDTO
66
import RegistryLib.Api.Resource.Organization.OrganizationSimpleJM ()
77
import Shared.Common.Util.Aeson
8+
import Shared.Coordinate.Api.Resource.Coordinate.CoordinateJM ()
89
import Shared.KnowledgeModel.Api.Resource.KnowledgeModel.Package.KnowledgeModelPackagePhaseJM ()
910

1011
instance FromJSON KnowledgeModelPackageDetailDTO where

‎registry-server/src/Registry/Api/Resource/KnowledgeModel/Package/KnowledgeModelPackageDetailSM.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import Registry.Service.KnowledgeModel.Package.KnowledgeModelPackageMapper
88
import RegistryLib.Api.Resource.Organization.OrganizationSimpleSM ()
99
import RegistryLib.Database.Migration.Development.Organization.Data.Organizations
1010
import Shared.Common.Util.Swagger
11+
import Shared.Coordinate.Api.Resource.Coordinate.CoordinateSM ()
1112
import Shared.KnowledgeModel.Api.Resource.KnowledgeModel.Package.KnowledgeModelPackagePhaseSM ()
1213
import Shared.KnowledgeModel.Database.Migration.Development.KnowledgeModel.Data.Package.KnowledgeModelPackages
1314

‎registry-server/src/Registry/Api/Resource/KnowledgeModel/Package/KnowledgeModelPackageRawJM.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import Data.Aeson
44

55
import Registry.Model.KnowledgeModel.Package.KnowledgeModelPackageRaw
66
import Shared.Common.Util.Aeson
7+
import Shared.Coordinate.Api.Resource.Coordinate.CoordinateJM ()
78
import Shared.KnowledgeModel.Api.Resource.KnowledgeModel.Package.KnowledgeModelPackagePhaseJM ()
89

910
instance ToJSON KnowledgeModelPackageRaw where

‎registry-server/src/Registry/Database/Mapping/KnowledgeModel/Package/KnowledgeModelPackageRaw.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Database.PostgreSQL.Simple.FromField
55
import Database.PostgreSQL.Simple.FromRow
66

77
import Registry.Model.KnowledgeModel.Package.KnowledgeModelPackageRaw
8+
import Shared.Coordinate.Database.Mapping.Coordinate.Coordinate ()
89
import Shared.KnowledgeModel.Database.Mapping.KnowledgeModel.Package.KnowledgeModelPackagePhase ()
910

1011
instance FromRow KnowledgeModelPackageRaw where

‎registry-server/src/Registry/Database/Migration/Development/Audit/Data/AuditEntries.hs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import Registry.Database.Migration.Development.Statistics.Data.InstanceStatistic
77
import Registry.Model.Audit.AuditEntry
88
import RegistryLib.Database.Migration.Development.Organization.Data.Organizations
99
import RegistryLib.Model.Organization.Organization
10+
import Shared.Coordinate.Model.Coordinate.Coordinate
1011
import Shared.KnowledgeModel.Database.Migration.Development.KnowledgeModel.Data.Package.KnowledgeModelPackages
11-
import Shared.KnowledgeModel.Model.KnowledgeModel.Package.KnowledgeModelPackage
12+
import Shared.KnowledgeModel.Model.KnowledgeModel.Package.KnowledgeModelPackage ()
1213

1314
listPackagesAuditEntry :: AuditEntry
1415
listPackagesAuditEntry =
@@ -22,6 +23,6 @@ getKnowledgeModelBundleAuditEntry :: AuditEntry
2223
getKnowledgeModelBundleAuditEntry =
2324
GetKnowledgeModelBundleAuditEntry
2425
{ organizationId = orgGlobal.organizationId
25-
, knowledgeModelPackageId = netherlandsKmPackageV2.pId
26+
, knowledgeModelPackageId = show . createCoordinate $ netherlandsKmPackageV2
2627
, createdAt = UTCTime (fromJust $ fromGregorianValid 2018 1 20) 0
2728
}

‎registry-server/src/Registry/Database/Migration/Development/KnowledgeModel/KnowledgeModelPackageSchemaMigration.hs‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ createKnowledgeModelPackageTable = do
2828
let sql =
2929
"CREATE TABLE knowledge_model_package \
3030
\( \
31-
\ id varchar NOT NULL, \
31+
\ uuid uuid NOT NULL, \
3232
\ name varchar NOT NULL, \
3333
\ organization_id varchar NOT NULL, \
3434
\ km_id varchar NOT NULL, \
@@ -37,19 +37,20 @@ createKnowledgeModelPackageTable = do
3737
\ description varchar NOT NULL, \
3838
\ readme varchar NOT NULL, \
3939
\ license varchar NOT NULL, \
40-
\ previous_package_id varchar, \
40+
\ previous_package_uuid uuid, \
4141
\ fork_of_package_id varchar, \
4242
\ merge_checkpoint_package_id varchar, \
4343
\ created_at timestamptz NOT NULL, \
4444
\ tenant_uuid uuid NOT NULL, \
4545
\ phase varchar NOT NULL, \
4646
\ non_editable bool NOT NULL, \
47-
\ CONSTRAINT knowledge_model_package_pk PRIMARY KEY (id) \
47+
\ public bool NOT NULL, \
48+
\ CONSTRAINT knowledge_model_package_pk PRIMARY KEY (uuid) \
4849
\); \
4950
\ \
5051
\CREATE INDEX knowledge_model_package_organization_id_km_id_index ON knowledge_model_package (organization_id, km_id); \
5152
\ \
52-
\CREATE INDEX knowledge_model_package_previous_package_id_index ON knowledge_model_package (previous_package_id);"
53+
\CREATE INDEX knowledge_model_package_previous_package_id_index ON knowledge_model_package (previous_package_uuid);"
5354
let action conn = execute_ conn sql
5455
runDB action
5556

@@ -59,15 +60,15 @@ createKnowledgeModelPackageEventTable = do
5960
let sql =
6061
"CREATE TABLE IF NOT EXISTS knowledge_model_package_event \
6162
\( \
62-
\ uuid uuid NOT NULL, \
63-
\ parent_uuid uuid NOT NULL, \
64-
\ entity_uuid uuid NOT NULL, \
65-
\ content jsonb NOT NULL, \
66-
\ package_id varchar NOT NULL, \
67-
\ tenant_uuid uuid NOT NULL, \
68-
\ created_at timestamptz NOT NULL, \
69-
\ CONSTRAINT knowledge_model_package_event_pk PRIMARY KEY (uuid, package_id), \
70-
\ CONSTRAINT knowledge_model_package_event_package_id_fk FOREIGN KEY (package_id) REFERENCES knowledge_model_package (id) ON DELETE CASCADE \
63+
\ uuid uuid NOT NULL, \
64+
\ parent_uuid uuid NOT NULL, \
65+
\ entity_uuid uuid NOT NULL, \
66+
\ content jsonb NOT NULL, \
67+
\ package_uuid uuid NOT NULL, \
68+
\ tenant_uuid uuid NOT NULL, \
69+
\ created_at timestamptz NOT NULL, \
70+
\ CONSTRAINT knowledge_model_package_event_pk PRIMARY KEY (uuid, package_uuid), \
71+
\ CONSTRAINT knowledge_model_package_event_package_uuid_fk FOREIGN KEY (package_uuid) REFERENCES knowledge_model_package (uuid) ON DELETE CASCADE \
7172
\);"
7273
let action conn = execute_ conn sql
7374
runDB action

0 commit comments

Comments
 (0)