Skip to content

Commit b8daab4

Browse files
Ttv model update 20260313 (#259)
* ttv-model-update-20260313 * Refactor InfrastructureProfile mapping and remove unused UpdatePidQueue entity --------- Co-authored-by: Timo Särkikoski <sarkikos@gmail.com>
1 parent 618dd64 commit b8daab4

26 files changed

Lines changed: 255 additions & 383 deletions

aspnetcore/src/DatabaseContext/ApiDbContext.cs

Lines changed: 178 additions & 228 deletions
Large diffs are not rendered by default.

aspnetcore/src/DatabaseContext/Entities/DimAddress.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,14 @@ public partial class DimAddress
1717

1818
public string? PostalCode { get; set; }
1919

20-
/// <summary>
21-
/// https://iri.suomi.fi/model/researchfi_core/locality
22-
/// </summary>
2320
public string? LocalityFi { get; set; }
2421

25-
/// <summary>
26-
/// https://iri.suomi.fi/model/researchfi_core/locality
27-
/// </summary>
2822
public string? LocalitySv { get; set; }
2923

30-
/// <summary>
31-
/// https://iri.suomi.fi/model/researchfi_core/locality
32-
/// </summary>
3324
public string? LocalityEn { get; set; }
3425

35-
public int CountryCode { get; set; }
26+
public int? CountryCode { get; set; }
3627

37-
/// <summary>
38-
/// visiting_address
39-
/// </summary>
4028
public string AddressType { get; set; } = null!;
4129

4230
public string? SourceId { get; set; }
@@ -47,7 +35,7 @@ public partial class DimAddress
4735

4836
public DateTime? Modified { get; set; }
4937

50-
public virtual DimReferencedatum CountryCodeNavigation { get; set; } = null!;
38+
public virtual DimReferencedatum? CountryCodeNavigation { get; set; }
5139

5240
public virtual DimContactInformation DimContactInformation { get; set; } = null!;
5341
}

aspnetcore/src/DatabaseContext/Entities/DimCallDecision.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33

44
namespace CSC.PublicApi.DatabaseContext.Entities;
55

