Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TTV model update 20.5.2024 #142

Merged
merged 3 commits into from
May 22, 2024
Merged

TTV model update 20.5.2024 #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d42c207
TTV model update 20.5.2024
sarkikos May 20, 2024
4300458
Add missing projection in FundingDecision mapper
sarkikos May 22, 2024
a7c9a1f
Fix error in FundingDecision indexer unit test
sarkikos May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
326 changes: 250 additions & 76 deletions aspnetcore/src/DatabaseContext/ApiDbContext.cs
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/DimCallDecision.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;

namespace CSC.PublicApi.DatabaseContext.Entities
{
/// <summary>
/// Rahoituspäätöspaneeli
/// </summary>
public partial class DimCallDecision
{
public DimCallDecision()
{
DimFundingDecisions = new HashSet<DimFundingDecision>();
}

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; } = null!;
public string? SourceId { get; set; }
public string? SourceDescription { get; set; }

public virtual DimReferencedatum DecisionMakerNavigation { get; set; } = null!;
public virtual DimCallProgramme DimCallProgramme { get; set; } = null!;
public virtual DimDate DimDateIdApprovalNavigation { get; set; } = null!;
public virtual ICollection<DimFundingDecision> DimFundingDecisions { get; set; }
}
}
8 changes: 8 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/DimCallProgramme.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ public partial class DimCallProgramme
{
public DimCallProgramme()
{
DimCallDecisions = new HashSet<DimCallDecision>();
DimFundingDecisions = new HashSet<DimFundingDecision>();
DimProfileOnlyFundingDecisions = new HashSet<DimProfileOnlyFundingDecision>();
DimWebLinks = new HashSet<DimWebLink>();
InverseDimCallProgrammeNavigation = new HashSet<DimCallProgramme>();
DimCallProgrammeId2s = new HashSet<DimCallProgramme>();
DimCallProgrammes = new HashSet<DimCallProgramme>();
DimOrganizations = new HashSet<DimOrganization>();
Expand Down Expand Up @@ -45,13 +47,19 @@ public DimCallProgramme()
public string? CallNameDetailsFi { get; set; }
public string? CallNameDetailsEn { get; set; }
public string? CallNameDetailsSv { get; set; }
public string? LocalIdentifier { get; set; }
public int? TypeOfFunding { get; set; }

public virtual DimCallProgramme? DimCallProgrammeNavigation { get; set; }
public virtual DimDate DimDateIdDueNavigation { get; set; } = null!;
public virtual DimDate DimDateIdOpenNavigation { get; set; } = null!;
public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } = null!;
public virtual DimReferencedatum? TypeOfFundingNavigation { get; set; }
public virtual ICollection<DimCallDecision> DimCallDecisions { get; set; }
public virtual ICollection<DimFundingDecision> DimFundingDecisions { get; set; }
public virtual ICollection<DimProfileOnlyFundingDecision> DimProfileOnlyFundingDecisions { get; set; }
public virtual ICollection<DimWebLink> DimWebLinks { get; set; }
public virtual ICollection<DimCallProgramme> InverseDimCallProgrammeNavigation { get; set; }

public virtual ICollection<DimCallProgramme> DimCallProgrammeId2s { get; set; }
public virtual ICollection<DimCallProgramme> DimCallProgrammes { get; set; }
Expand Down
6 changes: 6 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/DimDate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public DimDate()
{
DimAffiliationEndDateNavigations = new HashSet<DimAffiliation>();
DimAffiliationStartDateNavigations = new HashSet<DimAffiliation>();
DimCallDecisions = new HashSet<DimCallDecision>();
DimCallProgrammeDimDateIdDueNavigations = new HashSet<DimCallProgramme>();
DimCallProgrammeDimDateIdOpenNavigations = new HashSet<DimCallProgramme>();
DimEducationDimEndDateNavigations = new HashSet<DimEducation>();
Expand All @@ -25,6 +26,8 @@ public DimDate()
DimProfileOnlyResearchActivityDimDateIdStartNavigations = new HashSet<DimProfileOnlyResearchActivity>();
DimResearchActivityDimEndDateNavigations = new HashSet<DimResearchActivity>();
DimResearchActivityDimStartDateNavigations = new HashSet<DimResearchActivity>();
DimResearchProjectEndDateNavigations = new HashSet<DimResearchProject>();
DimResearchProjectStartDateNavigations = new HashSet<DimResearchProject>();
DimResearcherToResearchCommunityEndDateNavigations = new HashSet<DimResearcherToResearchCommunity>();
DimResearcherToResearchCommunityStartDateNavigations = new HashSet<DimResearcherToResearchCommunity>();
FactContributions = new HashSet<FactContribution>();
Expand All @@ -43,6 +46,7 @@ public DimDate()

public virtual ICollection<DimAffiliation> DimAffiliationEndDateNavigations { get; set; }
public virtual ICollection<DimAffiliation> DimAffiliationStartDateNavigations { get; set; }
public virtual ICollection<DimCallDecision> DimCallDecisions { get; set; }
public virtual ICollection<DimCallProgramme> DimCallProgrammeDimDateIdDueNavigations { get; set; }
public virtual ICollection<DimCallProgramme> DimCallProgrammeDimDateIdOpenNavigations { get; set; }
public virtual ICollection<DimEducation> DimEducationDimEndDateNavigations { get; set; }
Expand All @@ -59,6 +63,8 @@ public DimDate()
public virtual ICollection<DimProfileOnlyResearchActivity> DimProfileOnlyResearchActivityDimDateIdStartNavigations { get; set; }
public virtual ICollection<DimResearchActivity> DimResearchActivityDimEndDateNavigations { get; set; }
public virtual ICollection<DimResearchActivity> DimResearchActivityDimStartDateNavigations { get; set; }
public virtual ICollection<DimResearchProject> DimResearchProjectEndDateNavigations { get; set; }
public virtual ICollection<DimResearchProject> DimResearchProjectStartDateNavigations { get; set; }
public virtual ICollection<DimResearcherToResearchCommunity> DimResearcherToResearchCommunityEndDateNavigations { get; set; }
public virtual ICollection<DimResearcherToResearchCommunity> DimResearcherToResearchCommunityStartDateNavigations { get; set; }
public virtual ICollection<FactContribution> FactContributions { get; set; }
Expand Down
16 changes: 9 additions & 7 deletions aspnetcore/src/DatabaseContext/Entities/DimFundingDecision.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@ public DimFundingDecision()
BrFundingConsortiumParticipations = new HashSet<BrFundingConsortiumParticipation>();
BrParticipatesInFundingGroups = new HashSet<BrParticipatesInFundingGroup>();
BrWordClusterDimFundingDecisions = new HashSet<BrWordClusterDimFundingDecision>();
DimPids = new HashSet<DimPid>();
DimWebLinks = new HashSet<DimWebLink>();
FactContributions = new HashSet<FactContribution>();
FactDimReferencedataFieldOfSciences = new HashSet<FactDimReferencedataFieldOfScience>();
FactFieldValues = new HashSet<FactFieldValue>();
InverseDimFundingDecisionIdParentDecisionNavigation = new HashSet<DimFundingDecision>();
DimFundingDecisionFroms = new HashSet<DimFundingDecision>();
DimFundingDecisionFromsNavigation = new HashSet<DimFundingDecision>();
DimFundingDecisionTos = new HashSet<DimFundingDecision>();
DimFundingDecisionTosNavigation = new HashSet<DimFundingDecision>();
DimKeywords = new HashSet<DimKeyword>();
}

Expand All @@ -34,6 +31,9 @@ public DimFundingDecision()
public int? DimOrganizationIdFunder { get; set; }
public string? DimPidPidContent { get; set; }
public int DimFundingDecisionIdParentDecision { get; set; }
/// <summary>
/// Päätöksen paikallinen tunniste (tiedon toimittajan)
/// </summary>
public string? FunderProjectNumber { get; set; }
public string? Acronym { get; set; }
public string? NameFi { get; set; }
Expand All @@ -53,7 +53,12 @@ public DimFundingDecision()
public DateTime? Created { get; set; }
public DateTime? Modified { get; set; }
public int DimRegisteredDataSourceId { get; set; }
/// <summary>
/// Rahoituspäätös - Päätöspaneeli
/// </summary>
public int? DimCallDecisionsId { get; set; }

public virtual DimCallDecision? DimCallDecisions { get; set; }
public virtual DimCallProgramme DimCallProgramme { get; set; } = null!;
public virtual DimDate DimDateIdApprovalNavigation { get; set; } = null!;
public virtual DimDate DimDateIdEndNavigation { get; set; } = null!;
Expand All @@ -63,21 +68,18 @@ public DimFundingDecision()
public virtual DimName DimNameIdContactPersonNavigation { get; set; } = null!;
public virtual DimOrganization? DimOrganizationIdFunderNavigation { get; set; }
public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } = null!;
public virtual DimTypeOfFunding DimTypeOfFunding { get; set; } = null!;
public virtual DimReferencedatum DimTypeOfFunding { get; set; } = null!;
public virtual ICollection<BrFundingConsortiumParticipation> BrFundingConsortiumParticipations { get; set; }
public virtual ICollection<BrParticipatesInFundingGroup> BrParticipatesInFundingGroups { get; set; }
public virtual ICollection<BrWordClusterDimFundingDecision> BrWordClusterDimFundingDecisions { get; set; }
public virtual ICollection<DimPid> DimPids { get; set; }
public virtual ICollection<DimWebLink> DimWebLinks { get; set; }
public virtual ICollection<FactContribution> FactContributions { get; set; }
public virtual ICollection<FactDimReferencedataFieldOfScience> FactDimReferencedataFieldOfSciences { get; set; }
public virtual ICollection<FactFieldValue> FactFieldValues { get; set; }
public virtual ICollection<DimFundingDecision> InverseDimFundingDecisionIdParentDecisionNavigation { get; set; }

