CSCTTV-4527 TTV model update related to Metax 3

aspnetcore/src/DatabaseContext/ApiDbContext.cs

@@ -148,6 +148,8 @@ public ApiDbContext(DbContextOptions<ApiDbContext> options)
 
     public virtual DbSet<FactKeyword> FactKeywords { get; set; }
 
+    public virtual DbSet<FactReferencedatum> FactReferencedata { get; set; }
+
     public virtual DbSet<FactRelation> FactRelations { get; set; }
 
     public virtual DbSet<FactUpkeep> FactUpkeeps { get; set; }
@@ -722,6 +724,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasDefaultValue(-1)
                 .HasColumnName("dim_publication_id");
             entity.Property(e => e.DimRegisteredDataSourceId).HasColumnName("dim_registered_data_source_id");
+            entity.Property(e => e.DimResearchDataCatalogId)
+                .HasDefaultValue(-1)
+                .HasColumnName("dim_research_data_catalog_id");
             entity.Property(e => e.DimResearchDatasetId)
                 .HasDefaultValue(-1)
                 .HasColumnName("dim_research_dataset_id");
@@ -755,6 +760,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .OnDelete(DeleteBehavior.ClientSetNull)
                 .HasConstraintName("FKdim_descri977501");
 
+            entity.HasOne(d => d.DimResearchDataCatalog).WithMany(p => p.DimDescriptiveItems)
+                .HasForeignKey(d => d.DimResearchDataCatalogId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("descriptive_datacatalog");
+
             entity.HasOne(d => d.DimResearchDataset).WithMany(p => p.DimDescriptiveItems)
                 .HasForeignKey(d => d.DimResearchDatasetId)
                 .OnDelete(DeleteBehavior.ClientSetNull)
@@ -1301,6 +1311,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasColumnType("datetime")
                 .HasColumnName("created");
             entity.Property(e => e.DimIdentifierlessDataId).HasColumnName("dim_identifierless_data_id");
+            entity.Property(e => e.DimOrganizationId).HasColumnName("dim_organization_id");
             entity.Property(e => e.Modified)
                 .HasColumnType("datetime")
                 .HasColumnName("modified");
@@ -1326,10 +1337,18 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.ValueSv)
                 .HasMaxLength(4000)
                 .HasColumnName("value_sv");
+            entity.Property(e => e.ValueUnd)
+                .HasMaxLength(4000)
+                .HasColumnName("value_und");
 
             entity.HasOne(d => d.DimIdentifierlessData).WithMany(p => p.InverseDimIdentifierlessData)
                 .HasForeignKey(d => d.DimIdentifierlessDataId)
                 .HasConstraintName("parent_data");
+
+            entity.HasOne(d => d.DimOrganization).WithMany(p => p.DimIdentifierlessData)
+                .HasForeignKey(d => d.DimOrganizationId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("identifierlessIsPartOfOrganization");
         });
 
         modelBuilder.Entity<DimInfrastructure>(entity =>
@@ -3055,60 +3074,27 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.DatasetModified)
                 .HasColumnType("datetime")
                 .HasColumnName("dataset_modified");
-            entity.Property(e => e.DescriptionEn).HasColumnName("description_en");
-            entity.Property(e => e.DescriptionFi).HasColumnName("description_fi");
-            entity.Property(e => e.DescriptionSv).HasColumnName("description_sv");
-            entity.Property(e => e.DescriptionUnd).HasColumnName("description_und");
             entity.Property(e => e.DimReferencedataAvailability).HasColumnName("dim_referencedata_availability");
-            entity.Property(e => e.DimReferencedataLicense).HasColumnName("dim_referencedata_license");
             entity.Property(e => e.DimRegisteredDataSourceId).HasColumnName("dim_registered_data_source_id");
             entity.Property(e => e.DimResearchDataCatalogId).HasColumnName("dim_research_data_catalog_id");
