conflicts resloved

Author: AnjuJose011

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

@@ -92,6 +92,7 @@ public class CatalogueService : ICatalogueService
         /// <param name="emailTemplateService">emailTemplateService.</param>
         public CatalogueService(
         ICatalogueRepository catalogueRepository,
+        ICategoryService @object,
         INodeRepository nodeRepository,
         IUserUserGroupRepository userUserGroupRepository,
         IMapper mapper,

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

@@ -73,13 +73,13 @@ public CatalogueServiceTests()
             this.timezoneOffsetManager = new Mock<ITimezoneOffsetManager>();
             this.govMessageSevice = new Mock<IGovMessageService>();
             this.emailTemplateService = new Mock<IEmailTemplateService>();
-            this.catalogueService = new CatalogueService(this.catalogueRepository.Object,
+            this.categoryService = new Mock<ICategoryService>();
+            this.catalogueService = new CatalogueService(this.catalogueRepository.Object, this.categoryService.Object,
                 this.nodeRepository.Object, this.userUserGroupRepository.Object, 
                 this.mapper.Object, this.findwiseConfig.Object, this.learningHubConfig.Object, 
                 this.catalogueNodeVersionRepository.Object, this.nodeResourceRepository.Object, this.resourceVersionRepository.Object,
-                this.roleUserGroupRepository.Object, this.providerService.Object, this.catalogueAccessRequestRepository.Object, this.userRepository.Object, this.userProfileRepository.Object, this.emailSenderService.Object, this.bookmarkRepository.Object, this.nodeActivityRepository.Object, this.findwiseApiFacade.Object, this.notificationSenderService.Object, this.timezoneOffsetManager.Object, this.categoryService.Object, this.govMessageSevice.Object, this.emailTemplateService.Object);
-            this.categoryService = new Mock<ICategoryService>();
-            this.catalogueService = new CatalogueService(this.catalogueRepository.Object, this.categoryService.Object, this.nodeRepository.Object, this.userUserGroupRepository.Object, this.mapper.Object, this.findwiseConfig.Object, this.learningHubConfig.Object, this.catalogueNodeVersionRepository.Object, this.nodeResourceRepository.Object, this.resourceVersionRepository.Object, this.roleUserGroupRepository.Object, this.providerService.Object, this.catalogueAccessRequestRepository.Object, this.userRepository.Object, this.userProfileRepository.Object, this.emailSenderService.Object, this.bookmarkRepository.Object, this.nodeActivityRepository.Object, this.notificationSenderService.Object,this.timezoneOffsetManager.Object);
+                this.roleUserGroupRepository.Object, this.providerService.Object, this.catalogueAccessRequestRepository.Object, this.userRepository.Object, this.userProfileRepository.Object, this.emailSenderService.Object, this.bookmarkRepository.Object, this.nodeActivityRepository.Object, this.notificationSenderService.Object, this.timezoneOffsetManager.Object, this.categoryService.Object, this.govMessageSevice.Object, this.emailTemplateService.Object);
+            
         }
 
         private static IEnumerable<CatalogueNodeVersion> CatalogueNodeVersionList => new List<CatalogueNodeVersion>()