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.

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

CSCTTV-4140 TTV model update #174

Merged
merged 1 commit into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
333 changes: 224 additions & 109 deletions aspnetcore/src/DatabaseContext/ApiDbContext.cs

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public partial class BrParticipatesInFundingGroup
{
public int DimFundingDecisionid { get; set; }

public int DimNameId { get; set; }
public long DimNameId { get; set; }

public int DimOrganizationId { get; set; }

Expand Down
4 changes: 4 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/DimDate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ public partial class DimDate

public virtual ICollection<DimCallProgramme> DimCallProgrammeDimDateIdOpenNavigations { get; set; } = new List<DimCallProgramme>();

public virtual ICollection<DimDescriptiveItem> DimDescriptiveItemDimEndDateNavigations { get; set; } = new List<DimDescriptiveItem>();

public virtual ICollection<DimDescriptiveItem> DimDescriptiveItemDimStartDateNavigations { get; set; } = new List<DimDescriptiveItem>();

public virtual ICollection<DimEducation> DimEducationDimEndDateNavigations { get; set; } = new List<DimEducation>();

public virtual ICollection<DimEducation> DimEducationDimStartDateNavigations { get; set; } = new List<DimEducation>();
Expand Down
80 changes: 80 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/DimDescriptiveItem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
using System;
using System.Collections.Generic;

namespace CSC.PublicApi.DatabaseContext.Entities;

/// <summary>
/// https://iri.suomi.fi/model/researchfi_core_project/
/// Projektin kuvailutiedot ajassa
/// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time
/// </summary>
public partial class DimDescriptiveItem
{
public int Id { get; set; }

/// <summary>
/// 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
/// </summary>
public int DimResearchProjectId { get; set; }

/// <summary>
/// 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ä
/// </summary>
public int DimStartDate { get; set; }

/// <summary>
/// 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ä
/// </summary>
public int? DimEndDate { get; set; }

/// <summary>
/// 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ö
/// </summary>
public string? DescriptiveItem { get; set; }

/// <summary>
/// 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
/// </summary>
public string DescriptiveItemType { get; set; } = null!;

/// <summary>
/// fi, en, sv, NULL
/// </summary>
public string? DescriptiveItemLanguage { get; set; }

public string SourceId { get; set; } = null!;

public string? SourceDescription { get; set; }

public DateTime? Created { get; set; }

public DateTime? Modified { get; set; }

public int DimRegisteredDataSourceId { get; set; }

public virtual DimDate? DimEndDateNavigation { get; set; }

public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } = null!;

public virtual DimResearchProject DimResearchProject { get; set; } = null!;

public virtual DimDate DimStartDateNavigation { get; set; } = null!;
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public partial class DimFundingDecision

public int DimDateIdEnd { get; set; }

public int DimNameIdContactPerson { get; set; }
public long DimNameIdContactPerson { get; set; }

public int DimCallProgrammeId { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion aspnetcore/src/DatabaseContext/Entities/DimName.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace CSC.PublicApi.DatabaseContext.Entities;

public partial class DimName
{
public int Id { get; set; }
public long Id { get; set; }

public string? LastName { get; set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public partial class DimRegisteredDataSource

public virtual ICollection<DimCompetence> DimCompetences { get; set; } = new List<DimCompetence>();

public virtual ICollection<DimDescriptiveItem> DimDescriptiveItems { get; set; } = new List<DimDescriptiveItem>();

public virtual ICollection<DimEducation> DimEducations { get; set; } = new List<DimEducation>();

public virtual ICollection<DimEmailAddrress> DimEmailAddrresses { get; set; } = new List<DimEmailAddrress>();
Expand Down
43 changes: 3 additions & 40 deletions aspnetcore/src/DatabaseContext/Entities/DimResearchProject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,6 @@ public partial class DimResearchProject
/// </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? DescriptionFi { get; set; }

public string? DescriptionEn { get; set; }

public string? DescriptionSv { get; set; }

/// <summary>
/// Hanke - alkamispäivämäärä
/// </summary>
Expand All @@ -59,27 +32,17 @@ public partial class DimResearchProject

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 long ResponsiblePerson { get; set; }

public string? OutcomeEffectSv { get; set; }
public virtual ICollection<DimDescriptiveItem> DimDescriptiveItems { get; set; } = new List<DimDescriptiveItem>();

public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } = null!;

public virtual DimDate? EndDateNavigation { get; set; }

public virtual DimOrganization ResponsibleOrganizationNavigation { get; set; } = null!;

public virtual DimName? ResponsiblePersonNavigation { get; set; }
public virtual DimName ResponsiblePersonNavigation { get; set; } = null!;

public virtual DimDate? StartDateNavigation { get; set; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public partial class FactContribution

public int DimDateId { get; set; }

public int DimNameId { get; set; }
public long DimNameId { get; set; }

public int DimPublicationId { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion aspnetcore/src/DatabaseContext/Entities/FactFieldValue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public partial class FactFieldValue

public int DimFieldDisplaySettingsId { get; set; }

public int DimNameId { get; set; }
public long DimNameId { get; set; }

public int DimWebLinkId { get; set; }

Expand Down
75 changes: 75 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/FactFieldValuesTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
using System;
using System.Collections.Generic;

namespace CSC.PublicApi.DatabaseContext.Entities;

public partial class FactFieldValuesTest
{
public int DimUserProfileId { get; set; }

public int DimFieldDisplaySettingsId { get; set; }

public long DimNameId { get; set; }

public int DimWebLinkId { get; set; }

public int DimFundingDecisionId { get; set; }

public int DimPublicationId { get; set; }

public int DimPidId { get; set; }

public int DimPidIdOrcidPutCode { get; set; }

public int DimResearchActivityId { get; set; }

public int DimEventId { get; set; }

public int DimEducationId { get; set; }

public int DimCompetenceId { get; set; }

public int DimResearchCommunityId { get; set; }

public int DimTelephoneNumberId { get; set; }

public int DimEmailAddrressId { get; set; }

public int DimResearcherDescriptionId { get; set; }

public int DimIdentifierlessDataId { get; set; }

public int DimProfileOnlyPublicationId { get; set; }

public int DimKeywordId { get; set; }

public int DimAffiliationId { get; set; }

public int DimResearcherToResearchCommunityId { get; set; }

public bool? Show { get; set; }

public bool? PrimaryValue { get; set; }

public string SourceId { get; set; } = null!;

public string? SourceDescription { get; set; }

public DateTime? Created { get; set; }

public DateTime? Modified { get; set; }

public int DimResearchDatasetId { get; set; }

public int DimRegisteredDataSourceId { get; set; }

public int DimReferencedataFieldOfScienceId { get; set; }

public int DimProfileOnlyResearchActivityId { get; set; }

public int DimReferencedataActorRoleId { get; set; }

public int DimProfileOnlyDatasetId { get; set; }

public int DimProfileOnlyFundingDecisionId { get; set; }
}
19 changes: 19 additions & 0 deletions aspnetcore/src/DatabaseContext/Entities/FactKeyword.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;

namespace CSC.PublicApi.DatabaseContext.Entities;

public partial class FactKeyword
{
public int DimKeywordId { get; set; }

public int DimResearchProjectId { get; set; }

public string SourceId { get; set; } = null!;

public string SourceDescription { get; set; } = null!;

public DateTime? Created { get; set; }

public DateTime? Modified { get; set; }
}
2 changes: 1 addition & 1 deletion aspnetcore/src/Service.Models/Publication/Name.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public class Name
{
public int NameId { get; set; }
public long NameId { get; set; }

public string? FirstNames { get; set; }

Expand Down
Loading