-            entity.Property(e => e.GeographicCoverage)
-                .HasMaxLength(4000)
-                .HasColumnName("geographic_coverage");
-            entity.Property(e => e.InternationalCollaboration).HasColumnName("international_collaboration");
             entity.Property(e => e.LocalIdentifier)
                 .HasMaxLength(255)
                 .HasColumnName("local_identifier");
             entity.Property(e => e.Modified)
                 .HasColumnType("datetime")
                 .HasColumnName("modified");
-            entity.Property(e => e.NameEn)
-                .HasMaxLength(4000)
-                .HasColumnName("name_en");
-            entity.Property(e => e.NameFi)
-                .HasMaxLength(4000)
-                .HasColumnName("name_fi");
-            entity.Property(e => e.NameSv)
-                .HasMaxLength(4000)
-                .HasColumnName("name_sv");
-            entity.Property(e => e.NameUnd)
-                .HasMaxLength(4000)
-                .HasColumnName("name_und");
             entity.Property(e => e.SourceDescription)
                 .HasMaxLength(255)
                 .HasColumnName("source_description");
             entity.Property(e => e.SourceId)
                 .HasMaxLength(255)
                 .HasColumnName("source_id");
-            entity.Property(e => e.TemporalCoverageEnd)
-                .HasColumnType("datetime")
-                .HasColumnName("temporal_coverage_end");
-            entity.Property(e => e.TemporalCoverageStart)
-                .HasColumnType("datetime")
-                .HasColumnName("temporal_coverage_start");
-            entity.Property(e => e.VersionInfo)
-                .HasMaxLength(255)
-                .HasColumnName("version_info");
+            entity.Property(e => e.VersionInfo).HasColumnName("version_info");
 
-            entity.HasOne(d => d.DimReferencedataAvailabilityNavigation).WithMany(p => p.DimResearchDatasetDimReferencedataAvailabilityNavigations)
+            entity.HasOne(d => d.DimReferencedataAvailabilityNavigation).WithMany(p => p.DimResearchDatasets)
                 .HasForeignKey(d => d.DimReferencedataAvailability)
                 .HasConstraintName("Availibiity classes");
 
-            entity.HasOne(d => d.DimReferencedataLicenseNavigation).WithMany(p => p.DimResearchDatasetDimReferencedataLicenseNavigations)
-                .HasForeignKey(d => d.DimReferencedataLicense)
-                .HasConstraintName("License");
-
             entity.HasOne(d => d.DimRegisteredDataSource).WithMany(p => p.DimResearchDatasets)
                 .HasForeignKey(d => d.DimRegisteredDataSourceId)
                 .OnDelete(DeleteBehavior.ClientSetNull)
@@ -3117,45 +3103,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.HasOne(d => d.DimResearchDataCatalog).WithMany(p => p.DimResearchDatasets)
                 .HasForeignKey(d => d.DimResearchDataCatalogId)
                 .HasConstraintName("FKdim_resear753411");
