CSCTTV-3852 TTV model update 15.5.2024

aspnetcore/src/api.Tests/Services_Tests/UserProfileServiceTest.cs

@@ -281,7 +281,9 @@ public void getEmptyDimPid_01()
             Assert.Equal<int>(-1, actualDimPid.DimInfrastructureId);
             Assert.Equal<int>(-1, actualDimPid.DimPublicationChannelId);
             Assert.Equal<int>(-1, actualDimPid.DimResearchDatasetId);
-            Assert.Equal<int>(-1, actualDimPid.DimFundingDecisionId);
+            Assert.Equal<int>(-1, (int)actualDimPid.DimFundingDecisionId);
+            Assert.Equal<int>(-1, (int)actualDimPid.DimResearchProjectId);
+            Assert.Equal<int>(-1, (int)actualDimPid.DimResearchCommunityId);
             Assert.Equal<int>(-1, actualDimPid.DimResearchDataCatalogId);
             Assert.Equal<int>(-1, actualDimPid.DimResearchActivityId);
             Assert.Equal<int>(-1, actualDimPid.DimEventId);

aspnetcore/src/api/Models/Ttv/DimCallDecision.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+
+namespace api.Models.Ttv;
+
+/// <summary>
+/// Rahoituspäätöspaneeli
+/// </summary>
+public partial class DimCallDecision
+{
+    public int Id { get; set; }
+
+    public int DecisionMaker { get; set; }
+
+    public int DimDateIdApproval { get; set; }
+
+    public int DimCallProgrammeId { get; set; }
+
+    /// <summary>
+    /// Rahoituspäätöspaneeli - Haun vaihe
+    /// </summary>
+    public string CallProcessingPhase { get; set; }
+
+    public string SourceId { get; set; }
+
+    public string SourceDescription { get; set; }
+
+    public virtual DimReferencedatum DecisionMakerNavigation { get; set; }
+
+    public virtual DimCallProgramme DimCallProgramme { get; set; }
+
+    public virtual DimDate DimDateIdApprovalNavigation { get; set; }
+
+    public virtual ICollection<DimFundingDecision> DimFundingDecisions { get; set; } = new List<DimFundingDecision>();
+}

aspnetcore/src/api/Models/Ttv/DimCallProgramme.cs

@@ -63,6 +63,14 @@ public partial class DimCallProgramme
 
     public string CallNameDetailsSv { get; set; }
 
+    public string LocalIdentifier { get; set; }
+
+    public int? TypeOfFunding { get; set; }
+
+    public virtual ICollection<DimCallDecision> DimCallDecisions { get; set; } = new List<DimCallDecision>();
+
+    public virtual DimCallProgramme DimCallProgrammeNavigation { get; set; }
+
     public virtual DimDate DimDateIdDueNavigation { get; set; }
 
     public virtual DimDate DimDateIdOpenNavigation { get; set; }
@@ -75,6 +83,10 @@ public partial class DimCallProgramme
 
     public virtual ICollection<DimWebLink> DimWebLinks { get; set; } = new List<DimWebLink>();
 
+    public virtual ICollection<DimCallProgramme> InverseDimCallProgrammeNavigation { get; set; } = new List<DimCallProgramme>();
+
+    public virtual DimReferencedatum TypeOfFundingNavigation { get; set; }
+
     public virtual ICollection<DimCallProgramme> DimCallProgrammeId2s { get; set; } = new List<DimCallProgramme>();
 
     public virtual ICollection<DimCallProgramme> DimCallProgrammes { get; set; } = new List<DimCallProgramme>();

aspnetcore/src/api/Models/Ttv/DimDate.cs

@@ -25,6 +25,8 @@ public partial class DimDate
 
     public virtual ICollection<DimAffiliation> DimAffiliationStartDateNavigations { get; set; } = new List<DimAffiliation>();
 
+    public virtual ICollection<DimCallDecision> DimCallDecisions { get; set; } = new List<DimCallDecision>();
+
     public virtual ICollection<DimCallProgramme> DimCallProgrammeDimDateIdDueNavigations { get; set; } = new List<DimCallProgramme>();
 
     public virtual ICollection<DimCallProgramme> DimCallProgrammeDimDateIdOpenNavigations { get; set; } = new List<DimCallProgramme>();
