Skip to content

Commit 7cc1919

Browse files
committed
P3 endpoint fix
1 parent 7c43544 commit 7cc1919

File tree

5 files changed

+113
-1
lines changed

5 files changed

+113
-1
lines changed

OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,15 @@ public static void AddLearningHubMappings(this IServiceCollection services, ICon
146146
services.AddSingleton<IEntityTypeMap, CatalogueNodeVersionMap>();
147147
services.AddSingleton<IEntityTypeMap, CatalogueNodeVersionKeywordMap>();
148148
services.AddSingleton<IEntityTypeMap, CatalogueNodeVersionProviderMap>();
149+
services.AddSingleton<IEntityTypeMap, HierarchyEditMap>();
150+
services.AddSingleton<IEntityTypeMap, HierarchyEditDetailMap>();
149151
services.AddSingleton<IEntityTypeMap, FolderNodeVersionMap>();
150152
services.AddSingleton<IEntityTypeMap, NodeMap>();
151153
services.AddSingleton<IEntityTypeMap, NodeLinkMap>();
152154
services.AddSingleton<IEntityTypeMap, NodeVersionMap>();
153155
services.AddSingleton<IEntityTypeMap, NodePathMap>();
154156
services.AddSingleton<IEntityTypeMap, NodePathNodeMap>();
157+
services.AddSingleton<IEntityTypeMap, NodeResourceLookupMap>();
155158
services.AddSingleton<IEntityTypeMap, NodeResourceMap>();
156159
services.AddSingleton<IEntityTypeMap, PublicationMap>();
157160
services.AddSingleton<IEntityTypeMap, ResourceAzureMediaAssetMap>();
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
namespace LearningHub.Nhs.OpenApi.Repositories.Map.Hierarchy
2+
{
3+
using LearningHub.Nhs.Models.Entities.Hierarchy;
4+
using Microsoft.EntityFrameworkCore;
5+
using Microsoft.EntityFrameworkCore.Metadata.Builders;
6+
7+
/// <summary>
8+
/// The hierarchy edit map.
9+
/// </summary>
10+
public class HierarchyEditDetailMap : BaseEntityMap<HierarchyEditDetail>
11+
{
12+
/// <summary>
13+
/// The internal map.
14+
/// </summary>
15+
/// <param name="modelBuilder">The model builder.</param>
16+
protected override void InternalMap(EntityTypeBuilder<HierarchyEditDetail> modelBuilder)
17+
{
18+
modelBuilder.ToTable("HierarchyEditDetail", "hierarchy");
19+
20+
modelBuilder.HasOne(d => d.HierarchyEdit)
21+
.WithMany(p => p.HierarchyEditDetail)
22+
.HasForeignKey(d => d.HierarchyEditId)
23+
.OnDelete(DeleteBehavior.ClientSetNull)
24+
.HasConstraintName("FK_HierarchyEditDetail_HierarchyEdit");
25+
26+
modelBuilder.Property(e => e.HierarchyEditDetailType).HasColumnName("HierarchyEditDetailTypeId")
27+
.HasConversion<int>();
28+
29+
modelBuilder.Property(e => e.HierarchyEditDetailOperation).HasColumnName("HierarchyEditDetailOperationId")
30+
.HasConversion<int>();
31+
}
32+
}
33+
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
namespace LearningHub.Nhs.OpenApi.Repositories.Map.Hierarchy
2+
{
3+
using LearningHub.Nhs.Models.Entities.Hierarchy;
4+
using Microsoft.EntityFrameworkCore;
5+
using Microsoft.EntityFrameworkCore.Metadata.Builders;
6+
7+
/// <summary>
8+
/// The hierarchy edit map.
9+
/// </summary>
10+
public class HierarchyEditMap : BaseEntityMap<HierarchyEdit>
11+
{
12+
/// <summary>
13+
/// The internal map.
14+
/// </summary>
15+
/// <param name="modelBuilder">The model builder.</param>
16+
protected override void InternalMap(EntityTypeBuilder<HierarchyEdit> modelBuilder)
17+
{
18+
modelBuilder.ToTable("HierarchyEdit", "hierarchy");
19+
20+
modelBuilder.Property(e => e.HierarchyEditStatus).HasColumnName("HierarchyEditStatusId")
21+
.HasConversion<int>();
22+
23+
modelBuilder.HasOne(d => d.CreateUser)
24+
.WithMany(p => p.HierarchyEdit)
25+
.HasForeignKey(d => d.CreateUserId)
26+
.OnDelete(DeleteBehavior.ClientSetNull)
27+
.HasConstraintName("FK_HierarchyEdit_CreateUser");
28+
29+
modelBuilder.HasOne(d => d.RootNode)
30+
.WithMany()
31+
.HasForeignKey(d => d.RootNodeId)
32+
.HasConstraintName("FK_HierarchyEdit_Node");
33+
34+
modelBuilder.HasOne(d => d.Publication)
35+
.WithMany()
36+
.HasForeignKey(d => d.PublicationId)
37+
.OnDelete(DeleteBehavior.ClientSetNull)
38+
.HasConstraintName("FK_HierarchyEdit_Publication");
39+
}
40+
}
41+
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
namespace LearningHub.Nhs.OpenApi.Repositories.Map.Hierarchy
2+
{
3+
using LearningHub.Nhs.Models.Entities.Hierarchy;
4+
using Microsoft.EntityFrameworkCore;
5+
using Microsoft.EntityFrameworkCore.Metadata.Builders;
6+
7+
/// <summary>
8+
/// The node resource lookup map.
9+
/// </summary>
10+
public class NodeResourceLookupMap : BaseEntityMap<NodeResourceLookup>
11+
{
12+
/// <summary>
13+
/// The internal map.
14+
/// </summary>
15+
/// <param name="modelBuilder">The model builder.</param>
16+
protected override void InternalMap(EntityTypeBuilder<NodeResourceLookup> modelBuilder)
17+
{
18+
modelBuilder.ToTable("NodeResourceLookup", "hierarchy");
19+
20+
modelBuilder.HasOne(d => d.Node)
21+
.WithMany()
22+
.HasForeignKey(d => d.NodeId)
23+
.OnDelete(DeleteBehavior.ClientSetNull)
24+
.HasConstraintName("FK_NodeResourceLookup_Node");
25+
26+
modelBuilder.HasOne(d => d.Resource)
27+
.WithMany()
28+
.HasForeignKey(d => d.ResourceId)
29+
.OnDelete(DeleteBehavior.ClientSetNull)
30+
.HasConstraintName("FK_NodeResourceLookup_Resource");
31+
}
32+
}
33+
}

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class CatalogueService : ICatalogueService
7676
/// <param name="bookmarkRepository"></param>
7777
/// <param name="nodeActivityRepository"></param>
7878
/// <param name="findwiseApiFacade"></param>
79-
public CatalogueService(ICatalogueRepository catalogueRepository, INodeRepository nodeRepository, IUserUserGroupRepository userUserGroupRepository, IMapper mapper, IOptions<FindwiseConfig> findwiseConfig, IOptions<LearningHubConfig> learningHubConfig, ICatalogueNodeVersionRepository catalogueNodeVersionRepository, INodeResourceRepository nodeResourceRepository, IResourceVersionRepository resourceVersionRepository, IRoleUserGroupRepository roleUserGroupRepository, IProviderService providerService, ICatalogueAccessRequestRepository catalogueAccessRequestRepository, IUserRepository userRepository, IUserProfileRepository userProfileRepository, IEmailSenderService emailSenderService, IBookmarkRepository bookmarkRepository,INodeActivityRepository nodeActivityRepository, IFindwiseApiFacade findwiseApiFacade)
79+
public CatalogueService(ICatalogueRepository catalogueRepository, INodeRepository nodeRepository, IUserUserGroupRepository userUserGroupRepository, IMapper mapper, IOptions<FindwiseConfig> findwiseConfig, IOptions<LearningHubConfig> learningHubConfig, ICatalogueNodeVersionRepository catalogueNodeVersionRepository, INodeResourceRepository nodeResourceRepository, IResourceVersionRepository resourceVersionRepository, IRoleUserGroupRepository roleUserGroupRepository, IProviderService providerService, ICatalogueAccessRequestRepository catalogueAccessRequestRepository, IUserRepository userRepository, IUserProfileRepository userProfileRepository, IEmailSenderService emailSenderService, IBookmarkRepository bookmarkRepository,INodeActivityRepository nodeActivityRepository, IFindwiseApiFacade findwiseApiFacade, INotificationSenderService notificationSenderService, ITimezoneOffsetManager timezoneOffsetManager)
8080
{
8181
this.catalogueRepository = catalogueRepository;
8282
this.nodeRepository = nodeRepository;
@@ -96,6 +96,8 @@ public CatalogueService(ICatalogueRepository catalogueRepository, INodeRepositor
9696
this.findwiseApiFacade = findwiseApiFacade;
9797
this.learningHubConfig = learningHubConfig.Value;
9898
this.findwiseConfig = findwiseConfig.Value;
99+
this.timezoneOffsetManager = timezoneOffsetManager;
100+
this.notificationSenderService = notificationSenderService;
99101
}
100102

101103
/// <summary>

0 commit comments

Comments
 (0)