public virtual ICollection<DimFundingDecision> DimFundingDecisionFroms { get; set; }
public virtual ICollection<DimFundingDecision> DimFundingDecisionFromsNavigation { get; set; }
public virtual ICollection<DimFundingDecision> DimFundingDecisionTos { get; set; }
public virtual ICollection<DimFundingDecision> DimFundingDecisionTosNavigation { get; set; }
public virtual ICollection<DimKeyword> DimKeywords { get; set; }
}
}
2 changes: 2 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/DimName.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public DimName()
{
BrParticipatesInFundingGroups = new HashSet<BrParticipatesInFundingGroup>();
DimFundingDecisions = new HashSet<DimFundingDecision>();
DimResearchProjects = new HashSet<DimResearchProject>();
FactContributions = new HashSet<FactContribution>();
FactFieldValues = new HashSet<FactFieldValue>();
}
Expand All @@ -29,6 +30,7 @@ public DimName()
public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } = null!;
public virtual ICollection<BrParticipatesInFundingGroup> BrParticipatesInFundingGroups { get; set; }
public virtual ICollection<DimFundingDecision> DimFundingDecisions { get; set; }
public virtual ICollection<DimResearchProject> DimResearchProjects { get; set; }
public virtual ICollection<FactContribution> FactContributions { get; set; }
public virtual ICollection<FactFieldValue> FactFieldValues { get; set; }
}
Expand Down
2 changes: 2 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/DimOrganization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public DimOrganization()
DimPurposes = new HashSet<DimPurpose>();
DimRegisteredDataSources = new HashSet<DimRegisteredDataSource>();
DimResearchActivities = new HashSet<DimResearchActivity>();
DimResearchProjects = new HashSet<DimResearchProject>();
DimWebLinks = new HashSet<DimWebLink>();
FactContributions = new HashSet<FactContribution>();
FactUpkeeps = new HashSet<FactUpkeep>();
Expand Down Expand Up @@ -72,6 +73,7 @@ public DimOrganization()
public virtual ICollection<DimPurpose> DimPurposes { get; set; }
public virtual ICollection<DimRegisteredDataSource> DimRegisteredDataSources { get; set; }
public virtual ICollection<DimResearchActivity> DimResearchActivities { get; set; }
public virtual ICollection<DimResearchProject> DimResearchProjects { get; set; }
public virtual ICollection<DimWebLink> DimWebLinks { get; set; }
public virtual ICollection<FactContribution> FactContributions { get; set; }
public virtual ICollection<FactUpkeep> FactUpkeeps { get; set; }
Expand Down
5 changes: 3 additions & 2 deletions aspnetcore/src/DatabaseContext/Entities/DimPid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public DimPid()
public int DimInfrastructureId { get; set; }
public int DimPublicationChannelId { get; set; }
public int DimResearchDatasetId { get; set; }
public int DimFundingDecisionId { get; set; }
public int DimResearchDataCatalogId { get; set; }
public int DimResearchActivityId { get; set; }
public int DimEventId { get; set; }
Expand All @@ -32,9 +31,10 @@ public DimPid()
public DateTime? Modified { get; set; }
public int? DimProfileOnlyDatasetId { get; set; }
public int? DimProfileOnlyFundingDecisionId { get; set; }
public int? DimResearchProjectId { get; set; }
public int? DimResearchCommunityId { get; set; }