@@ -57,6 +59,10 @@ public partial class DimDate
 
     public virtual ICollection<DimResearchActivity> DimResearchActivityDimStartDateNavigations { get; set; } = new List<DimResearchActivity>();
 
+    public virtual ICollection<DimResearchProject> DimResearchProjectEndDateNavigations { get; set; } = new List<DimResearchProject>();
+
+    public virtual ICollection<DimResearchProject> DimResearchProjectStartDateNavigations { get; set; } = new List<DimResearchProject>();
+
     public virtual ICollection<DimResearcherToResearchCommunity> DimResearcherToResearchCommunityEndDateNavigations { get; set; } = new List<DimResearcherToResearchCommunity>();
 
     public virtual ICollection<DimResearcherToResearchCommunity> DimResearcherToResearchCommunityStartDateNavigations { get; set; } = new List<DimResearcherToResearchCommunity>();

aspnetcore/src/api/Models/Ttv/DimFundingDecision.cs

@@ -27,6 +27,9 @@ public partial class DimFundingDecision
 
     public int DimFundingDecisionIdParentDecision { get; set; }
 
+    /// <summary>
+    /// Päätöksen paikallinen tunniste (tiedon toimittajan)
+    /// </summary>
     public string FunderProjectNumber { get; set; }
 
     public string Acronym { get; set; }
@@ -65,12 +68,19 @@ public partial class DimFundingDecision
 
     public int DimRegisteredDataSourceId { get; set; }
 
+    /// <summary>
+    /// Rahoituspäätös - Päätöspaneeli
+    /// </summary>
+    public int? DimCallDecisionsId { get; set; }
+
     public virtual ICollection<BrFundingConsortiumParticipation> BrFundingConsortiumParticipations { get; set; } = new List<BrFundingConsortiumParticipation>();
 
     public virtual ICollection<BrParticipatesInFundingGroup> BrParticipatesInFundingGroups { get; set; } = new List<BrParticipatesInFundingGroup>();
 
     public virtual ICollection<BrWordClusterDimFundingDecision> BrWordClusterDimFundingDecisions { get; set; } = new List<BrWordClusterDimFundingDecision>();
 
+    public virtual DimCallDecision DimCallDecisions { get; set; }
+
     public virtual DimCallProgramme DimCallProgramme { get; set; }
 
     public virtual DimDate DimDateIdApprovalNavigation { get; set; }
@@ -87,11 +97,9 @@ public partial class DimFundingDecision
 
     public virtual DimOrganization DimOrganizationIdFunderNavigation { get; set; }
 
-    public virtual ICollection<DimPid> DimPids { get; set; } = new List<DimPid>();
-
     public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; }
 
-    public virtual DimTypeOfFunding DimTypeOfFunding { get; set; }
+    public virtual DimReferencedatum DimTypeOfFunding { get; set; }
 
     public virtual ICollection<DimWebLink> DimWebLinks { get; set; } = new List<DimWebLink>();
 
@@ -105,11 +113,7 @@ public partial class DimFundingDecision
 
     public virtual ICollection<DimFundingDecision> DimFundingDecisionFroms { get; set; } = new List<DimFundingDecision>();
 
-    public virtual ICollection<DimFundingDecision> DimFundingDecisionFromsNavigation { get; set; } = new List<DimFundingDecision>();
-
     public virtual ICollection<DimFundingDecision> DimFundingDecisionTos { get; set; } = new List<DimFundingDecision>();
 
-    public virtual ICollection<DimFundingDecision> DimFundingDecisionTosNavigation { get; set; } = new List<DimFundingDecision>();
-
     public virtual ICollection<DimKeyword> DimKeywords { get; set; } = new List<DimKeyword>();
 }

aspnetcore/src/api/Models/Ttv/DimName.cs

@@ -35,6 +35,8 @@ public partial class DimName
 
     public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; }
 
+    public virtual ICollection<DimResearchProject> DimResearchProjects { get; set; } = new List<DimResearchProject>();
+
     public virtual ICollection<FactContribution> FactContributions { get; set; } = new List<FactContribution>();
 
     public virtual ICollection<FactFieldValue> FactFieldValues { get; set; } = new List<FactFieldValue>();

aspnetcore/src/api/Models/Ttv/DimOrganization.cs

@@ -87,6 +87,8 @@ public partial class DimOrganization
 
     public virtual ICollection<DimResearchActivity> DimResearchActivities { get; set; } = new List<DimResearchActivity>();
 
