Skip to content

Need to remosve some more dependency in openAPI project. #1779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binon merged 1 commit into from
Apr 16, 2026
Merged

Need to remosve some more dependency in openAPI project. #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IFindwiseApiFacade.cs
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,8 @@
<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
</ItemGroup>

<ItemGroup>
<Folder Include="Services\Findwise\" />
</ItemGroup>

</Project>
76 changes: 1 addition & 75 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public class CatalogueService : ICatalogueService
private readonly IBookmarkRepository bookmarkRepository;
private readonly INodeRepository nodeRepository;
private readonly INodeActivityRepository nodeActivityRepository;
private readonly IFindwiseApiFacade findwiseApiFacade;
private readonly LearningHubConfig learningHubConfig;
private readonly FindwiseConfig findwiseConfig;
private readonly INotificationSenderService notificationSenderService;
Expand All @@ -78,8 +77,7 @@ public class CatalogueService : ICatalogueService
/// <param name="emailSenderService"></param>
/// <param name="bookmarkRepository"></param>
/// <param name="nodeActivityRepository"></param>
/// <param name="findwiseApiFacade"></param>
public CatalogueService(ICatalogueRepository catalogueRepository, ICategoryService categoryService, 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)
public CatalogueService(ICatalogueRepository catalogueRepository, ICategoryService categoryService, 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, INotificationSenderService notificationSenderService, ITimezoneOffsetManager timezoneOffsetManager)
{
this.catalogueRepository = catalogueRepository;
this.categoryService = categoryService;
Expand All @@ -97,7 +95,6 @@ public CatalogueService(ICatalogueRepository catalogueRepository, ICategoryServi
this.emailSenderService = emailSenderService;
this.bookmarkRepository = bookmarkRepository;
this.nodeActivityRepository = nodeActivityRepository;
this.findwiseApiFacade = findwiseApiFacade;
this.learningHubConfig = learningHubConfig.Value;
this.findwiseConfig = findwiseConfig.Value;
this.timezoneOffsetManager = timezoneOffsetManager;
Expand Down Expand Up @@ -575,24 +572,6 @@ public async Task<LearningHubValidationResult> CreateCatalogueAsync(int userId,

var catalogueNodeVersionId = await this.catalogueNodeVersionRepository.CreateCatalogueAsync(userId, catalogue);

// Catalogue is in database, push to findwise
var cnv = this.catalogueNodeVersionRepository.GetAll()
.Include(x => x.NodeVersion).ThenInclude(x => x.Node)
.Include(x => x.Keywords)
.Include(x => x.CatalogueNodeVersionProvider)
.SingleOrDefault(x => x.Id == catalogueNodeVersionId);

if (cnv != null)
{
var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
if (searchModel.Description.Length > this.findwiseConfig.DescriptionLengthLimit)
{
searchModel.Description = searchModel.Description.Substring(0, this.findwiseConfig.DescriptionLengthLimit - 4) + "</p>";
}

await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
}

return new LearningHubValidationResult(true)
{
CreatedId = catalogueNodeVersionId,
Expand Down Expand Up @@ -809,24 +788,6 @@ public async Task<LearningHubValidationResult> UpdateCatalogueAsync(int userId,

await this.catalogueNodeVersionRepository.UpdateCatalogueAsync(userId, catalogue);

// Update catalogue in findwise
var cnv = this.catalogueNodeVersionRepository.GetAll()
.Include(x => x.NodeVersion).ThenInclude(x => x.Node)
.Include(x => x.Keywords)
.Include(x => x.CatalogueNodeVersionProvider)
.SingleOrDefault(x => x.Id == catalogue.CatalogueNodeVersionId);

if (cnv != null)
{
var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
if (searchModel.Description.Length > this.findwiseConfig.DescriptionLengthLimit)
{
searchModel.Description = searchModel.Description.Substring(0, this.findwiseConfig.DescriptionLengthLimit - 4) + "</p>";
}

await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
}

return new LearningHubValidationResult(true);
}

Expand All @@ -853,24 +814,6 @@ public async Task<LearningHubValidationResult> ShowCatalogueAsync(int userId, in

await this.catalogueNodeVersionRepository.ShowCatalogue(userId, nodeId);

var cnv = this.catalogueNodeVersionRepository.GetAll()
.Include(x => x.NodeVersion).ThenInclude(x => x.Node)
.Include(x => x.Keywords)
.Include(x => x.CatalogueNodeVersionProvider)
.SingleOrDefault(x => x.NodeVersion.NodeId == nodeId);

// update findwise
if (cnv != null)
{
var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
if (searchModel.Description.Length > this.findwiseConfig.DescriptionLengthLimit)
{
searchModel.Description = searchModel.Description.Substring(0, this.findwiseConfig.DescriptionLengthLimit - 4) + "</p>";
}

await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
}

return new LearningHubValidationResult(true);
}

Expand Down Expand Up @@ -927,23 +870,6 @@ public async Task HideCatalogueAsync(int userId, int nodeId)

node.Hidden = true;
await this.nodeRepository.UpdateAsync(userId, node);

// update findwise
var cnv = this.catalogueNodeVersionRepository.GetAll()
.Include(x => x.NodeVersion).ThenInclude(x => x.Node)
.Include(x => x.Keywords)
.Include(x => x.CatalogueNodeVersionProvider)
.SingleOrDefault(x => x.NodeVersion.NodeId == nodeId);
if (cnv != null)
{
var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
if (searchModel.Description.Length > this.findwiseConfig.DescriptionLengthLimit)
{
searchModel.Description = searchModel.Description.Substring(0, this.findwiseConfig.DescriptionLengthLimit - 4) + "</p>";
}

await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
}
}


Expand Down
132 changes: 0 additions & 132 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/Findwise/FindwiseApiFacade.cs
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/Findwise/NullFindwiseApiFacade.cs
View file
Open in desktop

This file was deleted.

Loading
Loading