From 5df3e27305c3c1b6121ac4ab5945267b57094300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Sa=CC=88rkikoski?= Date: Mon, 20 May 2024 13:56:23 +0300 Subject: [PATCH] Fix TtvContext errors from Git rebase --- aspnetcore/src/api/Models/Ttv/TtvContext.cs | 328 +------------------- 1 file changed, 3 insertions(+), 325 deletions(-) diff --git a/aspnetcore/src/api/Models/Ttv/TtvContext.cs b/aspnetcore/src/api/Models/Ttv/TtvContext.cs index 2de8f8b..3adffc0 100644 --- a/aspnetcore/src/api/Models/Ttv/TtvContext.cs +++ b/aspnetcore/src/api/Models/Ttv/TtvContext.cs @@ -143,154 +143,6 @@ public TtvContext(DbContextOptions options) public virtual DbSet FactUpkeeps { get; set; } - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - => optionsBuilder.UseSqlServer("Name=ConnectionStrings:DefaultConnection"); - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.DimResearchDatasetId, e.DimResearchDatasetId2 }).HasName("PK__br_datas__9FEA685A42BC14F8"); - -public partial class TtvContext : DbContext -{ - public TtvContext() - { - } - - public TtvContext(DbContextOptions options) - : base(options) - { - } - - public virtual DbSet BrDatasetDatasetRelationships { get; set; } - - public virtual DbSet BrFundingConsortiumParticipations { get; set; } - - public virtual DbSet BrGrantedPermissions { get; set; } - - public virtual DbSet BrParticipatesInFundingGroups { get; set; } - - public virtual DbSet BrServiceSubscriptions { get; set; } - - public virtual DbSet BrWordClusterDimFundingDecisions { get; set; } - - public virtual DbSet BrWordsDefineAClusters { get; set; } - - public virtual DbSet DimAffiliations { get; set; } - - public virtual DbSet DimCallDecisions { get; set; } - - public virtual DbSet DimCallProgrammes { get; set; } - - public virtual DbSet DimCompetences { get; set; } - - public virtual DbSet DimDates { get; set; } - - public virtual DbSet DimEducations { get; set; } - - public virtual DbSet DimEmailAddrresses { get; set; } - - public virtual DbSet DimEsfris { get; set; } - - public virtual DbSet DimEvents { get; set; } - - public virtual DbSet DimExternalServices { get; set; } - - public virtual DbSet DimFieldDisplaySettings { get; set; } - - public virtual DbSet DimFundingDecisions { get; set; } - - public virtual DbSet DimGeos { get; set; } - - public virtual DbSet DimIdentifierlessData { get; set; } - - public virtual DbSet DimInfrastructures { get; set; } - - public virtual DbSet DimKeywords { get; set; } - - public virtual DbSet DimKnownPeople { get; set; } - - public virtual DbSet DimLocallyReportedPubInfos { get; set; } - - public virtual DbSet DimMerils { get; set; } - - public virtual DbSet DimMinedWords { get; set; } - - public virtual DbSet DimNames { get; set; } - - public virtual DbSet DimNewsFeeds { get; set; } - - public virtual DbSet DimNewsItems { get; set; } - - public virtual DbSet DimOrganisationMedia { get; set; } - - public virtual DbSet DimOrganizations { get; set; } - - public virtual DbSet DimPids { get; set; } - - public virtual DbSet DimProfileOnlyDatasets { get; set; } - - public virtual DbSet DimProfileOnlyFundingDecisions { get; set; } - - public virtual DbSet DimProfileOnlyPublications { get; set; } - - public virtual DbSet DimProfileOnlyResearchActivities { get; set; } - - public virtual DbSet DimPublications { get; set; } - - public virtual DbSet DimPublicationChannels { get; set; } - - public virtual DbSet DimPurposes { get; set; } - - public virtual DbSet DimReferencedata { get; set; } - - public virtual DbSet DimRegisteredDataSources { get; set; } - - public virtual DbSet DimResearchActivities { get; set; } - - public virtual DbSet DimResearchActivityDimKeywords { get; set; } - - public virtual DbSet DimResearchCommunities { get; set; } - - public virtual DbSet DimResearchDataCatalogs { get; set; } - - public virtual DbSet DimResearchDatasets { get; set; } - - public virtual DbSet DimResearchProjects { get; set; } - - public virtual DbSet DimResearcherDescriptions { get; set; } - - public virtual DbSet DimResearcherToResearchCommunities { get; set; } - - public virtual DbSet DimSectors { get; set; } - - public virtual DbSet DimServices { get; set; } - - public virtual DbSet DimServicePoints { get; set; } - - public virtual DbSet DimTelephoneNumbers { get; set; } - - public virtual DbSet DimTypeOfFundings { get; set; } - - public virtual DbSet DimUserChoices { get; set; } - - public virtual DbSet DimUserProfiles { get; set; } - - public virtual DbSet DimWebLinks { get; set; } - - public virtual DbSet DimWordClusters { get; set; } - - public virtual DbSet FactContributions { get; set; } - - public virtual DbSet FactDimReferencedataFieldOfSciences { get; set; } - - public virtual DbSet FactFieldValues { get; set; } - - public virtual DbSet FactInfraKeywords { get; set; } - - public virtual DbSet FactUpkeeps { get; set; } - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) => optionsBuilder.UseSqlServer("Name=ConnectionStrings:DefaultConnection"); @@ -610,83 +462,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKdim_call_d543999"); }); - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.Id).HasName("PK__dim_call__3213E83FDE9183B2"); - - entity.ToTable("dim_call_decisions", tb => tb.HasComment("Rahoituspäätöspaneeli")); - - entity.Property(e => e.Id).HasColumnName("id"); - entity.Property(e => e.CallProcessingPhase) - .IsRequired() - .HasMaxLength(255) - .HasColumnName("call_name_details_en"); - entity.Property(e => e.CallNameDetailsFi) - .HasMaxLength(255) - .HasColumnName("call_name_details_fi"); - entity.Property(e => e.CallNameDetailsSv) - .HasMaxLength(255) - .HasColumnName("call_name_details_sv"); - entity.Property(e => e.ContactInformation).HasColumnName("contact_information"); - entity.Property(e => e.ContinuousApplicationPeriod).HasColumnName("continuous_application_period"); - entity.Property(e => e.Created) - .HasColumnType("datetime") - .HasColumnName("created"); - 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.DimCallProgrammeId).HasColumnName("dim_call_programme_id"); - entity.Property(e => e.DimDateIdDue).HasColumnName("dim_date_id_due"); - entity.Property(e => e.DimDateIdOpen).HasColumnName("dim_date_id_open"); - entity.Property(e => e.DimRegisteredDataSourceId).HasColumnName("dim_registered_data_source_id"); - entity.Property(e => e.DueDateDueTime) - .HasPrecision(0) - .HasColumnName("due_date_due_time"); - entity.Property(e => e.EuCallId) - .HasMaxLength(511) - .HasColumnName("eu_call_id"); - entity.Property(e => e.IsOpenCall).HasColumnName("is_open_call"); - 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(511) - .HasColumnName("name_en"); - entity.Property(e => e.NameFi) - .HasMaxLength(511) - .HasColumnName("name_fi"); - entity.Property(e => e.NameSv) - .HasMaxLength(511) - .HasColumnName("name_sv"); - entity.Property(e => e.NameUnd) - .HasMaxLength(511) - .HasColumnName("name_und"); - entity.Property(e => e.SourceDescription) - .HasMaxLength(255) - .HasColumnName("source_description"); - entity.Property(e => e.SourceId) - .HasMaxLength(255) - .HasColumnName("source_id"); - - entity.HasOne(d => d.DecisionMakerNavigation).WithMany(p => p.DimCallDecisions) - .HasForeignKey(d => d.DecisionMaker) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("decision_maker"); - - entity.HasOne(d => d.DimCallProgramme).WithMany(p => p.DimCallDecisions) - .HasForeignKey(d => d.DimCallProgrammeId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FKdim_call_d831756"); - - entity.HasOne(d => d.DimDateIdApprovalNavigation).WithMany(p => p.DimCallDecisions) - .HasForeignKey(d => d.DimDateIdApproval) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FKdim_call_d543999"); - }); - modelBuilder.Entity(entity => { entity.HasKey(e => e.Id).HasName("PK__dim_call__3213E83FDE9183B2"); @@ -1300,10 +1075,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasForeignKey(d => d.DimCallDecisionsId) .HasConstraintName("FKdim_fundin257658"); - entity.HasOne(d => d.DimCallDecisions).WithMany(p => p.DimFundingDecisions) - .HasForeignKey(d => d.DimCallDecisionsId) - .HasConstraintName("FKdim_fundin257658"); - entity.HasOne(d => d.DimCallProgramme).WithMany(p => p.DimFundingDecisions) .HasForeignKey(d => d.DimCallProgrammeId) .OnDelete(DeleteBehavior.ClientSetNull) @@ -1396,6 +1167,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) { entity.HasKey(e => e.Id).HasName("PK__dim_geo__3213E83F16BA183D"); + entity.ToTable("dim_geo"); + entity.Property(e => e.Id).HasColumnName("id"); entity.Property(e => e.CountryCode) .HasMaxLength(255) @@ -2242,10 +2015,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasForeignKey(d => d.DimResearchCommunityId) .HasConstraintName("FKdim_pid146045"); - entity.HasOne(d => d.DimResearchCommunity).WithMany(p => p.DimPids) - .HasForeignKey(d => d.DimResearchCommunityId) - .HasConstraintName("FKdim_pid146045"); - entity.HasOne(d => d.DimResearchDataCatalog).WithMany(p => p.DimPids) .HasForeignKey(d => d.DimResearchDataCatalogId) .OnDelete(DeleteBehavior.ClientSetNull) @@ -3441,97 +3210,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConstraintName("FKdim_resear246050"); }); - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83FFAFA1A53"); - - entity.ToTable("dim_research_project"); - - entity.Property(e => e.Id).HasColumnName("id"); - entity.Property(e => e.AbbrevationEn) - .HasMaxLength(4000) - .HasColumnName("abbrevation_en"); - entity.Property(e => e.AbbrevationFi) - .HasMaxLength(4000) - .HasComment("Hanke - lyhenne") - .HasColumnName("abbrevation_fi"); - entity.Property(e => e.AbbrevationSv) - .HasMaxLength(4000) - .HasColumnName("abbrevation_sv"); - entity.Property(e => e.AdditionalInformationEn).HasColumnName("additional_information_en"); - entity.Property(e => e.AdditionalInfromationFi) - .HasComment("Hanke - lisätieto") - .HasColumnName("additional_infromation_fi"); - entity.Property(e => e.AddtitionalInformationSv).HasColumnName("addtitional_information_sv"); - entity.Property(e => e.Created) - .HasColumnType("datetime") - .HasColumnName("created"); - entity.Property(e => e.DimRegisteredDataSourceId).HasColumnName("dim_registered_data_source_id"); - entity.Property(e => e.EndDate) - .HasComment("Hanke - päättymispäivämäärä") - .HasColumnName("end_date"); - entity.Property(e => e.GoalsEn).HasColumnName("goals_en"); - entity.Property(e => e.GoalsFi).HasColumnName("goals_fi"); - entity.Property(e => e.GoalsSv).HasColumnName("goals_sv"); - 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) - .HasComment("Hanke - nimi") - .HasColumnName("name_fi"); - entity.Property(e => e.NameSv) - .HasMaxLength(4000) - .HasColumnName("name_sv"); - entity.Property(e => e.OutcomeEffectEn).HasColumnName("outcome_effect_en"); - entity.Property(e => e.OutcomeEffectFi).HasColumnName("outcome_effect_fi"); - entity.Property(e => e.OutcomeEffectSv).HasColumnName("outcome_effect_sv"); - entity.Property(e => e.ResponsibleOrganization) - .HasComment("Hanke - vastuuorganisaatio") - .HasColumnName("responsible_organization"); - entity.Property(e => e.ResponsiblePerson).HasColumnName("responsible_person"); - entity.Property(e => e.SourceDescription) - .HasMaxLength(255) - .HasColumnName("source_description"); - entity.Property(e => e.SourceId) - .IsRequired() - .HasMaxLength(255) - .HasColumnName("source_id"); - entity.Property(e => e.StartDate) - .HasComment("Hanke - alkamispäivämäärä") - .HasColumnName("start_date"); - entity.Property(e => e.SummaryEn).HasColumnName("summary_en"); - entity.Property(e => e.SummaryFi) - .HasComment("Hanke - tiivistelmä") - .HasColumnName("summary_fi"); - entity.Property(e => e.SummarySv).HasColumnName("summary_sv"); - - entity.HasOne(d => d.DimRegisteredDataSource).WithMany(p => p.DimResearchProjects) - .HasForeignKey(d => d.DimRegisteredDataSourceId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FKdim_resear450820"); - - entity.HasOne(d => d.EndDateNavigation).WithMany(p => p.DimResearchProjectEndDateNavigations) - .HasForeignKey(d => d.EndDate) - .HasConstraintName("FKdim_resear517343"); - - entity.HasOne(d => d.ResponsibleOrganizationNavigation).WithMany(p => p.DimResearchProjects) - .HasForeignKey(d => d.ResponsibleOrganization) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FKdim_resear741036"); - - entity.HasOne(d => d.ResponsiblePersonNavigation).WithMany(p => p.DimResearchProjects) - .HasForeignKey(d => d.ResponsiblePerson) - .HasConstraintName("FKdim_resear684392"); - - entity.HasOne(d => d.StartDateNavigation).WithMany(p => p.DimResearchProjectStartDateNavigations) - .HasForeignKey(d => d.StartDate) - .HasConstraintName("FKdim_resear246050"); - }); - modelBuilder.Entity(entity => { entity.HasKey(e => e.Id).HasName("PK__dim_rese__3213E83FFAFA1A53"); @@ -4549,4 +4227,4 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) } partial void OnModelCreatingPartial(ModelBuilder modelBuilder); -} +} \ No newline at end of file