From b9dd563a0527ffed3a1b8ce5dacdcdd955e1f3df Mon Sep 17 00:00:00 2001 From: Peter Grlica Date: Wed, 4 Nov 2020 09:06:02 +0100 Subject: [PATCH] Added timestamps to shared module db --- federation/types/shared_module.go | 2 +- store/federation_shared_modules.yaml | 4 +++- store/rdbms/federation_shared_modules.gen.go | 20 ++++++++++++++++++++ store/rdbms/rdbms_schema.go | 3 ++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/federation/types/shared_module.go b/federation/types/shared_module.go index cb0b22fe7..e0a26b541 100644 --- a/federation/types/shared_module.go +++ b/federation/types/shared_module.go @@ -23,10 +23,10 @@ type ( SharedModuleFilter struct { NodeID uint64 `json:"nodeID,string"` ExternalFederationModuleID uint64 `json:"externalFederationModuleID,string"` - Query string `json:"query"` Handle string `json:"handle"` Name string `json:"name"` + Query string `json:"query"` Check func(*SharedModule) (bool, error) `json:"-"` diff --git a/store/federation_shared_modules.yaml b/store/federation_shared_modules.yaml index d7055f56e..662380f4c 100644 --- a/store/federation_shared_modules.yaml +++ b/store/federation_shared_modules.yaml @@ -11,7 +11,9 @@ fields: - { field: Name } - { field: ExternalFederationModuleID } - { field: Fields, type: "json.Text" } - + - { field: CreatedAt, sortable: true } + - { field: UpdatedAt, sortable: true } + - { field: DeletedAt, sortable: true } lookups: - fields: [ID] diff --git a/store/rdbms/federation_shared_modules.gen.go b/store/rdbms/federation_shared_modules.gen.go index 0ab4e32e6..9a4594c55 100644 --- a/store/rdbms/federation_shared_modules.gen.go +++ b/store/rdbms/federation_shared_modules.gen.go @@ -380,6 +380,9 @@ func (s Store) internalFederationSharedModuleRowScanner(row rowScanner) (res *ty &res.Name, &res.ExternalFederationModuleID, &res.Fields, + &res.CreatedAt, + &res.UpdatedAt, + &res.DeletedAt, ) } @@ -425,6 +428,9 @@ func (Store) federationSharedModuleColumns(aa ...string) []string { alias + "name", alias + "xref_module", alias + "fields", + alias + "created_at", + alias + "updated_at", + alias + "deleted_at", } } @@ -436,6 +442,9 @@ func (Store) federationSharedModuleColumns(aa ...string) []string { func (Store) sortableFederationSharedModuleColumns() []string { return []string{ "id", + "created_at", + "updated_at", + "deleted_at", } } @@ -451,6 +460,9 @@ func (s Store) internalFederationSharedModuleEncoder(res *types.SharedModule) st "name": res.Name, "xref_module": res.ExternalFederationModuleID, "fields": res.Fields, + "created_at": res.CreatedAt, + "updated_at": res.UpdatedAt, + "deleted_at": res.DeletedAt, } } @@ -480,6 +492,14 @@ func (s Store) collectFederationSharedModuleCursorValues(res *types.SharedModule cursor.Set(c, res.ID, false) pkId = true + case "created_at": + cursor.Set(c, res.CreatedAt, false) + + case "updated_at": + cursor.Set(c, res.UpdatedAt, false) + + case "deleted_at": + cursor.Set(c, res.DeletedAt, false) } } diff --git a/store/rdbms/rdbms_schema.go b/store/rdbms/rdbms_schema.go index 22637633a..8dc2f0a9f 100644 --- a/store/rdbms/rdbms_schema.go +++ b/store/rdbms/rdbms_schema.go @@ -502,6 +502,7 @@ func (Schema) FederationModuleShared() *Table { ColumnDef("rel_node", ColumnTypeIdentifier), ColumnDef("xref_module", ColumnTypeIdentifier), ColumnDef("fields", ColumnTypeText), + CUDTimestamps, ) } @@ -525,7 +526,7 @@ func (Schema) FederationModuleMapping() *Table { ColumnDef("rel_compose_namespace", ColumnTypeIdentifier), ColumnDef("field_mapping", ColumnTypeText), - AddIndex("unique_federation_module_compose_module", IColumn("rel_federation_module", "rel_compose_module", "rel_compose_namespace")), + AddIndex("unique_module_compose_module", IColumn("rel_federation_module", "rel_compose_module", "rel_compose_namespace")), ) }