+    public virtual ICollection<DimResearchProject> DimResearchProjects { get; set; } = new List<DimResearchProject>();
+
     public virtual DimSector DimSector { get; set; }
 
     public virtual ICollection<DimWebLink> DimWebLinks { get; set; } = new List<DimWebLink>();

aspnetcore/src/api/Models/Ttv/DimPid.cs

@@ -25,8 +25,6 @@ public partial class DimPid
 
     public int DimResearchDatasetId { get; set; }
 
-    public int DimFundingDecisionId { get; set; }
-
     public int DimResearchDataCatalogId { get; set; }
 
     public int DimResearchActivityId { get; set; }
@@ -47,9 +45,13 @@ public partial class DimPid
 
     public int? DimProfileOnlyFundingDecisionId { get; set; }
 
-    public virtual DimEvent DimEvent { get; set; }
+    public int? DimFundingDecisionId { get; set; }
+
+    public int? DimResearchProjectId { get; set; }
 
-    public virtual DimFundingDecision DimFundingDecision { get; set; }
+    public int? DimResearchCommunityId { get; set; }
+
+    public virtual DimEvent DimEvent { get; set; }
 
     public virtual DimInfrastructure DimInfrastructure { get; set; }
 
@@ -69,6 +71,8 @@ public partial class DimPid
 
     public virtual DimResearchActivity DimResearchActivity { get; set; }
 
+    public virtual DimResearchCommunity DimResearchCommunity { get; set; }
+
     public virtual DimResearchDataCatalog DimResearchDataCatalog { get; set; }
 
     public virtual DimResearchDataset DimResearchDataset { get; set; }

aspnetcore/src/api/Models/Ttv/DimReferencedatum.cs

@@ -35,8 +35,14 @@ public partial class DimReferencedatum
 
     public virtual ICollection<DimAffiliation> DimAffiliations { get; set; } = new List<DimAffiliation>();
 
+    public virtual ICollection<DimCallDecision> DimCallDecisions { get; set; } = new List<DimCallDecision>();
+
+    public virtual ICollection<DimCallProgramme> DimCallProgrammesNavigation { get; set; } = new List<DimCallProgramme>();
+
     public virtual ICollection<DimEducation> DimEducations { get; set; } = new List<DimEducation>();
 
+    public virtual ICollection<DimFundingDecision> DimFundingDecisions { get; set; } = new List<DimFundingDecision>();
+
     public virtual ICollection<DimLocallyReportedPubInfo> DimLocallyReportedPubInfoSelfArchivedLicenseCodeNavigations { get; set; } = new List<DimLocallyReportedPubInfo>();
 
     public virtual ICollection<DimLocallyReportedPubInfo> DimLocallyReportedPubInfoSelfArchivedVersionCodeNavigations { get; set; } = new List<DimLocallyReportedPubInfo>();

aspnetcore/src/api/Models/Ttv/DimRegisteredDataSource.cs

@@ -59,6 +59,8 @@ public partial class DimRegisteredDataSource
 
     public virtual ICollection<DimResearchDataset> DimResearchDatasets { get; set; } = new List<DimResearchDataset>();
 
+    public virtual ICollection<DimResearchProject> DimResearchProjects { get; set; } = new List<DimResearchProject>();
+
     public virtual ICollection<DimResearcherDescription> DimResearcherDescriptions { get; set; } = new List<DimResearcherDescription>();
 
     public virtual ICollection<DimResearcherToResearchCommunity> DimResearcherToResearchCommunities { get; set; } = new List<DimResearcherToResearchCommunity>();

aspnetcore/src/api/Models/Ttv/DimResearchCommunity.cs

@@ -33,6 +33,8 @@ public partial class DimResearchCommunity
 
     public int DimRegisteredDataSourceId { get; set; }
 
+    public virtual ICollection<DimPid> DimPids { get; set; } = new List<DimPid>();
+
     public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; }
 
     public virtual ICollection<DimResearcherToResearchCommunity> DimResearcherToResearchCommunities { get; set; } = new List<DimResearcherToResearchCommunity>();

