Skip to content

Commit 198e2a7

Browse files
Merge pull request #265 from CSCfi/CSCTTV-4484-4496-4502 (#266)
CSCTTV-4484-4496-4502 dim_publication changes
2 parents ba15ee9 + da49fdc commit 198e2a7

3 files changed

Lines changed: 37 additions & 4 deletions

File tree

aspnetcore/src/DatabaseContext/ApiDbContext.cs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public ApiDbContext(DbContextOptions<ApiDbContext> options)
165165
public virtual DbSet<PidM> PidMs { get; set; }
166166

167167

168-
168+
169169
protected override void OnModelCreating(ModelBuilder modelBuilder)
170170
{
171171
modelBuilder.Entity<BrFundingConsortiumParticipation>(entity =>
@@ -2624,11 +2624,13 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
26242624
.HasColumnType("decimal(18, 2)")
26252625
.HasColumnName("apc_fee_EUR");
26262626
entity.Property(e => e.ApcPaymentYear).HasColumnName("apc_payment_year");
2627+
entity.Property(e => e.ArtTypeCode).HasColumnName("art_type_code");
26272628
entity.Property(e => e.ArticleNumberText)
26282629
.HasMaxLength(255)
26292630
.HasColumnName("article_number_text");
26302631
entity.Property(e => e.ArticleTypeCode).HasColumnName("article_type_code");
26312632
entity.Property(e => e.AuthorsText).HasColumnName("authors_text");
2633+
entity.Property(e => e.AvApplicationTypeCode).HasColumnName("av_application_type_code");
26322634
entity.Property(e => e.BusinessCollaboration).HasColumnName("business_collaboration");
26332635
entity.Property(e => e.ConferenceName)
26342636
.HasMaxLength(4000)
@@ -2695,7 +2697,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
26952697
.HasMaxLength(4000)
26962698
.HasColumnName("publisher_name");
26972699
entity.Property(e => e.PublisherOpenAccessCode).HasColumnName("publisher_open_access_code");
2698-
entity.Property(e => e.Report).HasColumnName("report");
2700+
entity.Property(e => e.ReportSwitch).HasColumnName("report_switch");
26992701
entity.Property(e => e.ReportingYear).HasColumnName("reporting_year");
27002702
entity.Property(e => e.SelfArchivedCode).HasColumnName("self_archived_code");
27012703
entity.Property(e => e.SourceDescription)
@@ -2710,10 +2712,20 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
27102712
.HasMaxLength(255)
27112713
.HasColumnName("volume");
27122714

2715+
entity.HasOne(d => d.ArtTypeCodeNavigation).WithMany(p => p.DimPublicationArtTypeCodeNavigations)
2716+
.HasForeignKey(d => d.ArtTypeCode)
2717+
.OnDelete(DeleteBehavior.ClientSetNull)
2718+
.HasConstraintName("art_type_code");
2719+
27132720
entity.HasOne(d => d.ArticleTypeCodeNavigation).WithMany(p => p.DimPublicationArticleTypeCodeNavigations)
27142721
.HasForeignKey(d => d.ArticleTypeCode)
27152722
.HasConstraintName("article_type_code");
27162723

2724+
entity.HasOne(d => d.AvApplicationTypeCodeNavigation).WithMany(p => p.DimPublicationAvApplicationTypeCodeNavigations)
2725+
.HasForeignKey(d => d.AvApplicationTypeCode)
2726+
.OnDelete(DeleteBehavior.ClientSetNull)
2727+
.HasConstraintName("av_application_type_code");
2728+
27172729
entity.HasOne(d => d.DimPublicationChannel).WithMany(p => p.DimPublicationDimPublicationChannels)
27182730
.HasForeignKey(d => d.DimPublicationChannelId)
27192731
.OnDelete(DeleteBehavior.ClientSetNull)
@@ -2786,6 +2798,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
27862798
.OnDelete(DeleteBehavior.ClientSetNull)
27872799
.HasConstraintName("publisher_open_access");
27882800

2801+
entity.HasOne(d => d.ReportSwitchNavigation).WithMany(p => p.DimPublicationReportSwitchNavigations)
2802+
.HasForeignKey(d => d.ReportSwitch)
2803+
.OnDelete(DeleteBehavior.ClientSetNull)
2804+
.HasConstraintName("reportSwitch");
2805+
27892806
entity.HasOne(d => d.TargetAudienceCodeNavigation).WithMany(p => p.DimPublicationTargetAudienceCodeNavigations)
27902807
.HasForeignKey(d => d.TargetAudienceCode)
27912808
.HasConstraintName("target_audience_code");

aspnetcore/src/DatabaseContext/Entities/DimPublication.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ public partial class DimPublication
7575

7676
public bool? PeerReviewed { get; set; }
7777

78-
public bool? Report { get; set; }
79-
8078
public int ThesisTypeCode { get; set; }
8179

8280
public bool? SelfArchivedCode { get; set; }
@@ -105,8 +103,18 @@ public partial class DimPublication
105103

106104
public int OpenAccessCode { get; set; }
107105

106+
public int ReportSwitch { get; set; }
107+
108+
public int ArtTypeCode { get; set; }
109+
110+
public int AvApplicationTypeCode { get; set; }
111+
112+
public virtual DimReferencedatum ArtTypeCodeNavigation { get; set; } = null!;
113+
108114
public virtual DimReferencedatum? ArticleTypeCodeNavigation { get; set; }
109115

116+
public virtual DimReferencedatum AvApplicationTypeCodeNavigation { get; set; } = null!;
117+
110118
public virtual ICollection<DimDescriptiveItem> DimDescriptiveItems { get; set; } = new List<DimDescriptiveItem>();
111119

112120
public virtual ICollection<DimLocallyReportedPubInfo> DimLocallyReportedPubInfos { get; set; } = new List<DimLocallyReportedPubInfo>();
@@ -159,6 +167,8 @@ public partial class DimPublication
159167

160168
public virtual DimReferencedatum PublisherOpenAccessCodeNavigation { get; set; } = null!;
161169

170+
public virtual DimReferencedatum ReportSwitchNavigation { get; set; } = null!;
171+
162172
public virtual DimReferencedatum? TargetAudienceCodeNavigation { get; set; }
163173

164174
public virtual DimReferencedatum ThesisTypeCodeNavigation { get; set; } = null!;

aspnetcore/src/DatabaseContext/Entities/DimReferencedatum.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,12 @@ public partial class DimReferencedatum
6969

7070
public virtual ICollection<DimProfileOnlyPublication> DimProfileOnlyPublicationTypeClassificationCodeNavigations { get; set; } = new List<DimProfileOnlyPublication>();
7171

72+
public virtual ICollection<DimPublication> DimPublicationArtTypeCodeNavigations { get; set; } = new List<DimPublication>();
73+
7274
public virtual ICollection<DimPublication> DimPublicationArticleTypeCodeNavigations { get; set; } = new List<DimPublication>();
7375

76+
public virtual ICollection<DimPublication> DimPublicationAvApplicationTypeCodeNavigations { get; set; } = new List<DimPublication>();
77+
7478
public virtual ICollection<DimPublication> DimPublicationJufoClassCodeFrozenNavigations { get; set; } = new List<DimPublication>();
7579

7680
public virtual ICollection<DimPublication> DimPublicationJufoClassNavigations { get; set; } = new List<DimPublication>();
@@ -93,6 +97,8 @@ public partial class DimReferencedatum
9397

9498
public virtual ICollection<DimPublication> DimPublicationPublisherOpenAccessCodeNavigations { get; set; } = new List<DimPublication>();
9599

100+
public virtual ICollection<DimPublication> DimPublicationReportSwitchNavigations { get; set; } = new List<DimPublication>();
101+
96102
public virtual ICollection<DimPublication> DimPublicationTargetAudienceCodeNavigations { get; set; } = new List<DimPublication>();
97103

98104
public virtual ICollection<DimPublication> DimPublicationThesisTypeCodeNavigations { get; set; } = new List<DimPublication>();

0 commit comments

Comments
 (0)