-
-            entity.HasMany(d => d.DimKeywords).WithMany(p => p.DimResearchDatasets)
-                .UsingEntity<Dictionary<string, object>>(
-                    "BrResearchDatasetDimKeyword",
-                    r => r.HasOne<DimKeyword>().WithMany()
-                        .HasForeignKey("DimKeywordId")
-                        .OnDelete(DeleteBehavior.ClientSetNull)
-                        .HasConstraintName("FKbr_researc961356"),
-                    l => l.HasOne<DimResearchDataset>().WithMany()
-                        .HasForeignKey("DimResearchDatasetId")
-                        .OnDelete(DeleteBehavior.ClientSetNull)
-                        .HasConstraintName("dataset-keywords"),
-                    j =>
-                    {
-                        j.HasKey("DimResearchDatasetId", "DimKeywordId").HasName("PK__br_resea__4D226DF29D73B9C7");
-                        j.ToTable("br_research_dataset_dim_keyword");
-                        j.HasIndex(new[] { "DimKeywordId" }, "idx_dim_keyword_id");
-                        j.IndexerProperty<int>("DimResearchDatasetId").HasColumnName("dim_research_dataset_id");
-                        j.IndexerProperty<int>("DimKeywordId").HasColumnName("dim_keyword_id");
-                    });
-
-            entity.HasMany(d => d.DimReferencedata).WithMany(p => p.DimResearchDatasets)
-                .UsingEntity<Dictionary<string, object>>(
-                    "BrLanguageCodesForDataset",
-                    r => r.HasOne<DimReferencedatum>().WithMany()
-                        .HasForeignKey("DimReferencedataId")
-                        .OnDelete(DeleteBehavior.ClientSetNull)
-                        .HasConstraintName("FKbr_languag480770"),
-                    l => l.HasOne<DimResearchDataset>().WithMany()
-                        .HasForeignKey("DimResearchDatasetId")
-                        .OnDelete(DeleteBehavior.ClientSetNull)
-                        .HasConstraintName("FKbr_languag34243"),
-                    j =>
-                    {
-                        j.HasKey("DimResearchDatasetId", "DimReferencedataId").HasName("PK__br_langu__576647BF72E3964D");
-                        j.ToTable("br_language_codes_for_datasets");
-                        j.IndexerProperty<int>("DimResearchDatasetId").HasColumnName("dim_research_dataset_id");
-                        j.IndexerProperty<int>("DimReferencedataId").HasColumnName("dim_referencedata_id");
-                    });
         });
 
         modelBuilder.Entity<DimResearchProject>(entity =>
@@ -4203,15 +4150,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             entity.ToTable("fact_keywords");
 
-            entity.Property(e => e.DimKeywordId)
-                .HasDefaultValueSql("('-1')")
-                .HasColumnName("dim_keyword_id");
-            entity.Property(e => e.DimResearchProjectId)
-                .HasDefaultValueSql("('-1')")
-                .HasColumnName("dim_research_project_id");
+            entity.Property(e => e.DimKeywordId).HasColumnName("dim_keyword_id");
+            entity.Property(e => e.DimResearchProjectId).HasColumnName("dim_research_project_id");
             entity.Property(e => e.Created)
                 .HasColumnType("datetime")
                 .HasColumnName("created");
+            entity.Property(e => e.DimResearchDatasetId).HasColumnName("dim_research_dataset_id");
             entity.Property(e => e.Modified)
                 .HasColumnType("datetime")
                 .HasColumnName("modified");
@@ -4221,6 +4165,83 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.SourceId)
                 .HasMaxLength(255)
                 .HasColumnName("source_id");