aspnetcore/src/api/Models/Ttv/DimResearchProject.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+
+namespace api.Models.Ttv;
+
+public partial class DimResearchProject
+{
+    public int Id { get; set; }
+
+    /// <summary>
+    /// Hanke - vastuuorganisaatio
+    /// </summary>
+    public int ResponsibleOrganization { get; set; }
+
+    /// <summary>
+    /// Hanke - nimi
+    /// </summary>
+    public string NameFi { get; set; }
+
+    public string NameEn { get; set; }
+
+    public string NameSv { get; set; }
+
+    /// <summary>
+    /// Hanke - lyhenne
+    /// </summary>
+    public string AbbrevationFi { get; set; }
+
+    public string AbbrevationEn { get; set; }
+
+    public string AbbrevationSv { get; set; }
+
+    /// <summary>
+    /// Hanke - tiivistelmä
+    /// </summary>
+    public string SummaryFi { get; set; }
+
+    public string SummaryEn { get; set; }
+
+    public string SummarySv { get; set; }
+
+    /// <summary>
+    /// Hanke - lisätieto
+    /// </summary>
+    public string AdditionalInfromationFi { get; set; }
+
+    public string AdditionalInformationEn { get; set; }
+
+    public string AddtitionalInformationSv { get; set; }
+
+    /// <summary>
+    /// Hanke - alkamispäivämäärä
+    /// </summary>
+    public int? StartDate { get; set; }
+
+    /// <summary>
+    /// Hanke - päättymispäivämäärä
+    /// </summary>
+    public int? EndDate { get; set; }
+
+    public string SourceId { get; set; }
+
+    public string SourceDescription { get; set; }
+
+    public DateTime? Created { get; set; }
+
+    public DateTime? Modified { get; set; }
+
+    public int DimRegisteredDataSourceId { get; set; }
+
+    public int? ResponsiblePerson { get; set; }
+
+    public string GoalsFi { get; set; }
+
+    public string GoalsEn { get; set; }
+
+    public string GoalsSv { get; set; }
+
+    public string OutcomeEffectFi { get; set; }
+
+    public string OutcomeEffectEn { get; set; }
+
+    public string OutcomeEffectSv { get; set; }
+
+    public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; }
+
+    public virtual DimDate EndDateNavigation { get; set; }
+
+    public virtual DimOrganization ResponsibleOrganizationNavigation { get; set; }
+
+    public virtual DimName ResponsiblePersonNavigation { get; set; }
+
+    public virtual DimDate StartDateNavigation { get; set; }
+}

aspnetcore/src/api/Models/Ttv/DimTypeOfFunding.cs

@@ -25,8 +25,6 @@ public partial class DimTypeOfFunding
 
     public int DimTypeOfFundingId { get; set; }
 
-    public virtual ICollection<DimFundingDecision> DimFundingDecisions { get; set; } = new List<DimFundingDecision>();
-
     public virtual ICollection<DimProfileOnlyFundingDecision> DimProfileOnlyFundingDecisions { get; set; } = new List<DimProfileOnlyFundingDecision>();
 
     public virtual DimTypeOfFunding DimTypeOfFundingNavigation { get; set; }

aspnetcore/src/api/Models/Ttv/DimUserProfile.cs

@@ -33,6 +33,8 @@ public partial class DimUserProfile
 
     public bool Hidden { get; set; }
 
+    public bool PublishNewOrcidData { get; set; }
+
     public virtual ICollection<BrGrantedPermission> BrGrantedPermissions { get; set; } = new List<BrGrantedPermission>();
 
     public virtual ICollection<DimFieldDisplaySetting> DimFieldDisplaySettings { get; set; } = new List<DimFieldDisplaySetting>();

aspnetcore/src/api/Models/Ttv/DimWebLink.cs

@@ -47,6 +47,8 @@ public partial class DimWebLink
 
     public int? DimProfileOnlyFundingDecisionId { get; set; }
 
+    public int? DimResearchProjectId { get; set; }
+
     public virtual DimCallProgramme DimCallProgramme { get; set; }
 
     public virtual DimFundingDecision DimFundingDecision { get; set; }

aspnetcore/src/api/Models/Ttv/FactContribution.cs

@@ -43,6 +43,8 @@ public partial class FactContribution
 
     public DateTime? Modified { get; set; }
 
+    public int DimResearchProjectId { get; set; }
+
     public virtual DimDate DimDate { get; set; }
 
     public virtual DimFundingDecision DimFundingDecision { get; set; }