reference ,DI and swagger documentation fix

Author: OluwatobiAwe

OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Startup.cs

@@ -4,12 +4,16 @@ namespace LearningHub.Nhs.OpenApi.Repositories
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Activity;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Hierarchy;
+    using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Maintenance;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Messaging;
+    using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Migrations;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Resources;
     using LearningHub.Nhs.OpenApi.Repositories.Repositories;
     using LearningHub.Nhs.OpenApi.Repositories.Repositories.Activity;
     using LearningHub.Nhs.OpenApi.Repositories.Repositories.Hierarchy;
+    using LearningHub.Nhs.OpenApi.Repositories.Repositories.Maintenance;
     using LearningHub.Nhs.OpenApi.Repositories.Repositories.Messaging;
+    using LearningHub.Nhs.OpenApi.Repositories.Repositories.Migrations;
     using LearningHub.Nhs.OpenApi.Repositories.Repositories.Resources;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
@@ -106,6 +110,8 @@ private static void AddRepositoryImplementations(this IServiceCollection service
 
             // External
             services.AddScoped<IUserProfileRepository, UserProfileRepository>();
+            services.AddScoped<IInternalSystemRepository, InternalSystemRepository>();
+            services.AddScoped<IMigrationSourceRepository, MigrationSourceRepository>();
 
         }
     }

OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/ICatalogueService.cs

@@ -6,7 +6,7 @@
     using LearningHub.Nhs.Models.Entities;
     using LearningHub.Nhs.Models.Validation;
     using LearningHub.Nhs.OpenApi.Models.ViewModels;
-    using CatalogueViewModel = LearningHub.Nhs.Models.Catalogue.CatalogueViewModel;
+    using CatalogueViewModel = Nhs.Models.Catalogue.CatalogueViewModel;
 
     /// <summary>
     /// The CatalogueService interface.
@@ -24,7 +24,7 @@ public interface ICatalogueService
         /// </summary>
         /// <param name="id">The id.</param>
         /// <returns>The catalogue view model.</returns>
-        Task<Nhs.Models.Catalogue.CatalogueViewModel> GetCatalogueAsync(int id);
+        Task<CatalogueViewModel> GetCatalogueAsync(int id);
 
         /// <summary>
         /// The GetResources.

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

@@ -22,7 +22,7 @@ public class CachingService : ICachingService
         /// Initializes a new instance of the <see cref="CachingService"/> class.
         /// </summary>
         /// <param name="cacheService">The cache.</param>