6-
/// <summary>
7-
/// Rahoituspäätöspaneeli
8-
/// </summary>
96
public partial class DimCallDecision
107
{
118
public int Id { get; set; }
@@ -16,9 +13,6 @@ public partial class DimCallDecision
1613

1714
public int DimCallProgrammeId { get; set; }
1815

19-
/// <summary>
20-
/// Rahoituspäätöspaneeli - Haun vaihe
21-
/// </summary>
2216
public string CallProcessingPhase { get; set; } = null!;
2317

2418
public string? SourceId { get; set; }

aspnetcore/src/DatabaseContext/Entities/DimContactInformation.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,14 @@
33

44
namespace CSC.PublicApi.DatabaseContext.Entities;
55

6-
/// <summary>
7-
/// https://iri.suomi.fi/model/researchfi_core/contact_information
8-
/// https://iri.suomi.fi/model/researchfi_core/contact_point
9-
/// </summary>
106
public partial class DimContactInformation
117
{
128
public int Id { get; set; }
139

14-
/// <summary>
15-
/// https://iri.suomi.fi/model/researchfi_core_agent/contact_name
16-
/// </summary>
1710
public string ContactLabel { get; set; } = null!;
1811

19-
/// <summary>
20-
/// https://iri.suomi.fi/model/researchfi_core/infraIsContactedVia
21-
/// </summary>
2212
public int DimInfrastructureId { get; set; }
2313

24-
/// <summary>
25-
/// https://iri.suomi.fi/model/researchfi_core/serviceIsContactedVia
26-
/// </summary>
2714
public int DimServiceId { get; set; }
2815

2916
public string? SourceId { get; set; }

aspnetcore/src/DatabaseContext/Entities/DimDescriptiveItem.cs

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,19 @@
33

44
namespace CSC.PublicApi.DatabaseContext.Entities;
55

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>
116
public partial class DimDescriptiveItem
127
{
138
public int Id { get; set; }
149

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>
2910
public int DimStartDate { get; set; }
3011

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>
3712
public int? DimEndDate { get; set; }
3813

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>
4514
public string DescriptiveItem { get; set; } = null!;
4615

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

58-
/// <summary>
59-
/// fi, en, sv, NULL
60-
/// </summary>
61-
public string? DescriptiveItemLanguage { get; set; }
18+
public string DescriptiveItemLanguage { get; set; } = null!;
6219

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

@@ -68,6 +25,8 @@ public partial class DimDescriptiveItem
6825

6926
public DateTime? Modified { get; set; }
7027

28+
public int DimResearchProjectId { get; set; }
29+
7130
public int DimRegisteredDataSourceId { get; set; }
7231

7332
public int DimPublicationId { get; set; }

aspnetcore/src/DatabaseContext/Entities/DimEsfri.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ public partial class DimEsfri
2121

2222
public DateTime? Created { get; set; }
2323

24-
public virtual ICollection<DimInfrastructure> DimInfrastructures { get; set; } = new List<DimInfrastructure>();
24+
public virtual ICollection<DimInfrastructureOld> DimInfrastructures { get; set; } = new List<DimInfrastructureOld>();
2525
}

aspnetcore/src/DatabaseContext/Entities/DimFundingDecision.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ public partial class DimFundingDecision
2727

2828
public int DimFundingDecisionIdParentDecision { get; set; }
2929

30-
/// <summary>
31-
/// Päätöksen paikallinen tunniste (tiedon toimittajan)
32-
/// </summary>
3330
public string? FunderProjectNumber { get; set; }
3431

3532
public string? Acronym { get; set; }
@@ -68,9 +65,6 @@ public partial class DimFundingDecision
6865

6966
public int DimRegisteredDataSourceId { get; set; }
7067

71-
/// <summary>
72-
/// Rahoituspäätös - Päätöspaneeli
73-
/// </summary>
7468
public int? DimCallDecisionsId { get; set; }
7569

7670
public virtual ICollection<BrFundingConsortiumParticipation> BrFundingConsortiumParticipations { get; set; } = new List<BrFundingConsortiumParticipation>();

aspnetcore/src/DatabaseContext/Entities/DimInfrastructure.cs

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ public partial class DimInfrastructure
77
{
88
public int Id { get; set; }
99

10+
public string? LocalIdentifier { get; set; }
11+
1012
public string? Acronym { get; set; }
1113

1214
public bool? FinlandRoadmap { get; set; }
1315

14-
public string SourceId { get; set; } = null!;
15-
16-
public string? SourceDescription { get; set; }
16+
public int ResponsibleOrganizationId { get; set; }
1717

18-
public DateTime? Created { get; set; }
18+
public int DimStartDate { get; set; }
1919

20-
public DateTime? Modified { get; set; }
20+
public int DimEndDate { get; set; }
2121

2222
public int DimRegisteredDataSourceId { get; set; }
2323

24-
public int ResponsibleOrganizationId { get; set; }
24+
public string SourceId { get; set; } = null!;
2525

26-
public int DimStartDate { get; set; }
26+
public string? SourceDescription { get; set; }
2727

28-
public int DimEndDate { get; set; }
28+
public DateTime? Created { get; set; }
2929

30-
public string? LocalIdentifier { get; set; }
30+
public DateTime? Modified { get; set; }
3131

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

@@ -37,6 +37,8 @@ public partial class DimInfrastructure
3737

3838
public virtual ICollection<DimPid> DimPids { get; set; } = new List<DimPid>();
3939

40+
public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } = null!;
41+
4042
public virtual ICollection<DimService> DimServices { get; set; } = new List<DimService>();
4143

4244
public virtual DimDate DimStartDateNavigation { get; set; } = null!;
@@ -45,21 +47,11 @@ public partial class DimInfrastructure
4547

4648
public virtual ICollection<FactContribution> FactContributions { get; set; } = new List<FactContribution>();
4749

48-
public virtual ICollection<FactDimReferencedataFieldOfScience> FactDimReferencedataFieldOfSciences { get; set; } = new List<FactDimReferencedataFieldOfScience>();
49-
50-
public virtual ICollection<FactInfraKeyword> FactInfraKeywords { get; set; } = new List<FactInfraKeyword>();
51-
5250
public virtual ICollection<FactReferencedatum> FactReferencedata { get; set; } = new List<FactReferencedatum>();
5351

5452
public virtual ICollection<FactRelation> FactRelationFromInfrastructures { get; set; } = new List<FactRelation>();
5553

5654
public virtual ICollection<FactRelation> FactRelationToInfrastructures { get; set; } = new List<FactRelation>();
5755

58-
public virtual ICollection<FactUpkeep> FactUpkeeps { get; set; } = new List<FactUpkeep>();
59-
6056
public virtual DimOrganization ResponsibleOrganization { get; set; } = null!;
61-
62-
public virtual ICollection<DimEsfri> DimEsfris { get; set; } = new List<DimEsfri>();
63-
64-
public virtual ICollection<DimMeril> DimMerils { get; set; } = new List<DimMeril>();
6557
}

aspnetcore/src/DatabaseContext/Entities/DimInfrastructureOld.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,14 @@ public partial class DimInfrastructureOld
4444
public string? ScientificDescriptionSv { get; set; }
4545

4646
public string? ScientificDescriptionEn { get; set; }
47+
48+
public virtual ICollection<FactDimReferencedataFieldOfScience> FactDimReferencedataFieldOfSciences { get; set; } = new List<FactDimReferencedataFieldOfScience>();
49+
50+
public virtual ICollection<FactInfraKeyword> FactInfraKeywords { get; set; } = new List<FactInfraKeyword>();
51+
52+
public virtual ICollection<FactUpkeep> FactUpkeeps { get; set; } = new List<FactUpkeep>();
53+
54+
public virtual ICollection<DimEsfri> DimEsfris { get; set; } = new List<DimEsfri>();
55+
56+
public virtual ICollection<DimMeril> DimMerils { get; set; } = new List<DimMeril>();
4757
}

aspnetcore/src/DatabaseContext/Entities/DimMeril.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ public partial class DimMeril
2121

2222
public DateTime? Modified { get; set; }
2323

24-
public virtual ICollection<DimInfrastructure> DimInfrastructures { get; set; } = new List<DimInfrastructure>();
24+
public virtual ICollection<DimInfrastructureOld> DimInfrastructures { get; set; } = new List<DimInfrastructureOld>();
2525
}

0 commit comments

Comments
 (0)