Skip to content

Commit 323c5cf

Browse files
sarkikossarkikos
authored
Merge pull request #174 from CSCfi/CSCTTV-4140-ttv-mode-update-2025_01
CSCTTV-4140 TTV model update
2 parents 09b9e51 + 7c479b6 commit 323c5cf

13 files changed

+413
-155
lines changed

‎aspnetcore/src/DatabaseContext/ApiDbContext.cs

+224-109
Large diffs are not rendered by default.

‎aspnetcore/src/DatabaseContext/Entities/BrParticipatesInFundingGroup.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public partial class BrParticipatesInFundingGroup
77
{
88
public int DimFundingDecisionid { get; set; }
99

10-
public int DimNameId { get; set; }
10+
public long DimNameId { get; set; }
1111

1212
public int DimOrganizationId { get; set; }
1313

‎aspnetcore/src/DatabaseContext/Entities/DimDate.cs

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ public partial class DimDate
3131

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

34+
public virtual ICollection<DimDescriptiveItem> DimDescriptiveItemDimEndDateNavigations { get; set; } = new List<DimDescriptiveItem>();
35+
36+
public virtual ICollection<DimDescriptiveItem> DimDescriptiveItemDimStartDateNavigations { get; set; } = new List<DimDescriptiveItem>();
37+
3438
public virtual ICollection<DimEducation> DimEducationDimEndDateNavigations { get; set; } = new List<DimEducation>();
3539

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

‎aspnetcore/src/DatabaseContext/Entities/DimDescriptiveItem.cs

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace CSC.PublicApi.DatabaseContext.Entities;
5+
6+
/// <summary>
7+
/// https://iri.suomi.fi/model/researchfi_core_project/
8+
/// Projektin kuvailutiedot ajassa
9+
/// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time
10+
/// </summary>
11+
public partial class DimDescriptiveItem
12+
{
13+
public int Id { get; set; }
14+
15+
/// <summary>
16+
/// https://iri.suomi.fi/model/researchfi_core_project/
17+
/// Projektin kuvailutiedot ajassa
18+
/// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time
19+
/// - liittyy projektiin
20+
/// </summary>
21+
public int DimResearchProjectId { get; set; }
22+
23+
/// <summary>
24+
/// https://iri.suomi.fi/model/researchfi_core_project/
25+
/// Projektin kuvailutiedot ajassa
26+
/// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time
27+
/// * alkamispäivämäärä
28+
/// </summary>
29+
public int DimStartDate { get; set; }
30+
31+
/// <summary>
32+
/// https://iri.suomi.fi/model/researchfi_core_project/
33+
/// Projektin kuvailutiedot ajassa
34+
/// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time
35+
/// * päättymispäivämäärä
36+
/// </summary>
37+
public int? DimEndDate { get; set; }
38+
39+
/// <summary>
40+
/// https://iri.suomi.fi/model/researchfi_core_project/
41+
/// Projektin kuvailutiedot ajassa
42+
/// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_in_time
43+
/// * kuvailutiedon sisältö
44+
/// </summary>
45+
public string? DescriptiveItem { get; set; }
46+
47+
/// <summary>
48+
/// https://iri.suomi.fi/model/researchfi_core_project/
49+
/// https://iri.suomi.fi/model/researchfi_core_project/cl_project_descriptive_type
50+
/// - description
51+
/// - name
52+
/// - goal
53+
/// - outcome_effect
54+
/// - abberviation
55+
/// </summary>
56+
public string DescriptiveItemType { get; set; } = null!;
57+
58+
/// <summary>
59+
/// fi, en, sv, NULL
60+
/// </summary>
61+
public string? DescriptiveItemLanguage { get; set; }
62+
63+
public string SourceId { get; set; } = null!;
64+
65+
public string? SourceDescription { get; set; }
66+
67+
public DateTime? Created { get; set; }
68+
69+
public DateTime? Modified { get; set; }
70+
71+
public int DimRegisteredDataSourceId { get; set; }
72+
73+
public virtual DimDate? DimEndDateNavigation { get; set; }
74+
75+
public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } = null!;
76+
77+
public virtual DimResearchProject DimResearchProject { get; set; } = null!;
78+
79+
public virtual DimDate DimStartDateNavigation { get; set; } = null!;
80+
}

‎aspnetcore/src/DatabaseContext/Entities/DimFundingDecision.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public partial class DimFundingDecision
1313

1414
public int DimDateIdEnd { get; set; }
1515

16-
public int DimNameIdContactPerson { get; set; }
16+
public long DimNameIdContactPerson { get; set; }
1717

1818
public int DimCallProgrammeId { get; set; }
1919

‎aspnetcore/src/DatabaseContext/Entities/DimName.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace CSC.PublicApi.DatabaseContext.Entities;
55