-        /// <param name="settings">The settings.</param>
+        /// <param name="learningHubConfig">The settings.</param>
         /// <param name="logger">The logger.</param>
         public CachingService(ICacheService cacheService, IOptions<LearningHubConfig> learningHubConfig, ILogger<CacheService> logger)
         {
@@ -49,7 +49,7 @@ public async Task<CacheReadResponse<T>> GetAsync<T>(string key)
 
             try
             {
-                var value = await cacheService.GetAsync<T>(key);
+                var value = await this.cacheService.GetAsync<T>(key);
                 if (value == null)
                 {
                     return new CacheReadResponse<T>()

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

@@ -17,7 +17,7 @@
     using LearningHub.Nhs.Models.Search;
     using LearningHub.Nhs.Models.Validation;
     using LearningHub.Nhs.OpenApi.Models.Configuration;
-    using LearningHub.Nhs.OpenApi.Models.ViewModels;
+    // using LearningHub.Nhs.OpenApi.Models.ViewModels;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Activity;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Hierarchy;
@@ -27,7 +27,6 @@
     using Microsoft.EntityFrameworkCore;
     using Microsoft.Extensions.Options;
     using Newtonsoft.Json;
-    using CatalogueViewModel = LearningHub.Nhs.Models.Catalogue.CatalogueViewModel;
 
     /// <summary>
     /// The resource service.
@@ -104,11 +103,11 @@ public CatalogueService(ICatalogueRepository catalogueRepository, INodeRepositor
         /// Get all catalogues async.
         /// </summary>
         /// <returns>BulkCatalogueViewModel.</returns>
-        public async Task<BulkCatalogueViewModel> GetAllCatalogues()
+        public async Task<Models.ViewModels.BulkCatalogueViewModel> GetAllCatalogues()
         {
             var catalogueNodeVersions = await this.catalogueRepository.GetAllCatalogues();
             var catalogueViewModels = catalogueNodeVersions.Select(c => new Models.ViewModels.CatalogueViewModel(c)).ToList();
-            return new BulkCatalogueViewModel(catalogueViewModels);
+            return new Models.ViewModels.BulkCatalogueViewModel(catalogueViewModels);
         }
 
 

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

@@ -69,8 +69,8 @@ public class HierarchyService : IHierarchyService
         private readonly IHierarchyEditRepository hierarchyEditRepository;
         public readonly INodeResourceLookupRepository resourceLookupRepository;
         public readonly IPublicationRepository publicationRepository;
-        public readonly InternalSystemService internalSystemService;
-        public readonly QueueCommunicatorService queueCommunicatorService;
+        public readonly IInternalSystemService internalSystemService;
+        public readonly IQueueCommunicatorService queueCommunicatorService;
         public readonly LearningHubConfig learningHubConfig;
         public readonly INodeResourceLookupRepository nodeResourceLookupRepository;
 
@@ -117,6 +117,7 @@ public class HierarchyService : IHierarchyService
         /// <param name="logger">
         /// The logger.
         /// </param>
+        /// <param name="learningHubConfig"></param>
         /// <param name="ratingService">
         /// The rating service.
         /// </param>
@@ -143,8 +144,8 @@ public HierarchyService(
             ICachingService cachingService,
             ILogger<HierarchyService> logger,
             IOptions<LearningHubConfig> learningHubConfig,
-            InternalSystemService internalSystemService,
-            QueueCommunicatorService queueCommunicatorService,
+            IInternalSystemService internalSystemService,
+            IQueueCommunicatorService queueCommunicatorService,
             IMapper mapper,
             IResourceReferenceRepository resourceReferenceRepository)
         {

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

@@ -95,7 +95,7 @@ public class ResourceService : IResourceService
         private readonly ICatalogueService catalogueService;
         private readonly IUserService userService;
         private readonly IProviderService providerService;
-        private readonly InternalSystemService internalSystemService;
+        private readonly IInternalSystemService internalSystemService;
         private readonly IQueueCommunicatorService queueCommunicatorService;
         private readonly IResourceVersionProviderRepository resourceVersionProviderRepository;
         private readonly IResourceVersionAuthorRepository resourceVersionAuthorRepository;
@@ -115,16 +115,52 @@ public class ResourceService : IResourceService
         /// <param name="mapper"></param>
         /// <param name="fileRepository"></param>
         /// <param name="azureConfig"></param>
+        /// <param name="learningHubConfig"></param>
         /// <param name="userProfileService"></param>
         /// <param name="resourceVersionFlagRepository"></param>
+        /// <param name="articleResourceVersionRepository"></param>
+        /// <param name="audioResourceVersionRepository"></param>
+        /// <param name="videoResourceVersionRepository"></param>
+        /// <param name="assessmentResourceVersionRepository"></param>
+        /// <param name="resourceLicenceRepository"></param>
+        /// <param name="resourceReferenceRepository"></param>
+        /// <param name="resourceVersionUserAcceptanceRepository"></param>
+        /// <param name="catalogueNodeVersionRepository"></param>
+        /// <param name="cachingService"></param>
+        /// <param name="searchService"></param>
+        /// <param name="catalogueService"></param>
+        /// <param name="nodeResourceRepository"></param>
+        /// <param name="nodePathRepository"></param>
+        /// <param name="userService"></param>
+        /// <param name="nodeRepository"></param>
+        /// <param name="dbContext"></param>
         /// <param name=""></param>
         /// <param name="learningHubService">
         /// The <see cref="ILearningHubService"/>.
         /// </param>
+        /// <param name="internalSystemService"></param>
+        /// <param name="resourceVersionAuthorRepository"></param>
+        /// <param name="fileChunkDetailRepository"></param>
+        /// <param name="queueCommunicatorService"></param>
         /// <param name="resourceRepository">
         /// The <see cref="IResourceRepository"/>.
         /// </param>
-        public ResourceService(ILearningHubService learningHubService, InternalSystemService internalSystemService, IResourceVersionAuthorRepository resourceVersionAuthorRepository,IFileChunkDetailRepository fileChunkDetailRepository, IQueueCommunicatorService queueCommunicatorService, IResourceRepository resourceRepository, IResourceVersionProviderRepository resourceVersionProviderRepository,IProviderService providerService, IArticleResourceVersionFileRepository articleResourceVersionFileRepository, IPublicationRepository publicationRepository,IMigrationSourceRepository migrationSourceRepository,IQuestionBlockRepository questionBlockRepository, IVideoRepository videoRepository, IWholeSlideImageRepository wholeSlideImageRepository, IEmbeddedResourceVersionRepository embeddedResourceVersionRepository, IEquipmentResourceVersionRepository equipmentResourceVersionRepository, IImageResourceVersionRepository imageResourceVersionRepository, IBookmarkRepository bookmarkRepository, IAssessmentResourceActivityMatchQuestionRepository assessmentResourceActivityMatchQuestionRepository, IResourceVersionKeywordRepository resourceVersionKeywordRepository, IResourceVersionValidationResultRepository resourceVersionValidationResultRepository, ILogger<ResourceService> logger, IWebLinkResourceVersionRepository webLinkResourceVersionRepository, ICaseResourceVersionRepository caseResourceVersionRepository, IScormResourceVersionRepository scormResourceVersionRepository, IGenericFileResourceVersionRepository genericFileResourceVersionRepository, IResourceVersionRepository resourceVersionRepository, IHtmlResourceVersionRepository htmlResourceVersionRepository,IMapper mapper, IFileRepository fileRepository, IOptions<AzureConfig> azureConfig, IOptions<LearningHubConfig> learningHubConfig, IUserProfileService userProfileService,IResourceVersionFlagRepository resourceVersionFlagRepository, IArticleResourceVersionRepository articleResourceVersionRepository, IAudioResourceVersionRepository audioResourceVersionRepository, IVideoResourceVersionRepository videoResourceVersionRepository, IAssessmentResourceVersionRepository assessmentResourceVersionRepository, IResourceLicenceRepository resourceLicenceRepository, IResourceReferenceRepository resourceReferenceRepository, IResourceVersionUserAcceptanceRepository resourceVersionUserAcceptanceRepository, ICatalogueNodeVersionRepository catalogueNodeVersionRepository, ICachingService cachingService, ISearchService searchService, ICatalogueService catalogueService, INodeResourceRepository nodeResourceRepository, INodePathRepository nodePathRepository, IUserService userService, INodeRepository nodeRepository, LearningHubDbContext dbContext)
+        /// <param name="resourceVersionProviderRepository"></param>
+        /// <param name="providerService"></param>
+        /// <param name="articleResourceVersionFileRepository"></param>
+        /// <param name="publicationRepository"></param>
+        /// <param name="migrationSourceRepository"></param>
+        /// <param name="questionBlockRepository"></param>
+        /// <param name="videoRepository"></param>
+        /// <param name="wholeSlideImageRepository"></param>
+        /// <param name="embeddedResourceVersionRepository"></param>
+        /// <param name="equipmentResourceVersionRepository"></param>
+        /// <param name="imageResourceVersionRepository"></param>
+        /// <param name="bookmarkRepository"></param>
+        /// <param name="assessmentResourceActivityMatchQuestionRepository"></param>
+        /// <param name="resourceVersionKeywordRepository"></param>
+        /// <param name="resourceVersionValidationResultRepository"></param>
+        public ResourceService(ILearningHubService learningHubService, IInternalSystemService internalSystemService, IResourceVersionAuthorRepository resourceVersionAuthorRepository, IFileChunkDetailRepository fileChunkDetailRepository, IQueueCommunicatorService queueCommunicatorService, IResourceRepository resourceRepository, IResourceVersionProviderRepository resourceVersionProviderRepository, IProviderService providerService, IArticleResourceVersionFileRepository articleResourceVersionFileRepository, IPublicationRepository publicationRepository, IMigrationSourceRepository migrationSourceRepository, IQuestionBlockRepository questionBlockRepository, IVideoRepository videoRepository, IWholeSlideImageRepository wholeSlideImageRepository, IEmbeddedResourceVersionRepository embeddedResourceVersionRepository, IEquipmentResourceVersionRepository equipmentResourceVersionRepository, IImageResourceVersionRepository imageResourceVersionRepository, IBookmarkRepository bookmarkRepository, IAssessmentResourceActivityMatchQuestionRepository assessmentResourceActivityMatchQuestionRepository, IResourceVersionKeywordRepository resourceVersionKeywordRepository, IResourceVersionValidationResultRepository resourceVersionValidationResultRepository, ILogger<ResourceService> logger, IWebLinkResourceVersionRepository webLinkResourceVersionRepository, ICaseResourceVersionRepository caseResourceVersionRepository, IScormResourceVersionRepository scormResourceVersionRepository, IGenericFileResourceVersionRepository genericFileResourceVersionRepository, IResourceVersionRepository resourceVersionRepository, IHtmlResourceVersionRepository htmlResourceVersionRepository, IMapper mapper, IFileRepository fileRepository, IOptions<AzureConfig> azureConfig, IOptions<LearningHubConfig> learningHubConfig, IUserProfileService userProfileService, IResourceVersionFlagRepository resourceVersionFlagRepository, IArticleResourceVersionRepository articleResourceVersionRepository, IAudioResourceVersionRepository audioResourceVersionRepository, IVideoResourceVersionRepository videoResourceVersionRepository, IAssessmentResourceVersionRepository assessmentResourceVersionRepository, IResourceLicenceRepository resourceLicenceRepository, IResourceReferenceRepository resourceReferenceRepository, IResourceVersionUserAcceptanceRepository resourceVersionUserAcceptanceRepository, ICatalogueNodeVersionRepository catalogueNodeVersionRepository, ICachingService cachingService, ISearchService searchService, ICatalogueService catalogueService, INodeResourceRepository nodeResourceRepository, INodePathRepository nodePathRepository, IUserService userService, INodeRepository nodeRepository, LearningHubDbContext dbContext)
         {
             this.learningHubService = learningHubService;
             this.resourceRepository = resourceRepository;

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

@@ -21,8 +21,6 @@ namespace LearningHub.Nhs.OpenApi.Services.Services
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
     using Newtonsoft.Json;
-    using static System.Net.Mime.MediaTypeNames;
-    using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
     /// <summary>
     /// The search service.
@@ -33,7 +31,6 @@ public class SearchService : ISearchService
         private readonly IResourceRepository resourceRepository;
         private readonly IFindwiseClient findwiseClient;
         private readonly ILogger logger;
-        private readonly IResourceService resourceService;
         private readonly FindwiseConfig findwiseConfig;
 
         /// <summary>
@@ -52,22 +49,17 @@ public class SearchService : ISearchService
         /// <param name="resourceRepository">
         /// The <see cref="IResourceRepository"/>.
         /// </param>
-        /// <param name="resourceService">
-        /// The <see cref="IResourceService"/>.
-        /// </param>
         /// <param name="logger">Logger.</param>
         public SearchService(
             ILearningHubService learningHubService,
             IFindwiseClient findwiseClient,
             IOptions<FindwiseConfig> findwiseConfig,
             IResourceRepository resourceRepository,
-            IResourceService resourceService,
             ILogger<SearchService> logger)
         {
             this.learningHubService = learningHubService;
             this.findwiseClient = findwiseClient;
             this.resourceRepository = resourceRepository;
-            this.resourceService = resourceService;
             this.logger = logger;
             this.findwiseConfig = findwiseConfig.Value;
         }

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

@@ -33,17 +33,14 @@ public static void AddServices(this IServiceCollection services)
             services.AddScoped<IFileTypeService, FileTypeService>();
             services.AddScoped<IHierarchyService, HierarchyService>();
             services.AddScoped<ISecurityService, SecurityService>();
-            services.AddScoped<IResourceService, ResourceService>();
             services.AddScoped<IUserService, UserService>();
             services.AddTransient<IQueueCommunicatorService, QueueCommunicatorService>();
-            services.AddTransient<ICatalogueService, CatalogueService>();
             services.AddScoped<IFindwiseApiFacade, FindwiseApiFacade>();
             services.AddScoped<IEmailSenderService, EmailSenderService>();
             services.AddScoped<IEmailTemplateService, EmailTemplateService>();
             services.AddScoped<IMessageService, MessageService>();
             services.AddScoped<INotificationTemplateService, NotificationTemplateService>();
             services.AddScoped<INotificationSenderService, NotificationSenderService>();
-            services.AddScoped<IBookmarkService, BookmarkService>();
             services.AddScoped<IInternalSystemService, InternalSystemService>();
             services.AddScoped<IUserProfileService, UserProfileService>();
             services.AddScoped<ICachingService, CachingService>();

OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs

@@ -80,7 +80,7 @@ public class ResourceServiceTests
      private readonly Mock<ICatalogueService> catalogueService;
      private readonly Mock<IUserService> userService;
      private readonly Mock<IProviderService> providerService;
-     private readonly Mock<InternalSystemService> internalSystemService;
+     private readonly Mock<IInternalSystemService> internalSystemService;
      private readonly Mock<IQueueCommunicatorService> queueCommunicatorService;
      private readonly Mock<IResourceVersionProviderRepository> resourceVersionProviderRepository;
      private readonly Mock<IResourceVersionAuthorRepository> resourceVersionAuthorRepository;
@@ -138,7 +138,7 @@ public ResourceServiceTests()
             this.catalogueService = new Mock<ICatalogueService>();
             this.userService = new Mock<IUserService>();
             this.providerService = new Mock<IProviderService>();
-            this.internalSystemService = new Mock<InternalSystemService>();
+            this.internalSystemService = new Mock<IInternalSystemService>();
             this.queueCommunicatorService = new Mock<IQueueCommunicatorService>();
             this.resourceVersionProviderRepository = new Mock<IResourceVersionProviderRepository>();
             this.resourceVersionAuthorRepository = new Mock<IResourceVersionAuthorRepository>();