public virtual DimEvent DimEvent { get; set; } = null!;
public virtual DimFundingDecision DimFundingDecision { get; set; } = null!;
public virtual DimInfrastructure DimInfrastructure { get; set; } = null!;
public virtual DimKnownPerson DimKnownPerson { get; set; } = null!;
public virtual DimOrganization DimOrganization { get; set; } = null!;
Expand All @@ -44,6 +44,7 @@ public DimPid()
public virtual DimPublication DimPublication { get; set; } = null!;
public virtual DimPublicationChannel DimPublicationChannel { get; set; } = null!;
public virtual DimResearchActivity DimResearchActivity { get; set; } = null!;
public virtual DimResearchCommunity? DimResearchCommunity { get; set; }
public virtual DimResearchDataCatalog DimResearchDataCatalog { get; set; } = null!;
public virtual DimResearchDataset DimResearchDataset { get; set; } = null!;
public virtual DimService DimService { get; set; } = null!;
Expand Down
6 changes: 6 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/DimReferencedatum.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ public DimReferencedatum()
{
BrGrantedPermissions = new HashSet<BrGrantedPermission>();
DimAffiliations = new HashSet<DimAffiliation>();
DimCallDecisions = new HashSet<DimCallDecision>();
DimCallProgrammesNavigation = new HashSet<DimCallProgramme>();
DimEducations = new HashSet<DimEducation>();
DimFundingDecisions = new HashSet<DimFundingDecision>();
DimLocallyReportedPubInfoSelfArchivedLicenseCodeNavigations = new HashSet<DimLocallyReportedPubInfo>();
DimLocallyReportedPubInfoSelfArchivedVersionCodeNavigations = new HashSet<DimLocallyReportedPubInfo>();
DimProfileOnlyDatasets = new HashSet<DimProfileOnlyDataset>();
Expand Down Expand Up @@ -65,7 +68,10 @@ public DimReferencedatum()
public virtual DimReferencedatum DimReferencedata { get; set; } = null!;
public virtual ICollection<BrGrantedPermission> BrGrantedPermissions { get; set; }
public virtual ICollection<DimAffiliation> DimAffiliations { get; set; }
public virtual ICollection<DimCallDecision> DimCallDecisions { get; set; }
public virtual ICollection<DimCallProgramme> DimCallProgrammesNavigation { get; set; }
public virtual ICollection<DimEducation> DimEducations { get; set; }
public virtual ICollection<DimFundingDecision> DimFundingDecisions { get; set; }
public virtual ICollection<DimLocallyReportedPubInfo> DimLocallyReportedPubInfoSelfArchivedLicenseCodeNavigations { get; set; }
public virtual ICollection<DimLocallyReportedPubInfo> DimLocallyReportedPubInfoSelfArchivedVersionCodeNavigations { get; set; }
public virtual ICollection<DimProfileOnlyDataset> DimProfileOnlyDatasets { get; set; }
Expand Down
2 changes: 2 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/DimRegisteredDataSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public DimRegisteredDataSource()
DimResearchActivities = new HashSet<DimResearchActivity>();
DimResearchCommunities = new HashSet<DimResearchCommunity>();
DimResearchDatasets = new HashSet<DimResearchDataset>();
DimResearchProjects = new HashSet<DimResearchProject>();
DimResearcherDescriptions = new HashSet<DimResearcherDescription>();
DimResearcherToResearchCommunities = new HashSet<DimResearcherToResearchCommunity>();
DimTelephoneNumbers = new HashSet<DimTelephoneNumber>();
Expand Down Expand Up @@ -62,6 +63,7 @@ public DimRegisteredDataSource()
public virtual ICollection<DimResearchActivity> DimResearchActivities { get; set; }
public virtual ICollection<DimResearchCommunity> DimResearchCommunities { get; set; }
public virtual ICollection<DimResearchDataset> DimResearchDatasets { get; set; }
public virtual ICollection<DimResearchProject> DimResearchProjects { get; set; }
public virtual ICollection<DimResearcherDescription> DimResearcherDescriptions { get; set; }
public virtual ICollection<DimResearcherToResearchCommunity> DimResearcherToResearchCommunities { get; set; }
public virtual ICollection<DimTelephoneNumber> DimTelephoneNumbers { get; set; }
Expand Down
2 changes: 2 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/DimResearchCommunity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public partial class DimResearchCommunity
{
public DimResearchCommunity()
{
DimPids = new HashSet<DimPid>();
DimResearcherToResearchCommunities = new HashSet<DimResearcherToResearchCommunity>();
DimWebLinks = new HashSet<DimWebLink>();
FactContributions = new HashSet<FactContribution>();
Expand All @@ -29,6 +30,7 @@ public DimResearchCommunity()
public int DimRegisteredDataSourceId { get; set; }

public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } = null!;
public virtual ICollection<DimPid> DimPids { get; set; }
public virtual ICollection<DimResearcherToResearchCommunity> DimResearcherToResearchCommunities { get; set; }
public virtual ICollection<DimWebLink> DimWebLinks { get; set; }
public virtual ICollection<FactContribution> FactContributions { get; set; }
Expand Down
Loading
Loading