66
public partial class DimName
77
{
8-
public int Id { get; set; }
8+
public long Id { get; set; }
99

1010
public string? LastName { get; set; }
1111

‎aspnetcore/src/DatabaseContext/Entities/DimRegisteredDataSource.cs

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public partial class DimRegisteredDataSource
2525

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

28+
public virtual ICollection<DimDescriptiveItem> DimDescriptiveItems { get; set; } = new List<DimDescriptiveItem>();
29+
2830
public virtual ICollection<DimEducation> DimEducations { get; set; } = new List<DimEducation>();
2931

3032
public virtual ICollection<DimEmailAddrress> DimEmailAddrresses { get; set; } = new List<DimEmailAddrress>();

‎aspnetcore/src/DatabaseContext/Entities/DimResearchProject.cs

+3-40
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,6 @@ public partial class DimResearchProject
1212
/// </summary>
1313
public int ResponsibleOrganization { get; set; }
1414

15-
/// <summary>
16-
/// Hanke - nimi
17-
/// </summary>
18-
public string? NameFi { get; set; }
19-
20-
public string? NameEn { get; set; }
21-
22-
public string? NameSv { get; set; }
23-
24-
/// <summary>
25-
/// Hanke - lyhenne
26-
/// </summary>
27-
public string? AbbrevationFi { get; set; }
28-
29-
public string? AbbrevationEn { get; set; }
30-
31-
public string? AbbrevationSv { get; set; }
32-
33-
/// <summary>
34-
/// Hanke - tiivistelmä
35-
/// </summary>
36-
public string? DescriptionFi { get; set; }
37-
38-
public string? DescriptionEn { get; set; }
39-
40-
public string? DescriptionSv { get; set; }
41-
4215
/// <summary>
4316
/// Hanke - alkamispäivämäärä
4417
/// </summary>
@@ -59,27 +32,17 @@ public partial class DimResearchProject
5932

6033
public int DimRegisteredDataSourceId { get; set; }
6134

62-
public int? ResponsiblePerson { get; set; }
63-
64-
public string? GoalsFi { get; set; }
65-
66-
public string? GoalsEn { get; set; }
67-
68-
public string? GoalsSv { get; set; }
69-
70-
public string? OutcomeEffectFi { get; set; }
71-
72-
public string? OutcomeEffectEn { get; set; }
35+
public long ResponsiblePerson { get; set; }
7336

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

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

7841
public virtual DimDate? EndDateNavigation { get; set; }
7942

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

82-
public virtual DimName? ResponsiblePersonNavigation { get; set; }
45+
public virtual DimName ResponsiblePersonNavigation { get; set; } = null!;
8346

8447
public virtual DimDate? StartDateNavigation { get; set; }
8548
}

‎aspnetcore/src/DatabaseContext/Entities/FactContribution.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public partial class FactContribution
1111

1212
public int DimDateId { get; set; }
1313

14-
public int DimNameId { get; set; }
14+
public long DimNameId { get; set; }
1515

1616
public int DimPublicationId { get; set; }
1717

‎aspnetcore/src/DatabaseContext/Entities/FactFieldValue.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public partial class FactFieldValue
99

1010
public int DimFieldDisplaySettingsId { get; set; }
1111

12-
public int DimNameId { get; set; }
12+
public long DimNameId { get; set; }
1313

1414
public int DimWebLinkId { get; set; }
1515

‎aspnetcore/src/DatabaseContext/Entities/FactFieldValuesTest.cs

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace CSC.PublicApi.DatabaseContext.Entities;
5+
6+
public partial class FactFieldValuesTest
7+
{
8+
public int DimUserProfileId { get; set; }
9+
10+
public int DimFieldDisplaySettingsId { get; set; }
11+
12+
public long DimNameId { get; set; }
13+
14+
public int DimWebLinkId { get; set; }
15+
16+
public int DimFundingDecisionId { get; set; }
17+
18+
public int DimPublicationId { get; set; }
19+
20+
public int DimPidId { get; set; }
21+
22+
public int DimPidIdOrcidPutCode { get; set; }
23+
24+
public int DimResearchActivityId { get; set; }
25+
26+
public int DimEventId { get; set; }
27+
28+
public int DimEducationId { get; set; }
29+
30+
public int DimCompetenceId { get; set; }
31+
32+
public int DimResearchCommunityId { get; set; }
33+
34+
public int DimTelephoneNumberId { get; set; }
35+
36+
public int DimEmailAddrressId { get; set; }
37+
38+
public int DimResearcherDescriptionId { get; set; }
39+
40+
public int DimIdentifierlessDataId { get; set; }
41+
42+
public int DimProfileOnlyPublicationId { get; set; }
43+
44+
public int DimKeywordId { get; set; }
45+
46+
public int DimAffiliationId { get; set; }
47+
48+
public int DimResearcherToResearchCommunityId { get; set; }
49+
50+
public bool? Show { get; set; }
51+
52+
public bool? PrimaryValue { get; set; }
53+
54+
public string SourceId { get; set; } = null!;
55+
56+
public string? SourceDescription { get; set; }
57+
58+
public DateTime? Created { get; set; }
59+
60+
public DateTime? Modified { get; set; }
61+
62+
public int DimResearchDatasetId { get; set; }
63+
64+
public int DimRegisteredDataSourceId { get; set; }
65+
66+
public int DimReferencedataFieldOfScienceId { get; set; }
67+
68+
public int DimProfileOnlyResearchActivityId { get; set; }
69+
70+
public int DimReferencedataActorRoleId { get; set; }
71+
72+
public int DimProfileOnlyDatasetId { get; set; }
73+
74+
public int DimProfileOnlyFundingDecisionId { get; set; }
75+
}

‎aspnetcore/src/DatabaseContext/Entities/FactKeyword.cs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace CSC.PublicApi.DatabaseContext.Entities;
5+
6+
public partial class FactKeyword
7+
{
8+
public int DimKeywordId { get; set; }
9+
10+
public int DimResearchProjectId { get; set; }
11+
12+
public string SourceId { get; set; } = null!;
13+
14+
public string SourceDescription { get; set; } = null!;
15+
16+
public DateTime? Created { get; set; }
17+
18+
public DateTime? Modified { get; set; }
19+
}

‎aspnetcore/src/Service.Models/Publication/Name.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public class Name
44
{
5-
public int NameId { get; set; }
5+
public long NameId { get; set; }
66

77
public string? FirstNames { get; set; }
88

0 commit comments

Comments
 (0)