diff --git a/aspnetcore/src/api/Models/Ttv/DimAddress.cs b/aspnetcore/src/api/Models/Ttv/DimAddress.cs index 4a61ca5a..ffa43fd4 100644 --- a/aspnetcore/src/api/Models/Ttv/DimAddress.cs +++ b/aspnetcore/src/api/Models/Ttv/DimAddress.cs @@ -17,26 +17,14 @@ public partial class DimAddress public string PostalCode { get; set; } - /// - /// https://iri.suomi.fi/model/researchfi_core/locality - /// public string LocalityFi { get; set; } - /// - /// https://iri.suomi.fi/model/researchfi_core/locality - /// public string LocalitySv { get; set; } - /// - /// https://iri.suomi.fi/model/researchfi_core/locality - /// public string LocalityEn { get; set; } - public int CountryCode { get; set; } + public int? CountryCode { get; set; } - /// - /// visiting_address - /// public string AddressType { get; set; } public string SourceId { get; set; } diff --git a/aspnetcore/src/api/Models/Ttv/DimCallDecision.cs b/aspnetcore/src/api/Models/Ttv/DimCallDecision.cs index 55481e37..861a27ef 100644 --- a/aspnetcore/src/api/Models/Ttv/DimCallDecision.cs +++ b/aspnetcore/src/api/Models/Ttv/DimCallDecision.cs @@ -3,9 +3,6 @@ namespace api.Models.Ttv; -/// -/// Rahoituspäätöspaneeli -/// public partial class DimCallDecision { public int Id { get; set; } @@ -16,9 +13,6 @@ public partial class DimCallDecision public int DimCallProgrammeId { get; set; } - /// - /// Rahoituspäätöspaneeli - Haun vaihe - /// public string CallProcessingPhase { get; set; } public string SourceId { get; set; } diff --git a/aspnetcore/src/api/Models/Ttv/DimContactInformation.cs b/aspnetcore/src/api/Models/Ttv/DimContactInformation.cs index f5700b36..0800c89d 100644 --- a/aspnetcore/src/api/Models/Ttv/DimContactInformation.cs +++ b/aspnetcore/src/api/Models/Ttv/DimContactInformation.cs @@ -3,27 +3,14 @@ namespace api.Models.Ttv; -/// -/// https://iri.suomi.fi/model/researchfi_core/contact_information -/// https://iri.suomi.fi/model/researchfi_core/contact_point -/// public partial class DimContactInformation { public int Id { get; set; } - /// - /// https://iri.suomi.fi/model/researchfi_core_agent/contact_name - /// public string ContactLabel { get; set; } - /// - /// https://iri.suomi.fi/model/researchfi_core/infraIsContactedVia - /// public int DimInfrastructureId { get; set; } - /// - /// https://iri.suomi.fi/model/researchfi_core/serviceIsContactedVia - /// public int DimServiceId { get; set; } public string SourceId { get; set; } diff --git a/aspnetcore/src/api/Models/Ttv/DimDescriptiveItem.cs b/aspnetcore/src/api/Models/Ttv/DimDescriptiveItem.cs index 0a83cfd3..4fc018ab 100644 --- a/aspnetcore/src/api/Models/Ttv/DimDescriptiveItem.cs +++ b/aspnetcore/src/api/Models/Ttv/DimDescriptiveItem.cs @@ -3,61 +3,18 @@ namespace api.Models.Ttv; -/// -/// https://iri.suomi.fi/model/researchfi_core_project/ -/// Projektin kuvailutiedot ajassa -/// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time -/// public partial class DimDescriptiveItem { public int Id { get; set; } - /// - /// https://iri.suomi.fi/model/researchfi_core_project/ - /// Projektin kuvailutiedot ajassa - /// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time - /// - liittyy projektiin - /// - public int DimResearchProjectId { get; set; } - - /// - /// https://iri.suomi.fi/model/researchfi_core_project/ - /// Projektin kuvailutiedot ajassa - /// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time - /// * alkamispäivämäärä - /// public int DimStartDate { get; set; } - /// - /// https://iri.suomi.fi/model/researchfi_core_project/ - /// Projektin kuvailutiedot ajassa - /// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time - /// * päättymispäivämäärä - /// public int? DimEndDate { get; set; } - /// - /// https://iri.suomi.fi/model/researchfi_core_project/ - /// Projektin kuvailutiedot ajassa - /// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time - /// * kuvailutiedon sisältö - /// public string DescriptiveItem { get; set; } - /// - /// https://iri.suomi.fi/model/researchfi_core_project/ - /// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_type - /// - description - /// - name - /// - goal - /// - outcome_effect - /// - abberviation - /// public string DescriptiveItemType { get; set; } - /// - /// fi, en, sv, NULL - /// public string DescriptiveItemLanguage { get; set; } public string SourceId { get; set; } @@ -68,6 +25,8 @@ public partial class DimDescriptiveItem public DateTime? Modified { get; set; } + public int DimResearchProjectId { get; set; } + public int DimRegisteredDataSourceId { get; set; } public int DimPublicationId { get; set; } diff --git a/aspnetcore/src/api/Models/Ttv/DimEsfri.cs b/aspnetcore/src/api/Models/Ttv/DimEsfri.cs index 621432a6..153e89e9 100644 --- a/aspnetcore/src/api/Models/Ttv/DimEsfri.cs +++ b/aspnetcore/src/api/Models/Ttv/DimEsfri.cs @@ -21,5 +21,5 @@ public partial class DimEsfri public DateTime? Created { get; set; } - public virtual ICollection DimInfrastructures { get; set; } = new List(); + public virtual ICollection DimInfrastructures { get; set; } = new List(); } diff --git a/aspnetcore/src/api/Models/Ttv/DimFundingDecision.cs b/aspnetcore/src/api/Models/Ttv/DimFundingDecision.cs index c1ef0d9e..b7b31730 100644 --- a/aspnetcore/src/api/Models/Ttv/DimFundingDecision.cs +++ b/aspnetcore/src/api/Models/Ttv/DimFundingDecision.cs @@ -27,9 +27,6 @@ public partial class DimFundingDecision public int DimFundingDecisionIdParentDecision { get; set; } - /// - /// Päätöksen paikallinen tunniste (tiedon toimittajan) - /// public string FunderProjectNumber { get; set; } public string Acronym { get; set; } @@ -68,9 +65,6 @@ public partial class DimFundingDecision public int DimRegisteredDataSourceId { get; set; } - /// - /// Rahoituspäätös - Päätöspaneeli - /// public int? DimCallDecisionsId { get; set; } public virtual ICollection BrFundingConsortiumParticipations { get; set; } = new List(); diff --git a/aspnetcore/src/api/Models/Ttv/DimInfrastructure.cs b/aspnetcore/src/api/Models/Ttv/DimInfrastructure.cs index 9663bf0c..9cf50277 100644 --- a/aspnetcore/src/api/Models/Ttv/DimInfrastructure.cs +++ b/aspnetcore/src/api/Models/Ttv/DimInfrastructure.cs @@ -7,27 +7,27 @@ public partial class DimInfrastructure { public int Id { get; set; } + public string LocalIdentifier { get; set; } + public string Acronym { get; set; } public bool? FinlandRoadmap { get; set; } - public string SourceId { get; set; } - - public string SourceDescription { get; set; } + public int ResponsibleOrganizationId { get; set; } - public DateTime? Created { get; set; } + public int DimStartDate { get; set; } - public DateTime? Modified { get; set; } + public int DimEndDate { get; set; } public int DimRegisteredDataSourceId { get; set; } - public int ResponsibleOrganizationId { get; set; } + public string SourceId { get; set; } - public int DimStartDate { get; set; } + public string SourceDescription { get; set; } - public int DimEndDate { get; set; } + public DateTime? Created { get; set; } - public string LocalIdentifier { get; set; } + public DateTime? Modified { get; set; } public virtual ICollection DimContactInformations { get; set; } = new List(); @@ -37,6 +37,8 @@ public partial class DimInfrastructure public virtual ICollection DimPids { get; set; } = new List(); + public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } + public virtual ICollection DimServices { get; set; } = new List(); public virtual DimDate DimStartDateNavigation { get; set; } @@ -45,21 +47,11 @@ public partial class DimInfrastructure public virtual ICollection FactContributions { get; set; } = new List(); - public virtual ICollection FactDimReferencedataFieldOfSciences { get; set; } = new List(); - - public virtual ICollection FactInfraKeywords { get; set; } = new List(); - public virtual ICollection FactReferencedata { get; set; } = new List(); public virtual ICollection FactRelationFromInfrastructures { get; set; } = new List(); public virtual ICollection FactRelationToInfrastructures { get; set; } = new List(); - public virtual ICollection FactUpkeeps { get; set; } = new List(); - public virtual DimOrganization ResponsibleOrganization { get; set; } - - public virtual ICollection DimEsfris { get; set; } = new List(); - - public virtual ICollection DimMerils { get; set; } = new List(); } diff --git a/aspnetcore/src/api/Models/Ttv/DimInfrastructureOld.cs b/aspnetcore/src/api/Models/Ttv/DimInfrastructureOld.cs index 9072b979..806e5fcb 100644 --- a/aspnetcore/src/api/Models/Ttv/DimInfrastructureOld.cs +++ b/aspnetcore/src/api/Models/Ttv/DimInfrastructureOld.cs @@ -44,4 +44,14 @@ public partial class DimInfrastructureOld public string ScientificDescriptionSv { get; set; } public string ScientificDescriptionEn { get; set; } + + public virtual ICollection FactDimReferencedataFieldOfSciences { get; set; } = new List(); + + public virtual ICollection FactInfraKeywords { get; set; } = new List(); + + public virtual ICollection FactUpkeeps { get; set; } = new List(); + + public virtual ICollection DimEsfris { get; set; } = new List(); + + public virtual ICollection DimMerils { get; set; } = new List(); } diff --git a/aspnetcore/src/api/Models/Ttv/DimMeril.cs b/aspnetcore/src/api/Models/Ttv/DimMeril.cs index 198beb6c..be4ea0bf 100644 --- a/aspnetcore/src/api/Models/Ttv/DimMeril.cs +++ b/aspnetcore/src/api/Models/Ttv/DimMeril.cs @@ -21,5 +21,5 @@ public partial class DimMeril public DateTime? Modified { get; set; } - public virtual ICollection DimInfrastructures { get; set; } = new List(); + public virtual ICollection DimInfrastructures { get; set; } = new List(); } diff --git a/aspnetcore/src/api/Models/Ttv/DimProfileOnlyPublication.cs b/aspnetcore/src/api/Models/Ttv/DimProfileOnlyPublication.cs index a592de00..1f7a7f0c 100644 --- a/aspnetcore/src/api/Models/Ttv/DimProfileOnlyPublication.cs +++ b/aspnetcore/src/api/Models/Ttv/DimProfileOnlyPublication.cs @@ -11,24 +11,12 @@ public partial class DimProfileOnlyPublication public int ParentTypeClassificationCode { get; set; } - /// - /// code_schema = 'julkaisutyyppiluokitus' - /// public int TypeClassificationCode { get; set; } - /// - /// code_scheme = 'julkaisumuoto' - /// public int PublicationFormatCode { get; set; } - /// - /// code_scheme = 'Artikkelintyyppikoodi' - /// public int ArticleTypeCode { get; set; } - /// - /// code_scheme = 'julkaisunyleiso' - /// public int TargetAudienceCode { get; set; } public string OrcidWorkType { get; set; } diff --git a/aspnetcore/src/api/Models/Ttv/DimPublication.cs b/aspnetcore/src/api/Models/Ttv/DimPublication.cs index d3d6cd2a..263d28f1 100644 --- a/aspnetcore/src/api/Models/Ttv/DimPublication.cs +++ b/aspnetcore/src/api/Models/Ttv/DimPublication.cs @@ -75,8 +75,6 @@ public partial class DimPublication public bool? PeerReviewed { get; set; } - public bool? Report { get; set; } - public int ThesisTypeCode { get; set; } public bool? SelfArchivedCode { get; set; } @@ -105,8 +103,18 @@ public partial class DimPublication public int OpenAccessCode { get; set; } + public int ReportSwitch { get; set; } + + public int ArtTypeCode { get; set; } + + public int AvApplicationTypeCode { get; set; } + + public virtual DimReferencedatum ArtTypeCodeNavigation { get; set; } + public virtual DimReferencedatum ArticleTypeCodeNavigation { get; set; } + public virtual DimReferencedatum AvApplicationTypeCodeNavigation { get; set; } + public virtual ICollection DimDescriptiveItems { get; set; } = new List(); public virtual ICollection DimLocallyReportedPubInfos { get; set; } = new List(); @@ -159,6 +167,8 @@ public partial class DimPublication public virtual DimReferencedatum PublisherOpenAccessCodeNavigation { get; set; } + public virtual DimReferencedatum ReportSwitchNavigation { get; set; } + public virtual DimReferencedatum TargetAudienceCodeNavigation { get; set; } public virtual DimReferencedatum ThesisTypeCodeNavigation { get; set; } diff --git a/aspnetcore/src/api/Models/Ttv/DimReferencedatum.cs b/aspnetcore/src/api/Models/Ttv/DimReferencedatum.cs index 67b032e8..8be59e5e 100644 --- a/aspnetcore/src/api/Models/Ttv/DimReferencedatum.cs +++ b/aspnetcore/src/api/Models/Ttv/DimReferencedatum.cs @@ -69,8 +69,12 @@ public partial class DimReferencedatum public virtual ICollection DimProfileOnlyPublicationTypeClassificationCodeNavigations { get; set; } = new List(); + public virtual ICollection DimPublicationArtTypeCodeNavigations { get; set; } = new List(); + public virtual ICollection DimPublicationArticleTypeCodeNavigations { get; set; } = new List(); + public virtual ICollection DimPublicationAvApplicationTypeCodeNavigations { get; set; } = new List(); + public virtual ICollection DimPublicationJufoClassCodeFrozenNavigations { get; set; } = new List(); public virtual ICollection DimPublicationJufoClassNavigations { get; set; } = new List(); @@ -93,6 +97,8 @@ public partial class DimReferencedatum public virtual ICollection DimPublicationPublisherOpenAccessCodeNavigations { get; set; } = new List(); + public virtual ICollection DimPublicationReportSwitchNavigations { get; set; } = new List(); + public virtual ICollection DimPublicationTargetAudienceCodeNavigations { get; set; } = new List(); public virtual ICollection DimPublicationThesisTypeCodeNavigations { get; set; } = new List(); diff --git a/aspnetcore/src/api/Models/Ttv/DimRegisteredDataSource.cs b/aspnetcore/src/api/Models/Ttv/DimRegisteredDataSource.cs index 698f5f4c..fd0f5356 100644 --- a/aspnetcore/src/api/Models/Ttv/DimRegisteredDataSource.cs +++ b/aspnetcore/src/api/Models/Ttv/DimRegisteredDataSource.cs @@ -35,6 +35,8 @@ public partial class DimRegisteredDataSource public virtual ICollection DimFundingDecisions { get; set; } = new List(); + public virtual ICollection DimInfrastructures { get; set; } = new List(); + public virtual ICollection DimKeywords { get; set; } = new List(); public virtual ICollection DimKnownPeople { get; set; } = new List(); diff --git a/aspnetcore/src/api/Models/Ttv/DimResearchDataset.cs b/aspnetcore/src/api/Models/Ttv/DimResearchDataset.cs index a183de70..eba20446 100644 --- a/aspnetcore/src/api/Models/Ttv/DimResearchDataset.cs +++ b/aspnetcore/src/api/Models/Ttv/DimResearchDataset.cs @@ -29,10 +29,6 @@ public partial class DimResearchDataset public int VersionInfo { get; set; } - public virtual ICollection BrDatasetDatasetRelationshipDimResearchDatasetId2Navigations { get; set; } = new List(); - - public virtual ICollection BrDatasetDatasetRelationshipDimResearchDatasets { get; set; } = new List(); - public virtual ICollection DimDescriptiveItems { get; set; } = new List(); public virtual ICollection DimPids { get; set; } = new List(); @@ -47,8 +43,6 @@ public partial class DimResearchDataset public virtual ICollection FactContributions { get; set; } = new List(); - public virtual ICollection FactDimReferencedataFieldOfSciences { get; set; } = new List(); - public virtual ICollection FactFieldValues { get; set; } = new List(); public virtual ICollection FactKeywords { get; set; } = new List(); diff --git a/aspnetcore/src/api/Models/Ttv/DimResearchProject.cs b/aspnetcore/src/api/Models/Ttv/DimResearchProject.cs index 1c69c3a0..90568116 100644 --- a/aspnetcore/src/api/Models/Ttv/DimResearchProject.cs +++ b/aspnetcore/src/api/Models/Ttv/DimResearchProject.cs @@ -7,19 +7,10 @@ public partial class DimResearchProject { public int Id { get; set; } - /// - /// Hanke - vastuuorganisaatio - /// public int ResponsibleOrganization { get; set; } - /// - /// Hanke - alkamispäivämäärä - /// public int? StartDate { get; set; } - /// - /// Hanke - päättymispäivämäärä - /// public int? EndDate { get; set; } public string SourceId { get; set; } @@ -40,6 +31,8 @@ public partial class DimResearchProject public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } + public virtual ICollection DimWebLinks { get; set; } = new List(); + public virtual DimDate EndDateNavigation { get; set; } public virtual ICollection FactKeywords { get; set; } = new List(); diff --git a/aspnetcore/src/api/Models/Ttv/DimService.cs b/aspnetcore/src/api/Models/Ttv/DimService.cs index 78d26567..d5c3afb3 100644 --- a/aspnetcore/src/api/Models/Ttv/DimService.cs +++ b/aspnetcore/src/api/Models/Ttv/DimService.cs @@ -7,6 +7,8 @@ public partial class DimService { public int Id { get; set; } + public string LocalIdentifier { get; set; } + public string SourceId { get; set; } public string SourceDescription { get; set; } @@ -33,11 +35,7 @@ public partial class DimService public virtual DimDate EndDateNavigation { get; set; } - public virtual ICollection FactInfraKeywords { get; set; } = new List(); - public virtual ICollection FactReferencedata { get; set; } = new List(); - public virtual ICollection FactUpkeeps { get; set; } = new List(); - public virtual DimDate StartDateNavigation { get; set; } } diff --git a/aspnetcore/src/api/Models/Ttv/DimServiceOld.cs b/aspnetcore/src/api/Models/Ttv/DimServiceOld.cs index 3a6dcc39..6bb71aec 100644 --- a/aspnetcore/src/api/Models/Ttv/DimServiceOld.cs +++ b/aspnetcore/src/api/Models/Ttv/DimServiceOld.cs @@ -36,4 +36,8 @@ public partial class DimServiceOld public DateTime? Created { get; set; } public DateTime? Modified { get; set; } + + public virtual ICollection FactInfraKeywords { get; set; } = new List(); + + public virtual ICollection FactUpkeeps { get; set; } = new List(); } diff --git a/aspnetcore/src/api/Models/Ttv/DimWebLink.cs b/aspnetcore/src/api/Models/Ttv/DimWebLink.cs index 445a8b36..07fdabb2 100644 --- a/aspnetcore/src/api/Models/Ttv/DimWebLink.cs +++ b/aspnetcore/src/api/Models/Ttv/DimWebLink.cs @@ -79,6 +79,8 @@ public partial class DimWebLink public virtual DimResearchDataset DimResearchDataset { get; set; } + public virtual DimResearchProject DimResearchProject { get; set; } + public virtual DimService DimService { get; set; } public virtual ICollection FactFieldValues { get; set; } = new List(); diff --git a/aspnetcore/src/api/Models/Ttv/DimWordCluster.cs b/aspnetcore/src/api/Models/Ttv/DimWordCluster.cs index c2e235cf..c8ec12db 100644 --- a/aspnetcore/src/api/Models/Ttv/DimWordCluster.cs +++ b/aspnetcore/src/api/Models/Ttv/DimWordCluster.cs @@ -15,6 +15,8 @@ public partial class DimWordCluster public string SourceId { get; set; } + public string Content { get; set; } + public virtual ICollection BrWordClusterDimFundingDecisions { get; set; } = new List(); public virtual ICollection BrWordsDefineAClusters { get; set; } = new List(); diff --git a/aspnetcore/src/api/Models/Ttv/FactDimReferencedataFieldOfScience.cs b/aspnetcore/src/api/Models/Ttv/FactDimReferencedataFieldOfScience.cs index fa2bbdec..a9a8bd82 100644 --- a/aspnetcore/src/api/Models/Ttv/FactDimReferencedataFieldOfScience.cs +++ b/aspnetcore/src/api/Models/Ttv/FactDimReferencedataFieldOfScience.cs @@ -19,15 +19,15 @@ public partial class FactDimReferencedataFieldOfScience public int DimInfrastructureId { get; set; } + public DateTime? Created { get; set; } + public virtual DimFundingDecision DimFundingDecision { get; set; } - public virtual DimInfrastructure DimInfrastructure { get; set; } + public virtual DimInfrastructureOld DimInfrastructure { get; set; } public virtual DimKnownPerson DimKnownPerson { get; set; } public virtual DimPublication DimPublication { get; set; } public virtual DimReferencedatum DimReferencedata { get; set; } - - public virtual DimResearchDataset DimResearchDataset { get; set; } } diff --git a/aspnetcore/src/api/Models/Ttv/FactInfraKeyword.cs b/aspnetcore/src/api/Models/Ttv/FactInfraKeyword.cs index dc5e8b76..c355f88a 100644 --- a/aspnetcore/src/api/Models/Ttv/FactInfraKeyword.cs +++ b/aspnetcore/src/api/Models/Ttv/FactInfraKeyword.cs @@ -21,11 +21,11 @@ public partial class FactInfraKeyword public DateTime? Modified { get; set; } - public virtual DimInfrastructure DimInfrastructure { get; set; } + public virtual DimInfrastructureOld DimInfrastructure { get; set; } public virtual DimKeyword DimKeyword { get; set; } - public virtual DimService DimService { get; set; } + public virtual DimServiceOld DimService { get; set; } public virtual DimServicePoint DimServicePoint { get; set; } } diff --git a/aspnetcore/src/api/Models/Ttv/FactKeyword.cs b/aspnetcore/src/api/Models/Ttv/FactKeyword.cs index 5ce02b29..6b9da9fa 100644 --- a/aspnetcore/src/api/Models/Ttv/FactKeyword.cs +++ b/aspnetcore/src/api/Models/Ttv/FactKeyword.cs @@ -9,6 +9,8 @@ public partial class FactKeyword public int DimResearchProjectId { get; set; } + public int DimResearchDatasetId { get; set; } + public string SourceId { get; set; } public string SourceDescription { get; set; } @@ -17,8 +19,6 @@ public partial class FactKeyword public DateTime? Modified { get; set; } - public int DimResearchDatasetId { get; set; } - public virtual DimKeyword DimKeyword { get; set; } public virtual DimResearchDataset DimResearchDataset { get; set; } diff --git a/aspnetcore/src/api/Models/Ttv/FactReferencedatum.cs b/aspnetcore/src/api/Models/Ttv/FactReferencedatum.cs index f1655bf6..d2b2b268 100644 --- a/aspnetcore/src/api/Models/Ttv/FactReferencedatum.cs +++ b/aspnetcore/src/api/Models/Ttv/FactReferencedatum.cs @@ -19,6 +19,8 @@ public partial class FactReferencedatum public int DimCallProgrammeId { get; set; } + public int DimServiceId { get; set; } + public string SourceId { get; set; } public string SourceDescription { get; set; } @@ -27,8 +29,6 @@ public partial class FactReferencedatum public DateTime? Modified { get; set; } - public int DimServiceId { get; set; } - public virtual DimCallProgramme DimCallProgramme { get; set; } public virtual DimFundingDecision DimFundingDecision { get; set; } diff --git a/aspnetcore/src/api/Models/Ttv/FactUpkeep.cs b/aspnetcore/src/api/Models/Ttv/FactUpkeep.cs index 56480b3c..37a1e55e 100644 --- a/aspnetcore/src/api/Models/Ttv/FactUpkeep.cs +++ b/aspnetcore/src/api/Models/Ttv/FactUpkeep.cs @@ -33,11 +33,11 @@ public partial class FactUpkeep public virtual DimGeo DimGeo { get; set; } - public virtual DimInfrastructure DimInfrastructure { get; set; } + public virtual DimInfrastructureOld DimInfrastructure { get; set; } public virtual DimOrganization DimOrganization { get; set; } - public virtual DimService DimService { get; set; } + public virtual DimServiceOld DimService { get; set; } public virtual DimServicePoint DimServicePoint { get; set; } } diff --git a/aspnetcore/src/api/Models/Ttv/PidM.cs b/aspnetcore/src/api/Models/Ttv/PidM.cs new file mode 100644 index 00000000..1701a131 --- /dev/null +++ b/aspnetcore/src/api/Models/Ttv/PidM.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +namespace api.Models.Ttv; + +public partial class PidM +{ + public int Id { get; set; } + + public int? DimInfrastructureId { get; set; } + + public int? DimServiceId { get; set; } + + public string ActionType { get; set; } + + public DateTime RowCreated { get; set; } + + public DateTime? Completed { get; set; } +} diff --git a/aspnetcore/src/api/Models/Ttv/TtvContext.cs b/aspnetcore/src/api/Models/Ttv/TtvContext.cs index 69a632c6..a564aef7 100644 --- a/aspnetcore/src/api/Models/Ttv/TtvContext.cs +++ b/aspnetcore/src/api/Models/Ttv/TtvContext.cs @@ -15,8 +15,6 @@ public TtvContext(DbContextOptions options) { } - public virtual DbSet BrDatasetDatasetRelationships { get; set; } - public virtual DbSet BrFundingConsortiumParticipations { get; set; } public virtual DbSet BrGrantedPermissions { get; set; } @@ -163,35 +161,14 @@ public TtvContext(DbContextOptions options) public virtual DbSet FactWordClusterToDomains { get; set; } - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.DimResearchDatasetId, e.DimResearchDatasetId2 }).HasName("PK__br_datas__9FEA685A8FBA3134"); - - entity.ToTable("br_dataset_dataset_relationship"); - - entity.Property(e => e.DimResearchDatasetId).HasColumnName("dim_research_dataset_id"); - entity.Property(e => e.DimResearchDatasetId2).HasColumnName("dim_research_dataset_id2"); - entity.Property(e => e.Type) - .HasMaxLength(255) - .IsUnicode(false) - .HasColumnName("type"); - - entity.HasOne(d => d.DimResearchDataset).WithMany(p => p.BrDatasetDatasetRelationshipDimResearchDatasets) - .HasForeignKey(d => d.DimResearchDatasetId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FKbr_dataset173300"); + public virtual DbSet PidMs { get; set; } - entity.HasOne(d => d.DimResearchDatasetId2Navigation).WithMany(p => p.BrDatasetDatasetRelationshipDimResearchDatasetId2Navigations) - .HasForeignKey(d => d.DimResearchDatasetId2) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FKbr_dataset168991"); - }); + protected override void OnModelCreating(ModelBuilder modelBuilder) + { modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimFundingDecisionId, e.DimOrganizationid }).HasName("PK__br_fundi__3DB567F8FE0E58F7"); + entity.HasKey(e => new { e.DimFundingDecisionId, e.DimOrganizationid }).HasName("PK__br_fundi__3DB567F8BF06F64D"); entity.ToTable("br_funding_consortium_participation"); @@ -218,7 +195,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimUserProfileId, e.DimExternalServiceId, e.DimPermittedFieldGroup }).HasName("PK__br_grant__F51F7BCB3855DC5E"); + entity.HasKey(e => new { e.DimUserProfileId, e.DimExternalServiceId, e.DimPermittedFieldGroup }).HasName("PK__br_grant__F51F7BCBA005930F"); entity.ToTable("br_granted_permissions"); @@ -300,7 +277,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimWordClusterId, e.DimFundingDecisionId }).HasName("PK__br_word___7D640B5A09E1EA77"); + entity.HasKey(e => new { e.DimWordClusterId, e.DimFundingDecisionId }).HasName("PK__br_word___7D640B5AF225B211"); entity.ToTable("br_word_cluster_dim_funding_decision"); @@ -333,7 +310,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimMinedWordsId, e.DimWordClusterId }).HasName("PK__br_words__0602FA37A81434F2"); + entity.HasKey(e => new { e.DimMinedWordsId, e.DimWordClusterId }).HasName("PK__br_words__0602FA37B45C36B9"); entity.ToTable("br_words_define_a_cluster"); @@ -366,7 +343,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_addr__3213E83F65FFF9D4"); + entity.HasKey(e => e.Id).HasName("PK__dim_addr__3213E83F7AD0F871"); entity.ToTable("dim_address"); @@ -374,7 +351,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.AddressType) .IsRequired() .HasMaxLength(255) - .HasComment("visiting_address") .HasColumnName("address_type"); entity.Property(e => e.CountryCode).HasColumnName("country_code"); entity.Property(e => e.Created) @@ -383,15 +359,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.DimContactInformationId).HasColumnName("dim_contact_information_id"); entity.Property(e => e.LocalityEn) .HasMaxLength(255) - .HasComment("https://iri.suomi.fi/model/researchfi_core/locality") .HasColumnName("locality_en"); entity.Property(e => e.LocalityFi) .HasMaxLength(255) - .HasComment("https://iri.suomi.fi/model/researchfi_core/locality") .HasColumnName("locality_fi"); entity.Property(e => e.LocalitySv) .HasMaxLength(255) - .HasComment("https://iri.suomi.fi/model/researchfi_core/locality") .HasColumnName("locality_sv"); entity.Property(e => e.Modified) .HasColumnType("datetime") @@ -417,7 +390,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.HasOne(d => d.CountryCodeNavigation).WithMany(p => p.DimAddresses) .HasForeignKey(d => d.CountryCode) - .OnDelete(DeleteBehavior.ClientSetNull) .HasConstraintName("address_countryCode"); entity.HasOne(d => d.DimContactInformation).WithMany(p => p.DimAddresses) @@ -428,7 +400,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_affi__3213E83F415C598C"); + entity.HasKey(e => e.Id).HasName("PK__dim_affi__3213E83F534A7BFA"); entity.ToTable("dim_affiliation"); @@ -505,15 +477,14 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_call__3213E83F5D1CB8CB"); + entity.HasKey(e => e.Id).HasName("PK__dim_call__3213E83F02C1556C"); - entity.ToTable("dim_call_decisions", tb => tb.HasComment("Rahoituspäätöspaneeli")); + entity.ToTable("dim_call_decisions"); entity.Property(e => e.Id).HasColumnName("id"); entity.Property(e => e.CallProcessingPhase) .IsRequired() .HasMaxLength(255) - .HasComment("Rahoituspäätöspaneeli - Haun vaihe") .HasColumnName("call_processing_phase"); entity.Property(e => e.DecisionMaker).HasColumnName("decision_maker"); entity.Property(e => e.DimCallProgrammeId).HasColumnName("dim_call_programme_id"); @@ -648,7 +619,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("belongs to / a part of "), j => { - j.HasKey("DimCallProgrammeId", "DimCallProgrammeId2").HasName("PK__br_call___6F0CEDFBD0617487"); + j.HasKey("DimCallProgrammeId", "DimCallProgrammeId2").HasName("PK__br_call___6F0CEDFBFCBA540C"); j.ToTable("br_call_programme_dim_call_programme"); j.IndexerProperty("DimCallProgrammeId").HasColumnName("dim_call_programme_id"); j.IndexerProperty("DimCallProgrammeId2").HasColumnName("dim_call_programme_id2"); @@ -667,7 +638,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_call_pr785575"), j => { - j.HasKey("DimCallProgrammeId", "DimCallProgrammeId2").HasName("PK__br_call___6F0CEDFBD0617487"); + j.HasKey("DimCallProgrammeId", "DimCallProgrammeId2").HasName("PK__br_call___6F0CEDFBFCBA540C"); j.ToTable("br_call_programme_dim_call_programme"); j.IndexerProperty("DimCallProgrammeId").HasColumnName("dim_call_programme_id"); j.IndexerProperty("DimCallProgrammeId2").HasColumnName("dim_call_programme_id2"); @@ -686,7 +657,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("has disciplines"), j => { - j.HasKey("DimCallProgrammeId", "DimReferencedataId").HasName("PK__br_dim_r__0A5B885D901CCCAE"); + j.HasKey("DimCallProgrammeId", "DimReferencedataId").HasName("PK__br_dim_r__0A5B885DA1DED9A8"); j.ToTable("br_dim_referencedata_dim_call_programme"); j.IndexerProperty("DimCallProgrammeId").HasColumnName("dim_call_programme_id"); j.IndexerProperty("DimReferencedataId").HasColumnName("dim_referencedata_id"); @@ -695,7 +666,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_comp__3213E83F85723F36"); + entity.HasKey(e => e.Id).HasName("PK__dim_comp__3213E83F07775206"); entity.ToTable("dim_competence"); @@ -749,25 +720,20 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_cont__3213E83FE830AECD"); + entity.HasKey(e => e.Id).HasName("PK__dim_cont__3213E83FE7E29479"); - entity.ToTable("dim_contact_information", tb => tb.HasComment("https://iri.suomi.fi/model/researchfi_core/contact_information\r\nhttps://iri.suomi.fi/model/researchfi_core/contact_point")); + entity.ToTable("dim_contact_information"); entity.Property(e => e.Id).HasColumnName("id"); entity.Property(e => e.ContactLabel) .IsRequired() .HasMaxLength(255) - .HasComment("https://iri.suomi.fi/model/researchfi_core_agent/contact_name") .HasColumnName("contact_label"); entity.Property(e => e.Created) .HasColumnType("datetime") .HasColumnName("created"); - entity.Property(e => e.DimInfrastructureId) - .HasComment("https://iri.suomi.fi/model/researchfi_core/infraIsContactedVia") - .HasColumnName("dim_infrastructure_id"); - entity.Property(e => e.DimServiceId) - .HasComment("https://iri.suomi.fi/model/researchfi_core/serviceIsContactedVia") - .HasColumnName("dim_service_id"); + entity.Property(e => e.DimInfrastructureId).HasColumnName("dim_infrastructure_id"); + entity.Property(e => e.DimServiceId).HasColumnName("dim_service_id"); entity.Property(e => e.Modified) .HasColumnType("datetime") .HasColumnName("modified"); @@ -791,7 +757,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_date__3213E83F710C9110"); + entity.HasKey(e => e.Id).HasName("PK__dim_date__3213E83FC3423A04"); entity.ToTable("dim_date"); @@ -818,9 +784,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) { entity.HasKey(e => e.Id).HasName("PK__dim_proj__3213E83FFE8E7FCE"); - entity.ToTable("dim_descriptive_item", tb => tb.HasComment("https://iri.suomi.fi/model/researchfi_core_project/\r\nProjektin kuvailutiedot ajassa\r\nhttps://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time")); - - entity.HasIndex(e => new { e.DimResearchDatasetId, e.DescriptiveItemType }, "idx_dim_descriptive_item_dim_research_dataset_id_item_type"); + entity.ToTable("dim_descriptive_item"); entity.Property(e => e.Id).HasColumnName("id"); entity.Property(e => e.Created) @@ -828,38 +792,25 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasColumnName("created"); entity.Property(e => e.DescriptiveItem) .IsRequired() - .IsUnicode(false) - .HasComment("https://iri.suomi.fi/model/researchfi_core_project/\r\nProjektin kuvailutiedot ajassa\r\nhttps://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time\r\n* kuvailutiedon sisältö") .HasColumnName("descriptive_item"); entity.Property(e => e.DescriptiveItemLanguage) + .IsRequired() .HasMaxLength(255) .IsUnicode(false) - .HasComment("fi, en, sv, NULL") .HasColumnName("descriptive_item_language"); entity.Property(e => e.DescriptiveItemType) .IsRequired() .HasMaxLength(255) - .HasComment("https://iri.suomi.fi/model/researchfi_core_project/\r\nhttps://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_type\r\n- description\r\n- name\r\n- goal\r\n- outcome_effect\r\n- abberviation") .HasColumnName("descriptive_item_type"); - entity.Property(e => e.DimEndDate) - .HasComment("https://iri.suomi.fi/model/researchfi_core_project/\r\nProjektin kuvailutiedot ajassa\r\nhttps://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time\r\n* päättymispäivämäärä") - .HasColumnName("dim_end_date"); + entity.Property(e => e.DimEndDate).HasColumnName("dim_end_date"); entity.Property(e => e.DimInfrastructureId).HasColumnName("dim_infrastructure_id"); - entity.Property(e => e.DimPublicationId) - .HasDefaultValue(-1) - .HasColumnName("dim_publication_id"); + entity.Property(e => e.DimPublicationId).HasColumnName("dim_publication_id"); entity.Property(e => e.DimRegisteredDataSourceId).HasColumnName("dim_registered_data_source_id"); entity.Property(e => e.DimResearchDataCatalogId).HasColumnName("dim_research_data_catalog_id"); - entity.Property(e => e.DimResearchDatasetId) - .HasDefaultValue(-1) - .HasColumnName("dim_research_dataset_id"); - entity.Property(e => e.DimResearchProjectId) - .HasComment("https://iri.suomi.fi/model/researchfi_core_project/\r\nProjektin kuvailutiedot ajassa\r\nhttps://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time\r\n- liittyy projektiin") - .HasColumnName("dim_research_project_id"); + entity.Property(e => e.DimResearchDatasetId).HasColumnName("dim_research_dataset_id"); + entity.Property(e => e.DimResearchProjectId).HasColumnName("dim_research_project_id"); entity.Property(e => e.DimServiceId).HasColumnName("dim_service_id"); - entity.Property(e => e.DimStartDate) - .HasComment("https://iri.suomi.fi/model/researchfi_core_project/\r\nProjektin kuvailutiedot ajassa\r\nhttps://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time\r\n* alkamispäivämäärä") - .HasColumnName("dim_start_date"); + entity.Property(e => e.DimStartDate).HasColumnName("dim_start_date"); entity.Property(e => e.Modified) .HasColumnType("datetime") .HasColumnName("modified"); @@ -878,17 +829,17 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.HasOne(d => d.DimInfrastructure).WithMany(p => p.DimDescriptiveItems) .HasForeignKey(d => d.DimInfrastructureId) .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FKdim_descri541083"); + .HasConstraintName("infra_descriptive"); entity.HasOne(d => d.DimPublication).WithMany(p => p.DimDescriptiveItems) .HasForeignKey(d => d.DimPublicationId) .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("descriptive_publication"); + .HasConstraintName("descriptive_item_publication"); entity.HasOne(d => d.DimRegisteredDataSource).WithMany(p => p.DimDescriptiveItems) .HasForeignKey(d => d.DimRegisteredDataSourceId) .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FKdim_descri977501"); + .HasConstraintName("dataSource_descriptiveItem"); entity.HasOne(d => d.DimResearchDataCatalog).WithMany(p => p.DimDescriptiveItems) .HasForeignKey(d => d.DimResearchDataCatalogId) @@ -908,7 +859,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.HasOne(d => d.DimService).WithMany(p => p.DimDescriptiveItems) .HasForeignKey(d => d.DimServiceId) .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("descriptive_service"); + .HasConstraintName("descriptive_item_service"); entity.HasOne(d => d.DimStartDateNavigation).WithMany(p => p.DimDescriptiveItemDimStartDateNavigations) .HasForeignKey(d => d.DimStartDate) @@ -918,7 +869,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_educ__3213E83F4681333A"); + entity.HasKey(e => e.Id).HasName("PK__dim_educ__3213E83F2D2F5D8B"); entity.ToTable("dim_education"); @@ -1001,7 +952,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_emai__3213E83FCBE02755"); + entity.HasKey(e => e.Id).HasName("PK__dim_emai__3213E83FDAD73328"); entity.ToTable("dim_email_addrress"); @@ -1009,7 +960,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.Created) .HasColumnType("datetime") .HasColumnName("created"); - entity.Property(e => e.DimContactInformationId).HasColumnName("dim_contact_information_id"); + entity.Property(e => e.DimContactInformationId) + .HasDefaultValue(-1) + .HasColumnName("dim_contact_information_id"); entity.Property(e => e.DimKnownPersonId).HasColumnName("dim_known_person_id"); entity.Property(e => e.DimRegisteredDataSourceId).HasColumnName("dim_registered_data_source_id"); entity.Property(e => e.Email) @@ -1044,7 +997,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_esfr__3213E83F90370F51"); + entity.HasKey(e => e.Id).HasName("PK__dim_esfr__3213E83F13126FF4"); entity.ToTable("dim_esfri"); @@ -1078,7 +1031,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.HasMany(d => d.DimInfrastructures).WithMany(p => p.DimEsfris) .UsingEntity>( "BrEsfriDimInfrastructure", - r => r.HasOne().WithMany() + r => r.HasOne().WithMany() .HasForeignKey("DimInfrastructureId") .OnDelete(DeleteBehavior.ClientSetNull) .HasConstraintName("FKbr_esfri_d490989"), @@ -1088,7 +1041,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_esfri_d559740"), j => { - j.HasKey("DimEsfriId", "DimInfrastructureId").HasName("PK__br_esfri__A4A0FE10724FC13A"); + j.HasKey("DimEsfriId", "DimInfrastructureId").HasName("PK__br_esfri__A4A0FE10730006B4"); j.ToTable("br_esfri_dim_infrastructure"); j.IndexerProperty("DimEsfriId").HasColumnName("dim_esfri_id"); j.IndexerProperty("DimInfrastructureId").HasColumnName("dim_infrastructure_id"); @@ -1097,7 +1050,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_even__3213E83FE45E42D7"); + entity.HasKey(e => e.Id).HasName("PK__dim_even__3213E83F18860913"); entity.ToTable("dim_event"); @@ -1155,7 +1108,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_exte__3213E83F38D7BAF6"); + entity.HasKey(e => e.Id).HasName("PK__dim_exte__3213E83FAB316432"); entity.ToTable("dim_external_service"); @@ -1190,7 +1143,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_fiel__3213E83F4701F508"); + entity.HasKey(e => e.Id).HasName("PK__dim_fiel__3213E83F6B163F07"); entity.ToTable("dim_field_display_settings"); @@ -1230,7 +1183,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_field_d783303"), j => { - j.HasKey("DimFieldDisplaySettingsId", "DimRegisteredDataSourceId").HasName("PK__br_field__6148A7725EB9855F"); + j.HasKey("DimFieldDisplaySettingsId", "DimRegisteredDataSourceId").HasName("PK__br_field__6148A77265B7A666"); j.ToTable("br_field_display_settings_dim_registered_data_source"); j.IndexerProperty("DimFieldDisplaySettingsId").HasColumnName("dim_field_display_settings_id"); j.IndexerProperty("DimRegisteredDataSourceId").HasColumnName("dim_registered_data_source_id"); @@ -1239,7 +1192,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_fund__3213E83F92E7A6F4"); + entity.HasKey(e => e.Id).HasName("PK__dim_fund__3213E83F5F32C830"); entity.ToTable("dim_funding_decision"); @@ -1260,9 +1213,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.DescriptionEn).HasColumnName("description_en"); entity.Property(e => e.DescriptionFi).HasColumnName("description_fi"); entity.Property(e => e.DescriptionSv).HasColumnName("description_sv"); - entity.Property(e => e.DimCallDecisionsId) - .HasComment("Rahoituspäätös - Päätöspaneeli") - .HasColumnName("dim_call_decisions_id"); + entity.Property(e => e.DimCallDecisionsId).HasColumnName("dim_call_decisions_id"); entity.Property(e => e.DimCallProgrammeId).HasColumnName("dim_call_programme_id"); entity.Property(e => e.DimDateIdApproval).HasColumnName("dim_date_id_approval"); entity.Property(e => e.DimDateIdEnd).HasColumnName("dim_date_id_end"); @@ -1278,7 +1229,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.DimTypeOfFundingId).HasColumnName("dim_type_of_funding_id"); entity.Property(e => e.FunderProjectNumber) .HasMaxLength(255) - .HasComment("Päätöksen paikallinen tunniste (tiedon toimittajan)") .HasColumnName("funder_project_number"); entity.Property(e => e.FundingDecisionCurrencyAbbreviation) .HasMaxLength(255) @@ -1366,7 +1316,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_related689923"), j => { - j.HasKey("DimFundingDecisionFromId", "DimFundingDecisionToId").HasName("PK__br_relat__9096649158D403A0"); + j.HasKey("DimFundingDecisionFromId", "DimFundingDecisionToId").HasName("PK__br_relat__90966491FAFE0A02"); j.ToTable("br_related_funding_decision"); j.IndexerProperty("DimFundingDecisionFromId").HasColumnName("dim_funding_decision_from_id"); j.IndexerProperty("DimFundingDecisionToId").HasColumnName("dim_funding_decision_to_id"); @@ -1385,7 +1335,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_related232364"), j => { - j.HasKey("DimFundingDecisionFromId", "DimFundingDecisionToId").HasName("PK__br_relat__9096649158D403A0"); + j.HasKey("DimFundingDecisionFromId", "DimFundingDecisionToId").HasName("PK__br_relat__90966491FAFE0A02"); j.ToTable("br_related_funding_decision"); j.IndexerProperty("DimFundingDecisionFromId").HasColumnName("dim_funding_decision_from_id"); j.IndexerProperty("DimFundingDecisionToId").HasColumnName("dim_funding_decision_to_id"); @@ -1394,7 +1344,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_geo__3213E83F00FCF45F"); + entity.HasKey(e => e.Id).HasName("PK__dim_geo__3213E83F688FCE56"); entity.ToTable("dim_geo"); @@ -1451,7 +1401,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_iden__3213E83F7FB98A48"); + entity.HasKey(e => e.Id).HasName("PK__dim_iden__3213E83F56170CAC"); entity.ToTable("dim_identifierless_data"); @@ -1525,9 +1475,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.Modified) .HasColumnType("datetime") .HasColumnName("modified"); - entity.Property(e => e.ResponsibleOrganizationId) - .HasDefaultValue(-1) - .HasColumnName("responsible_organization_id"); + entity.Property(e => e.ResponsibleOrganizationId).HasColumnName("responsible_organization_id"); entity.Property(e => e.SourceDescription) .HasMaxLength(255) .HasColumnName("source_description"); @@ -1541,6 +1489,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .OnDelete(DeleteBehavior.ClientSetNull) .HasConstraintName("infraEndDate"); + entity.HasOne(d => d.DimRegisteredDataSource).WithMany(p => p.DimInfrastructures) + .HasForeignKey(d => d.DimRegisteredDataSourceId) + .OnDelete(DeleteBehavior.ClientSetNull) + .HasConstraintName("infra_datasource"); + entity.HasOne(d => d.DimStartDateNavigation).WithMany(p => p.DimInfrastructureDimStartDateNavigations) .HasForeignKey(d => d.DimStartDate) .OnDelete(DeleteBehavior.ClientSetNull) @@ -1554,10 +1507,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity - .HasNoKey() - .ToTable("dim_infrastructure_old"); + entity.ToTable("dim_infrastructure_old"); + entity.Property(e => e.Id).HasColumnName("id"); entity.Property(e => e.Acronym) .HasMaxLength(255) .IsUnicode(false) @@ -1579,9 +1531,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasColumnName("description_sv"); entity.Property(e => e.EndYear).HasColumnName("end_year"); entity.Property(e => e.FinlandRoadmap).HasColumnName("finland_roadmap"); - entity.Property(e => e.Id) - .ValueGeneratedOnAdd() - .HasColumnName("id"); entity.Property(e => e.Modified) .HasColumnType("datetime") .HasColumnName("modified"); @@ -1626,7 +1575,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_keyw__3213E83FBB8AEC89"); + entity.HasKey(e => e.Id).HasName("PK__dim_keyw__3213E83FA31529B0"); entity.ToTable("dim_keyword"); @@ -1695,7 +1644,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_keyword224605"), j => { - j.HasKey("DimKeywordId", "DimFundingDecisionId").HasName("PK__br_keywo__8C7B929B2738E0A6"); + j.HasKey("DimKeywordId", "DimFundingDecisionId").HasName("PK__br_keywo__8C7B929BC6D79FEC"); j.ToTable("br_keyword_dim_funding_decision"); j.IndexerProperty("DimKeywordId").HasColumnName("dim_keyword_id"); j.IndexerProperty("DimFundingDecisionId").HasColumnName("dim_funding_decision_id"); @@ -1714,7 +1663,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_keyword944303"), j => { - j.HasKey("DimKeywordId", "DimPublicationId").HasName("PK__br_keywo__C6E31F1A14CC4C40"); + j.HasKey("DimKeywordId", "DimPublicationId").HasName("PK__br_keywo__C6E31F1A6908D7D4"); j.ToTable("br_keyword_dim_publication"); j.IndexerProperty("DimKeywordId").HasColumnName("dim_keyword_id"); j.IndexerProperty("DimPublicationId").HasColumnName("dim_publication_id"); @@ -1723,7 +1672,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_know__3213E83F750A50CE"); + entity.HasKey(e => e.Id).HasName("PK__dim_know__3213E83FE4689651"); entity.ToTable("dim_known_person"); @@ -1753,7 +1702,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_loca__3213E83FB4377CD2"); + entity.HasKey(e => e.Id).HasName("PK__dim_loca__3213E83F049E758E"); entity.ToTable("dim_locally_reported_pub_info"); @@ -1801,7 +1750,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_meri__3213E83F3C0E02CD"); + entity.HasKey(e => e.Id).HasName("PK__dim_meri__3213E83F0DF1FEFC"); entity.ToTable("dim_meril"); @@ -1835,7 +1784,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.HasMany(d => d.DimInfrastructures).WithMany(p => p.DimMerils) .UsingEntity>( "BrMerilDimInfrastructure", - r => r.HasOne().WithMany() + r => r.HasOne().WithMany() .HasForeignKey("DimInfrastructureId") .OnDelete(DeleteBehavior.ClientSetNull) .HasConstraintName("FKbr_meril_d901766"), @@ -1845,7 +1794,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_meril_d209645"), j => { - j.HasKey("DimMerilId", "DimInfrastructureId").HasName("PK__br_meril__A30C54DA431D7A01"); + j.HasKey("DimMerilId", "DimInfrastructureId").HasName("PK__br_meril__A30C54DA9088DE86"); j.ToTable("br_meril_dim_infrastructure"); j.IndexerProperty("DimMerilId").HasColumnName("dim_meril_id"); j.IndexerProperty("DimInfrastructureId").HasColumnName("dim_infrastructure_id"); @@ -1854,7 +1803,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_mine__3213E83FACA3EECA"); + entity.HasKey(e => e.Id).HasName("PK__dim_mine__3213E83F2F3DD946"); entity.ToTable("dim_mined_words"); @@ -1880,7 +1829,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_name__3213E83FA5795340"); + entity.HasKey(e => e.Id).HasName("PK__dim_name__3213E83F995DE482"); entity.ToTable("dim_name"); @@ -1926,7 +1875,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_news__3213E83F7ED24E57"); + entity.HasKey(e => e.Id).HasName("PK__dim_news__3213E83F7FF07C7C"); entity.ToTable("dim_news_feed"); @@ -1954,7 +1903,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.Id, e.DimNewsFeedid }).HasName("PK__dim_news__B87E6703CE4A878E"); + entity.HasKey(e => new { e.Id, e.DimNewsFeedid }).HasName("PK__dim_news__B87E67039EE72B71"); entity.ToTable("dim_news_item"); @@ -2025,7 +1974,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_orga__3213E83F5BC9AF24"); + entity.HasKey(e => e.Id).HasName("PK__dim_orga__3213E83F90C97C33"); entity.ToTable("dim_organization"); @@ -2123,7 +2072,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_organiz621686"), j => { - j.HasKey("DimOrganizationid", "DimCallProgrammeid").HasName("PK__br_organ__10F219BC7A4E07DA"); + j.HasKey("DimOrganizationid", "DimCallProgrammeid").HasName("PK__br_organ__10F219BCE7E3E8CB"); j.ToTable("br_organizations_fund_call_programmes"); j.IndexerProperty("DimOrganizationid").HasColumnName("dim_organizationid"); j.IndexerProperty("DimCallProgrammeid").HasColumnName("dim_call_programmeid"); @@ -2142,7 +2091,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_predece849307"), j => { - j.HasKey("DimOrganizationid", "DimOrganizationid2").HasName("PK__br_prede__A7CAD2F45B77C61D"); + j.HasKey("DimOrganizationid", "DimOrganizationid2").HasName("PK__br_prede__A7CAD2F49C1B73E4"); j.ToTable("br_predecessor_organization"); j.IndexerProperty("DimOrganizationid").HasColumnName("dim_organizationid"); j.IndexerProperty("DimOrganizationid2").HasColumnName("dim_organizationid2"); @@ -2161,7 +2110,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_success452227"), j => { - j.HasKey("DimOrganizationid", "DimOrganizationid2").HasName("PK__br_succe__A7CAD2F45BDA794B"); + j.HasKey("DimOrganizationid", "DimOrganizationid2").HasName("PK__br_succe__A7CAD2F40A180AA5"); j.ToTable("br_successor organization"); j.IndexerProperty("DimOrganizationid").HasColumnName("dim_organizationid"); j.IndexerProperty("DimOrganizationid2").HasColumnName("dim_organizationid2"); @@ -2180,7 +2129,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_predece505451"), j => { - j.HasKey("DimOrganizationid", "DimOrganizationid2").HasName("PK__br_prede__A7CAD2F45B77C61D"); + j.HasKey("DimOrganizationid", "DimOrganizationid2").HasName("PK__br_prede__A7CAD2F49C1B73E4"); j.ToTable("br_predecessor_organization"); j.IndexerProperty("DimOrganizationid").HasColumnName("dim_organizationid"); j.IndexerProperty("DimOrganizationid2").HasColumnName("dim_organizationid2"); @@ -2199,7 +2148,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_success902531"), j => { - j.HasKey("DimOrganizationid", "DimOrganizationid2").HasName("PK__br_succe__A7CAD2F45BDA794B"); + j.HasKey("DimOrganizationid", "DimOrganizationid2").HasName("PK__br_succe__A7CAD2F40A180AA5"); j.ToTable("br_successor organization"); j.IndexerProperty("DimOrganizationid").HasColumnName("dim_organizationid"); j.IndexerProperty("DimOrganizationid2").HasColumnName("dim_organizationid2"); @@ -2208,7 +2157,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_pid__3213E83FE3CE1639"); + entity.HasKey(e => e.Id).HasName("PK__dim_pid__3213E83F32ED136E"); entity.ToTable("dim_pid"); @@ -2216,7 +2165,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.Created) .HasColumnType("datetime") .HasColumnName("created"); - entity.Property(e => e.DimEventId).HasColumnName("dim_event_id"); + entity.Property(e => e.DimEventId) + .HasDefaultValue(-1) + .HasColumnName("dim_event_id"); entity.Property(e => e.DimInfrastructureId).HasColumnName("dim_infrastructure_id"); entity.Property(e => e.DimKnownPersonId).HasColumnName("dim_known_person_id"); entity.Property(e => e.DimOrganizationId).HasColumnName("dim_organization_id"); @@ -2324,7 +2275,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_prof__3213E83FD4A79A61"); + entity.HasKey(e => e.Id).HasName("PK__dim_prof__3213E83F79C1658C"); entity.ToTable("dim_profile_only_dataset"); @@ -2385,7 +2336,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_prof__3213E83F61EE01E4"); + entity.HasKey(e => e.Id).HasName("PK__dim_prof__3213E83FF6FA06E2"); entity.ToTable("dim_profile_only_funding_decision"); @@ -2482,7 +2433,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_prof__3213E83F6A482020"); + entity.HasKey(e => e.Id).HasName("PK__dim_prof__3213E83F077A5D0F"); entity.ToTable("dim_profile_only_publication"); @@ -2490,9 +2441,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.ArticleNumberText) .HasMaxLength(255) .HasColumnName("article_number_text"); - entity.Property(e => e.ArticleTypeCode) - .HasComment("code_scheme = 'Artikkelintyyppikoodi'") - .HasColumnName("article_type_code"); + entity.Property(e => e.ArticleTypeCode).HasColumnName("article_type_code"); entity.Property(e => e.AuthorsText) .IsRequired() .HasColumnName("authors_text"); @@ -2538,9 +2487,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.ParentTypeClassificationCode).HasColumnName("parent_type_classification_code"); entity.Property(e => e.PeerReviewed).HasColumnName("peer_reviewed"); entity.Property(e => e.PublicationCountryCode).HasColumnName("publication_country_code"); - entity.Property(e => e.PublicationFormatCode) - .HasComment("code_scheme = 'julkaisumuoto'") - .HasColumnName("publication_format_code"); + entity.Property(e => e.PublicationFormatCode).HasColumnName("publication_format_code"); entity.Property(e => e.PublicationId) .IsRequired() .HasMaxLength(255) @@ -2565,13 +2512,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .IsRequired() .HasMaxLength(255) .HasColumnName("source_id"); - entity.Property(e => e.TargetAudienceCode) - .HasComment("code_scheme = 'julkaisunyleiso'") - .HasColumnName("target_audience_code"); + entity.Property(e => e.TargetAudienceCode).HasColumnName("target_audience_code"); entity.Property(e => e.ThesisTypeCode).HasColumnName("thesis_type_code"); - entity.Property(e => e.TypeClassificationCode) - .HasComment("code_schema = 'julkaisutyyppiluokitus'") - .HasColumnName("type_classification_code"); + entity.Property(e => e.TypeClassificationCode).HasColumnName("type_classification_code"); entity.Property(e => e.Volume) .HasMaxLength(255) .HasColumnName("volume"); @@ -2638,7 +2581,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_prof__3213E83F5A4628B5"); + entity.HasKey(e => e.Id).HasName("PK__dim_prof__3213E83F40097782"); entity.ToTable("dim_profile_only_research_activity"); @@ -2719,7 +2662,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_publ__3213E83F6D756A19"); + entity.HasKey(e => e.Id).HasName("PK__dim_publ__3213E83FD2D61D51"); entity.ToTable("dim_publication"); @@ -2728,6 +2671,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasColumnType("decimal(18, 2)") .HasColumnName("apc_fee_EUR"); entity.Property(e => e.ApcPaymentYear).HasColumnName("apc_payment_year"); + entity.Property(e => e.ArtTypeCode).HasColumnName("art_type_code"); entity.Property(e => e.ArticleNumberText) .HasMaxLength(255) .HasColumnName("article_number_text"); @@ -2735,6 +2679,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.AuthorsText) .IsRequired() .HasColumnName("authors_text"); + entity.Property(e => e.AvApplicationTypeCode).HasColumnName("av_application_type_code"); entity.Property(e => e.BusinessCollaboration).HasColumnName("business_collaboration"); entity.Property(e => e.ConferenceName) .HasMaxLength(4000) @@ -2804,7 +2749,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasMaxLength(4000) .HasColumnName("publisher_name"); entity.Property(e => e.PublisherOpenAccessCode).HasColumnName("publisher_open_access_code"); - entity.Property(e => e.Report).HasColumnName("report"); + entity.Property(e => e.ReportSwitch).HasColumnName("report_switch"); entity.Property(e => e.ReportingYear).HasColumnName("reporting_year"); entity.Property(e => e.SelfArchivedCode).HasColumnName("self_archived_code"); entity.Property(e => e.SourceDescription) @@ -2820,10 +2765,20 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasMaxLength(255) .HasColumnName("volume"); + entity.HasOne(d => d.ArtTypeCodeNavigation).WithMany(p => p.DimPublicationArtTypeCodeNavigations) + .HasForeignKey(d => d.ArtTypeCode) + .OnDelete(DeleteBehavior.ClientSetNull) + .HasConstraintName("art_type_code"); + entity.HasOne(d => d.ArticleTypeCodeNavigation).WithMany(p => p.DimPublicationArticleTypeCodeNavigations) .HasForeignKey(d => d.ArticleTypeCode) .HasConstraintName("article_type_code"); + entity.HasOne(d => d.AvApplicationTypeCodeNavigation).WithMany(p => p.DimPublicationAvApplicationTypeCodeNavigations) + .HasForeignKey(d => d.AvApplicationTypeCode) + .OnDelete(DeleteBehavior.ClientSetNull) + .HasConstraintName("av_application_type_code"); + entity.HasOne(d => d.DimPublicationChannel).WithMany(p => p.DimPublicationDimPublicationChannels) .HasForeignKey(d => d.DimPublicationChannelId) .OnDelete(DeleteBehavior.ClientSetNull) @@ -2896,6 +2851,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .OnDelete(DeleteBehavior.ClientSetNull) .HasConstraintName("publisher_open_access"); + entity.HasOne(d => d.ReportSwitchNavigation).WithMany(p => p.DimPublicationReportSwitchNavigations) + .HasForeignKey(d => d.ReportSwitch) + .OnDelete(DeleteBehavior.ClientSetNull) + .HasConstraintName("reportSwitch"); + entity.HasOne(d => d.TargetAudienceCodeNavigation).WithMany(p => p.DimPublicationTargetAudienceCodeNavigations) .HasForeignKey(d => d.TargetAudienceCode) .HasConstraintName("target_audience_code"); @@ -2918,7 +2878,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKbr_artpubl464312"), j => { - j.HasKey("DimPublicationId", "DimReferencedataid").HasName("PK__br_artpu__879F18F371D216BF"); + j.HasKey("DimPublicationId", "DimReferencedataid").HasName("PK__br_artpu__879F18F38C9FCAFE"); j.ToTable("br_artpublication_typecategory"); j.IndexerProperty("DimPublicationId").HasColumnName("dim_publication_id"); j.IndexerProperty("DimReferencedataid").HasColumnName("dim_referencedataid"); @@ -2927,7 +2887,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_publ__3213E83F04A45435"); + entity.HasKey(e => e.Id).HasName("PK__dim_publ__3213E83FFE0A9EEA"); entity.ToTable("dim_publication_channel"); @@ -2958,7 +2918,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_purp__3213E83F8CD2ED3D"); + entity.HasKey(e => e.Id).HasName("PK__dim_purp__3213E83FA11DB48C"); entity.ToTable("dim_purpose"); @@ -3001,7 +2961,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_refe__3213E83FE4056DB8"); + entity.HasKey(e => e.Id).HasName("PK__dim_refe__3213E83F5360D403"); entity.ToTable("dim_referencedata"); @@ -3063,7 +3023,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKfact_dim_r130466"), j => { - j.HasKey("DimReferencedataId", "DimPublicationId").HasName("PK__fact_dim__62A1BBCB901E289D"); + j.HasKey("DimReferencedataId", "DimPublicationId").HasName("PK__fact_dim__62A1BBCBAAD05D11"); j.ToTable("fact_dim_referencedata_field_of_art"); j.IndexerProperty("DimReferencedataId").HasColumnName("dim_referencedata_id"); j.IndexerProperty("DimPublicationId").HasColumnName("dim_publication_id"); @@ -3072,7 +3032,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_regi__3213E83F2117E1FD"); + entity.HasKey(e => e.Id).HasName("PK__dim_regi__3213E83F4AF0D945"); entity.ToTable("dim_registered_data_source"); @@ -3104,7 +3064,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F2E82C1E2"); + entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83FCF3EBC14"); entity.ToTable("dim_research_activity"); @@ -3188,7 +3148,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimResearchActivityId, e.DimKeywordId }).HasName("PK__dim_rese__F7B536BC8D4EC693"); + entity.HasKey(e => new { e.DimResearchActivityId, e.DimKeywordId }).HasName("PK__dim_rese__F7B536BCCEBC91ED"); entity.ToTable("dim_research_activity_dim_keyword"); @@ -3203,7 +3163,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F1332DF4D"); + entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F4C1709F2"); entity.ToTable("dim_research_community"); @@ -3250,7 +3210,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83FC63C1138"); + entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F26FC6AF3"); entity.ToTable("dim_research_data_catalog"); @@ -3290,7 +3250,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83FA9BA294F"); + entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F1DCE05D2"); entity.ToTable("dim_research_dataset"); @@ -3338,7 +3298,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F90AE95A3"); + entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F91DCC6BC"); entity.ToTable("dim_research_project"); @@ -3347,15 +3307,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasColumnType("datetime") .HasColumnName("created"); entity.Property(e => e.DimRegisteredDataSourceId).HasColumnName("dim_registered_data_source_id"); - entity.Property(e => e.EndDate) - .HasComment("Hanke - päättymispäivämäärä") - .HasColumnName("end_date"); + entity.Property(e => e.EndDate).HasColumnName("end_date"); entity.Property(e => e.Modified) .HasColumnType("datetime") .HasColumnName("modified"); - entity.Property(e => e.ResponsibleOrganization) - .HasComment("Hanke - vastuuorganisaatio") - .HasColumnName("responsible_organization"); + entity.Property(e => e.ResponsibleOrganization).HasColumnName("responsible_organization"); entity.Property(e => e.ResponsiblePerson).HasColumnName("responsible_person"); entity.Property(e => e.SourceDescription) .HasMaxLength(255) @@ -3364,9 +3320,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .IsRequired() .HasMaxLength(255) .HasColumnName("source_id"); - entity.Property(e => e.StartDate) - .HasComment("Hanke - alkamispäivämäärä") - .HasColumnName("start_date"); + entity.Property(e => e.StartDate).HasColumnName("start_date"); entity.HasOne(d => d.DimRegisteredDataSource).WithMany(p => p.DimResearchProjects) .HasForeignKey(d => d.DimRegisteredDataSourceId) @@ -3394,7 +3348,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F7E13C8DC"); + entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F8E04D0D4"); entity.ToTable("dim_researcher_description"); @@ -3432,7 +3386,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F0A16C8A0"); + entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83F39FD841F"); entity.ToTable("dim_researcher_to_research_community"); @@ -3492,7 +3446,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_sect__3213E83FB3BC77F3"); + entity.HasKey(e => e.Id).HasName("PK__dim_sect__3213E83F30CD7465"); entity.ToTable("dim_sector"); @@ -3528,7 +3482,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_serv__3213E83F4D2DEC31"); + entity.HasKey(e => e.Id).HasName("PK__dim_serv__3213E83F8A1859B5"); entity.ToTable("dim_service"); @@ -3538,6 +3492,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasColumnName("created"); entity.Property(e => e.DimInfrastructureId).HasColumnName("dim_infrastructure_id"); entity.Property(e => e.EndDate).HasColumnName("end_date"); + entity.Property(e => e.LocalIdentifier) + .HasMaxLength(255) + .HasColumnName("local_identifier"); entity.Property(e => e.Modified) .HasColumnType("datetime") .HasColumnName("modified"); @@ -3568,10 +3525,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity - .HasNoKey() - .ToTable("dim_service_old"); + entity.ToTable("dim_service_old"); + entity.Property(e => e.Id).HasColumnName("id"); entity.Property(e => e.Acronym) .HasMaxLength(255) .IsUnicode(false) @@ -3591,9 +3547,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasMaxLength(4000) .IsUnicode(false) .HasColumnName("description_sv"); - entity.Property(e => e.Id) - .ValueGeneratedOnAdd() - .HasColumnName("id"); entity.Property(e => e.Modified) .HasColumnType("datetime") .HasColumnName("modified"); @@ -3633,7 +3586,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_serv__3213E83F90416D47"); + entity.HasKey(e => e.Id).HasName("PK__dim_serv__3213E83F75FD631B"); entity.ToTable("dim_service_point"); @@ -3711,7 +3664,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_tele__3213E83F0FDB11CA"); + entity.HasKey(e => e.Id).HasName("PK__dim_tele__3213E83FE4AAF096"); entity.ToTable("dim_telephone_number"); @@ -3719,7 +3672,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.Created) .HasColumnType("datetime") .HasColumnName("created"); - entity.Property(e => e.DimContactInformationId).HasColumnName("dim_contact_information_id"); + entity.Property(e => e.DimContactInformationId) + .HasDefaultValue(-1) + .HasColumnName("dim_contact_information_id"); entity.Property(e => e.DimKnownPersonId).HasColumnName("dim_known_person_id"); entity.Property(e => e.DimRegisteredDataSourceId).HasColumnName("dim_registered_data_source_id"); entity.Property(e => e.Modified) @@ -3754,11 +3709,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_type__3213E83F75296618"); + entity.HasKey(e => e.Id).HasName("PK__dim_type__3213E83FA8731F89"); entity.ToTable("dim_type_of_funding"); - entity.HasIndex(e => e.TypeId, "UQ__dim_type__2C0005992421A893").IsUnique(); + entity.HasIndex(e => e.TypeId, "UQ__dim_type__2C0005990BE82EA1").IsUnique(); entity.Property(e => e.Id).HasColumnName("id"); entity.Property(e => e.Created) @@ -3798,7 +3753,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_user__3213E83F46A17D3E"); + entity.HasKey(e => e.Id).HasName("PK__dim_user__3213E83F95C562F7"); entity.ToTable("dim_user_choices"); @@ -3833,7 +3788,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => e.Id).HasName("PK__dim_user__3213E83FC0459EEA"); + entity.HasKey(e => e.Id).HasName("PK__dim_user__3213E83F55CB0465"); entity.ToTable("dim_user_profile"); @@ -3983,6 +3938,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasForeignKey(d => d.DimResearchDatasetId) .HasConstraintName("fairdata_weblink"); + entity.HasOne(d => d.DimResearchProject).WithMany(p => p.DimWebLinks) + .HasForeignKey(d => d.DimResearchProjectId) + .HasConstraintName("FKdim_web_li270762"); + entity.HasOne(d => d.DimService).WithMany(p => p.DimWebLinks) .HasForeignKey(d => d.DimServiceId) .HasConstraintName("weblink_service"); @@ -3995,6 +3954,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.ToTable("dim_word_cluster"); entity.Property(e => e.Id).HasColumnName("id"); + entity.Property(e => e.Content) + .IsRequired() + .HasMaxLength(255) + .HasColumnName("content"); entity.Property(e => e.Created) .HasColumnType("datetime") .HasColumnName("created"); @@ -4012,7 +3975,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimFundingDecisionId, e.DimOrganizationId, e.DimDateId, e.DimNameId, e.DimPublicationId, e.DimGeoId, e.DimInfrastructureId, e.DimNewsFeedId, e.DimResearchDatasetId, e.DimResearchDataCatalogId, e.DimIdentifierlessDataId, e.DimResearchActivityId, e.DimResearchCommunityId, e.DimReferencedataActorRoleId, e.DimResearchProjectId }).HasName("PK__fact_con__7D48570540263B9E"); + entity.HasKey(e => new { e.DimFundingDecisionId, e.DimOrganizationId, e.DimDateId, e.DimNameId, e.DimPublicationId, e.DimGeoId, e.DimInfrastructureId, e.DimNewsFeedId, e.DimResearchDatasetId, e.DimResearchDataCatalogId, e.DimIdentifierlessDataId, e.DimResearchActivityId, e.DimResearchCommunityId, e.DimReferencedataActorRoleId, e.DimResearchProjectId }).HasName("PK__fact_con__7D48570587EB364F"); entity.ToTable("fact_contribution"); @@ -4124,17 +4087,34 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimReferencedataId, e.DimResearchDatasetId, e.DimKnownPersonId, e.DimPublicationId, e.DimResearchActivityId, e.DimFundingDecisionId, e.DimInfrastructureId }).HasName("PK__fact_dim__3CB15DD3216C076B"); + entity.HasKey(e => new { e.DimReferencedataId, e.DimResearchDatasetId, e.DimKnownPersonId, e.DimPublicationId, e.DimResearchActivityId, e.DimFundingDecisionId, e.DimInfrastructureId }).HasName("PK__fact_dim__3CB15DD3055E3115"); entity.ToTable("fact_dim_referencedata_field_of_science"); - entity.Property(e => e.DimReferencedataId).HasColumnName("dim_referencedata_id"); - entity.Property(e => e.DimResearchDatasetId).HasColumnName("dim_research_dataset_id"); - entity.Property(e => e.DimKnownPersonId).HasColumnName("dim_known_person_id"); - entity.Property(e => e.DimPublicationId).HasColumnName("dim_publication_id"); - entity.Property(e => e.DimResearchActivityId).HasColumnName("dim_research_activity_id"); - entity.Property(e => e.DimFundingDecisionId).HasColumnName("dim_funding_decision_id"); - entity.Property(e => e.DimInfrastructureId).HasColumnName("dim_infrastructure_id"); + entity.Property(e => e.DimReferencedataId) + .HasDefaultValue(-1) + .HasColumnName("dim_referencedata_id"); + entity.Property(e => e.DimResearchDatasetId) + .HasDefaultValue(-1) + .HasColumnName("dim_research_dataset_id"); + entity.Property(e => e.DimKnownPersonId) + .HasDefaultValue(-1) + .HasColumnName("dim_known_person_id"); + entity.Property(e => e.DimPublicationId) + .HasDefaultValue(-1) + .HasColumnName("dim_publication_id"); + entity.Property(e => e.DimResearchActivityId) + .HasDefaultValue(-1) + .HasColumnName("dim_research_activity_id"); + entity.Property(e => e.DimFundingDecisionId) + .HasDefaultValue(-1) + .HasColumnName("dim_funding_decision_id"); + entity.Property(e => e.DimInfrastructureId) + .HasDefaultValue(-1) + .HasColumnName("dim_infrastructure_id"); + entity.Property(e => e.Created) + .HasColumnType("datetime") + .HasColumnName("created"); entity.HasOne(d => d.DimFundingDecision).WithMany(p => p.FactDimReferencedataFieldOfSciences) .HasForeignKey(d => d.DimFundingDecisionId) @@ -4160,11 +4140,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasForeignKey(d => d.DimReferencedataId) .OnDelete(DeleteBehavior.ClientSetNull) .HasConstraintName("FKfact_dim_r588766"); - - entity.HasOne(d => d.DimResearchDataset).WithMany(p => p.FactDimReferencedataFieldOfSciences) - .HasForeignKey(d => d.DimResearchDatasetId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FKfact_dim_r926246"); }); modelBuilder.Entity(entity => @@ -4411,7 +4386,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimKeywordId, e.DimServiceId, e.DimServicePointId, e.DimInfrastructureId }).HasName("PK__fact_inf__3C29B680746AD81D"); + entity.HasKey(e => new { e.DimKeywordId, e.DimServiceId, e.DimServicePointId, e.DimInfrastructureId }).HasName("PK__fact_inf__3C29B6807A0B559A"); entity.ToTable("fact_infra_keywords"); @@ -4446,7 +4421,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.HasOne(d => d.DimService).WithMany(p => p.FactInfraKeywords) .HasForeignKey(d => d.DimServiceId) .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FKfact_infra505599"); + .HasConstraintName("FKfact_infra505600"); entity.HasOne(d => d.DimServicePoint).WithMany(p => p.FactInfraKeywords) .HasForeignKey(d => d.DimServicePointId) @@ -4496,14 +4471,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimReferencedataId, e.DimResearchDatasetId, e.DimInfrastructureId, e.DimPublicationId, e.DimResearchActivityId, e.DimFundingDecisionId, e.DimCallProgrammeId }).HasName("PK__fact_ref__302C51994ECC44E8"); + entity.HasKey(e => new { e.DimReferencedataId, e.DimResearchDatasetId, e.DimInfrastructureId, e.DimPublicationId, e.DimResearchActivityId, e.DimFundingDecisionId, e.DimCallProgrammeId, e.DimServiceId }).HasName("PK__fact_ref__302C5199CE0FD085"); entity.ToTable("fact_referencedata"); - entity.HasIndex(e => e.DimResearchDatasetId, "fact_referencedata_idx_for_dataset_refrencedata_lookup"); - - entity.HasIndex(e => new { e.DimResearchDatasetId, e.DimReferencedataId }, "fact_referencedata_idx_for_dataset_refrencedata_update_lookup"); - entity.Property(e => e.DimReferencedataId).HasColumnName("dim_referencedata_id"); entity.Property(e => e.DimResearchDatasetId).HasColumnName("dim_research_dataset_id"); entity.Property(e => e.DimInfrastructureId).HasColumnName("dim_infrastructure_id"); @@ -4511,10 +4482,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.Property(e => e.DimResearchActivityId).HasColumnName("dim_research_activity_id"); entity.Property(e => e.DimFundingDecisionId).HasColumnName("dim_funding_decision_id"); entity.Property(e => e.DimCallProgrammeId).HasColumnName("dim_call_programme_id"); + entity.Property(e => e.DimServiceId).HasColumnName("dim_service_id"); entity.Property(e => e.Created) .HasColumnType("datetime") .HasColumnName("created"); - entity.Property(e => e.DimServiceId).HasColumnName("dim_service_id"); entity.Property(e => e.Modified) .HasColumnType("datetime") .HasColumnName("modified"); @@ -4568,7 +4539,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.RelationTypeCode, e.FromPublicationId, e.FromResearchDatasetId, e.FromIdentifierlessDataId, e.FromInfrastructureId, e.ToResearchDatasetId, e.ToIdentifierlessDataId, e.ToPublicationId, e.ToInfrastructureId, e.DimRegisteredDataSourceId }).HasName("PK__fact_rel__AA7969410AF2BC15"); + entity.HasKey(e => new { e.RelationTypeCode, e.FromPublicationId, e.FromResearchDatasetId, e.FromIdentifierlessDataId, e.FromInfrastructureId, e.ToResearchDatasetId, e.ToIdentifierlessDataId, e.ToPublicationId, e.ToInfrastructureId, e.DimRegisteredDataSourceId }).HasName("PK__fact_rel__AA79694111711403"); entity.ToTable("fact_relation"); @@ -4661,7 +4632,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimOrganizationId, e.DimGeoId, e.DimInfrastructureId, e.DimServiceId, e.DimServicePointId, e.DimDateIdStart, e.DimDateIdEnd }).HasName("PK__fact_upk__850A8E3016888E01"); + entity.HasKey(e => new { e.DimOrganizationId, e.DimGeoId, e.DimInfrastructureId, e.DimServiceId, e.DimServicePointId, e.DimDateIdStart, e.DimDateIdEnd }).HasName("PK__fact_upk__850A8E306FFAB150"); entity.ToTable("fact_upkeep"); @@ -4724,7 +4695,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity(entity => { - entity.HasKey(e => new { e.DimWordClusterId, e.DimFundingDecisionId, e.DimPublicationId }).HasName("PK__fact_wor__B4CBEE97EB85B3CC"); + entity.HasKey(e => new { e.DimWordClusterId, e.DimFundingDecisionId, e.DimPublicationId }).HasName("PK__fact_wor__B4CBEE9740C5A2BC"); entity.ToTable("fact_word_cluster_to_domain"); @@ -4761,6 +4732,26 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKfact_word_654881"); }); + modelBuilder.Entity(entity => + { + entity.ToTable("pid_ms"); + + entity.Property(e => e.Id).HasColumnName("id"); + entity.Property(e => e.ActionType) + .IsRequired() + .HasMaxLength(10) + .HasColumnName("action_type"); + entity.Property(e => e.Completed) + .HasColumnType("datetime") + .HasColumnName("completed"); + entity.Property(e => e.DimInfrastructureId).HasColumnName("dim_infrastructure_id"); + entity.Property(e => e.DimServiceId).HasColumnName("dim_service_id"); + entity.Property(e => e.RowCreated) + .HasDefaultValueSql("(getdate())") + .HasColumnType("datetime") + .HasColumnName("row_created"); + }); + OnModelCreatingPartial(modelBuilder); } diff --git a/aspnetcore/src/api/Services/BiographyService.cs b/aspnetcore/src/api/Services/BiographyService.cs index c2919371..ebef6041 100644 --- a/aspnetcore/src/api/Services/BiographyService.cs +++ b/aspnetcore/src/api/Services/BiographyService.cs @@ -188,7 +188,7 @@ await _ttvContext.FactFieldValues .Include(ffv => ffv.DimResearchDataset) .ThenInclude(rd => rd.DimDescriptiveItems) .Include(ffv => ffv.DimResearchDataset) - .ThenInclude(rd => rd.FactDimReferencedataFieldOfSciences) + .ThenInclude(rd => rd.FactReferencedata) .ThenInclude(fdrfs => fdrfs.DimReferencedata) .Select(ffv => new AittaResearchDataset { @@ -208,7 +208,9 @@ await _ttvContext.FactFieldValues DatasetCreationDate = ffv.DimResearchDataset.DatasetCreated != null ? ffv.DimResearchDataset.DatasetCreated : null, Theme = ffv.DimResearchDataset.FactKeywords.Count > 0 ? ffv.DimResearchDataset.FactKeywords.Where(fk => fk.DimKeyword.Scheme == "Theme").Select(fk => fk.DimKeyword.Keyword).ToList() : null, Keywords = ffv.DimResearchDataset.FactKeywords.Count > 0 ? ffv.DimResearchDataset.FactKeywords.Where(fk => fk.DimKeyword.Scheme == "Avainsana").Select(fk => fk.DimKeyword.Keyword).ToList() : null, - FieldsOfScience = ffv.DimResearchDataset.FactDimReferencedataFieldOfSciences.Select(fdrfs => fdrfs.DimReferencedata.NameEn).ToList() + FieldsOfScience = ffv.DimResearchDataset.FactReferencedata + .Where(fr => fr.DimReferencedata.CodeScheme == "Tieteenala2010") + .Select(fdrfs => fdrfs.DimReferencedata.NameEn).ToList() }) .AsNoTracking().ToListAsync();