+
+            entity.HasOne(d => d.DimKeyword).WithMany(p => p.FactKeywords)
+                .HasForeignKey(d => d.DimKeywordId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("FKfact_keywo738006");
+
+            entity.HasOne(d => d.DimResearchDataset).WithMany(p => p.FactKeywords)
+                .HasForeignKey(d => d.DimResearchDatasetId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("dataset-keywords");
+
+            entity.HasOne(d => d.DimResearchProject).WithMany(p => p.FactKeywords)
+                .HasForeignKey(d => d.DimResearchProjectId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("FKfact_keywo171431");
+        });
+
+        modelBuilder.Entity<FactReferencedatum>(entity =>
+        {
+            entity.HasKey(e => new { e.DimReferencedataId, e.DimResearchDatasetId, e.DimInfrastructureId, e.DimPublicationId, e.DimResearchActivityId, e.DimFundingDecisionId, e.DimCallProgrammeId }).HasName("PK__fact_ref__302C51990AF30AC0");
+
+            entity.ToTable("fact_referencedata");
+
+            entity.Property(e => e.DimReferencedataId).HasColumnName("dim_referencedata_id");
+            entity.Property(e => e.DimResearchDatasetId).HasColumnName("dim_research_dataset_id");
+            entity.Property(e => e.DimInfrastructureId).HasColumnName("dim_infrastructure_id");
+            entity.Property(e => e.DimPublicationId).HasColumnName("dim_publication_id");
+            entity.Property(e => e.DimResearchActivityId).HasColumnName("dim_research_activity_id");
+            entity.Property(e => e.DimFundingDecisionId).HasColumnName("dim_funding_decision_id");
+            entity.Property(e => e.DimCallProgrammeId).HasColumnName("dim_call_programme_id");
+            entity.Property(e => e.Created)
+                .HasColumnType("datetime")
+                .HasColumnName("created");
+            entity.Property(e => e.Modified)
+                .HasColumnType("datetime")
+                .HasColumnName("modified");
+            entity.Property(e => e.SourceDescription)
+                .HasMaxLength(255)
+                .HasColumnName("source_description");
+            entity.Property(e => e.SourceId)
+                .HasMaxLength(255)
+                .HasColumnName("source_id");
+
+            entity.HasOne(d => d.DimCallProgramme).WithMany(p => p.FactReferencedata)
+                .HasForeignKey(d => d.DimCallProgrammeId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("call_programme_referencedata");
+
+            entity.HasOne(d => d.DimFundingDecision).WithMany(p => p.FactReferencedata)
+                .HasForeignKey(d => d.DimFundingDecisionId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("funding_decision_referencedata");
+
+            entity.HasOne(d => d.DimInfrastructure).WithMany(p => p.FactReferencedata)
+                .HasForeignKey(d => d.DimInfrastructureId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("infrastructure_referencedata");
+
+            entity.HasOne(d => d.DimPublication).WithMany(p => p.FactReferencedata)
+                .HasForeignKey(d => d.DimPublicationId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("publication_referencedata");
+
+            entity.HasOne(d => d.DimReferencedata).WithMany(p => p.FactReferencedata)
+                .HasForeignKey(d => d.DimReferencedataId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("FKfact_refer715553");
+
+            entity.HasOne(d => d.DimResearchActivity).WithMany(p => p.FactReferencedata)
+                .HasForeignKey(d => d.DimResearchActivityId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("research_activity_referencedata");
+
+            entity.HasOne(d => d.DimResearchDataset).WithMany(p => p.FactReferencedata)
+                .HasForeignKey(d => d.DimResearchDatasetId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("dataset_referencedata");
         });
 
         modelBuilder.Entity<FactRelation>(entity =>

aspnetcore/src/DatabaseContext/Entities/DimCallProgramme.cs

@@ -83,6 +83,8 @@ public partial class DimCallProgramme
 
     public virtual ICollection<DimWebLink> DimWebLinks { get; set; } = new List<DimWebLink>();
 
+    public virtual ICollection<FactReferencedatum> FactReferencedata { get; set; } = new List<FactReferencedatum>();
+
     public virtual ICollection<DimCallProgramme> InverseDimCallProgrammeNavigation { get; set; } = new List<DimCallProgramme>();
 
     public virtual DimReferencedatum? TypeOfFundingNavigation { get; set; }

aspnetcore/src/DatabaseContext/Entities/DimDescriptiveItem.cs

@@ -74,12 +74,16 @@ public partial class DimDescriptiveItem
 
     public int DimResearchDatasetId { get; set; }
 
+    public int DimResearchDataCatalogId { get; set; }
+
     public virtual DimDate? DimEndDateNavigation { get; set; }
 
     public virtual DimPublication DimPublication { get; set; } = null!;
 
     public virtual DimRegisteredDataSource DimRegisteredDataSource { get; set; } = null!;
 
+    public virtual DimResearchDataCatalog DimResearchDataCatalog { get; set; } = null!;
+
     public virtual DimResearchDataset DimResearchDataset { get; set; } = null!;
 
     public virtual DimResearchProject DimResearchProject { get; set; } = null!;

aspnetcore/src/DatabaseContext/Entities/DimFundingDecision.cs

@@ -109,6 +109,8 @@ public partial class DimFundingDecision
 
     public virtual ICollection<FactFieldValue> FactFieldValues { get; set; } = new List<FactFieldValue>();
 
+    public virtual ICollection<FactReferencedatum> FactReferencedata { get; set; } = new List<FactReferencedatum>();
+
     public virtual ICollection<DimFundingDecision> InverseDimFundingDecisionIdParentDecisionNavigation { get; set; } = new List<DimFundingDecision>();
 
     public virtual ICollection<DimFundingDecision> DimFundingDecisionFroms { get; set; } = new List<DimFundingDecision>();

aspnetcore/src/DatabaseContext/Entities/DimIdentifierlessDatum.cs

@@ -27,8 +27,14 @@ public partial class DimIdentifierlessDatum
 
     public string? UnlinkedIdentifier { get; set; }
 
+    public int DimOrganizationId { get; set; }
+
+    public string? ValueUnd { get; set; }
+
     public virtual DimIdentifierlessDatum? DimIdentifierlessData { get; set; }
 
+    public virtual DimOrganization DimOrganization { get; set; } = null!;
+
     public virtual ICollection<FactContribution> FactContributions { get; set; } = new List<FactContribution>();
 
     public virtual ICollection<FactFieldValue> FactFieldValues { get; set; } = new List<FactFieldValue>();

aspnetcore/src/DatabaseContext/Entities/DimInfrastructure.cs

@@ -53,6 +53,8 @@ public partial class DimInfrastructure
 
     public virtual ICollection<FactInfraKeyword> FactInfraKeywords { get; set; } = new List<FactInfraKeyword>();
 
+    public virtual ICollection<FactReferencedatum> FactReferencedata { get; set; } = new List<FactReferencedatum>();
+
     public virtual ICollection<FactRelation> FactRelationFromInfrastructures { get; set; } = new List<FactRelation>();
 
     public virtual ICollection<FactRelation> FactRelationToInfrastructures { get; set; } = new List<FactRelation>();

aspnetcore/src/DatabaseContext/Entities/DimKeyword.cs

@@ -45,6 +45,8 @@ public partial class DimKeyword
 
     public virtual ICollection<FactInfraKeyword> FactInfraKeywords { get; set; } = new List<FactInfraKeyword>();
 
+    public virtual ICollection<FactKeyword> FactKeywords { get; set; } = new List<FactKeyword>();
+
     public virtual ICollection<DimKeyword> InverseDimKeywordCloseMatchNavigation { get; set; } = new List<DimKeyword>();
 
     public virtual ICollection<DimKeyword> InverseDimKeywordLanguageVariantNavigation { get; set; } = new List<DimKeyword>();
@@ -54,6 +56,4 @@ public partial class DimKeyword
     public virtual ICollection<DimFundingDecision> DimFundingDecisions { get; set; } = new List<DimFundingDecision>();
 
     public virtual ICollection<DimPublication> DimPublications { get; set; } = new List<DimPublication>();
-
-    public virtual ICollection<DimResearchDataset> DimResearchDatasets { get; set; } = new List<DimResearchDataset>();
 }

aspnetcore/src/DatabaseContext/Entities/DimOrganization.cs

@@ -73,6 +73,8 @@ public partial class DimOrganization
 
     public virtual ICollection<DimFundingDecision> DimFundingDecisions { get; set; } = new List<DimFundingDecision>();
 
+    public virtual ICollection<DimIdentifierlessDatum> DimIdentifierlessData { get; set; } = new List<DimIdentifierlessDatum>();
+
     public virtual DimOrganization? DimOrganizationBroaderNavigation { get; set; }
 
     public virtual ICollection<DimPid> DimPids { get; set; } = new List<DimPid>();

aspnetcore/src/DatabaseContext/Entities/DimPublication.cs

@@ -127,6 +127,8 @@ public partial class DimPublication
 
     public virtual ICollection<FactFieldValue> FactFieldValues { get; set; } = new List<FactFieldValue>();
 
+    public virtual ICollection<FactReferencedatum> FactReferencedata { get; set; } = new List<FactReferencedatum>();
+
     public virtual ICollection<FactRelation> FactRelationFromPublications { get; set; } = new List<FactRelation>();
 
     public virtual ICollection<FactRelation> FactRelationToPublications { get; set; } = new List<FactRelation>();