From f3a1e68d9551c88816145c0c958d8b927313dac2 Mon Sep 17 00:00:00 2001 From: Harshit Agarwal Date: Tue, 28 Feb 2023 10:29:32 +0530 Subject: [PATCH 1/2] Upgrading Nuget Packages to latest versions. --- .../NotificationHandler.csproj | 8 ++++---- .../DirectSend.Core/DirectSend.NetCore.csproj | 8 ++++---- .../DirectSend.UnitTests.csproj | 4 ++-- .../NotificationService.BusinessLibrary.csproj | 10 +++++----- .../Logger/AILogger.cs | 4 ++-- .../NotificationService.Common.csproj | 8 ++++---- .../NotificationService.Contracts.csproj | 4 ++-- .../NotificationService.Data.csproj | 10 +++++----- .../EmailNotificationRepository.cs | 2 +- .../Repositories/MailAttachmentRepository.cs | 2 +- .../Repositories/MailTemplateRepository.cs | 2 +- .../TableStorageEmailRepository.cs | 18 +++++++++--------- .../NotificationService.FunctionalTests.csproj | 4 ++-- .../NotificationService.SvCommon.csproj | 8 ++++---- .../NotificationService.UnitTests.csproj | 4 ++-- .../NotificationService.csproj | 14 +++++++------- .../NotificationsQueueProcessor.csproj | 12 ++++++------ 17 files changed, 61 insertions(+), 61 deletions(-) diff --git a/NotificationService/NotificationHandler/NotificationHandler.csproj b/NotificationService/NotificationHandler/NotificationHandler.csproj index 1b0249a..fd30af5 100644 --- a/NotificationService/NotificationHandler/NotificationHandler.csproj +++ b/NotificationService/NotificationHandler/NotificationHandler.csproj @@ -6,17 +6,17 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/NotificationService/NotificationProviders/DirectSend.Core/DirectSend.NetCore.csproj b/NotificationService/NotificationProviders/DirectSend.Core/DirectSend.NetCore.csproj index 5b2ad58..227fe93 100644 --- a/NotificationService/NotificationProviders/DirectSend.Core/DirectSend.NetCore.csproj +++ b/NotificationService/NotificationProviders/DirectSend.Core/DirectSend.NetCore.csproj @@ -7,14 +7,14 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/NotificationService/NotificationProviders/DirectSend.Tests/DirectSend.UnitTests.csproj b/NotificationService/NotificationProviders/DirectSend.Tests/DirectSend.UnitTests.csproj index bb81022..0cb53a6 100644 --- a/NotificationService/NotificationProviders/DirectSend.Tests/DirectSend.UnitTests.csproj +++ b/NotificationService/NotificationProviders/DirectSend.Tests/DirectSend.UnitTests.csproj @@ -9,11 +9,11 @@ - + - + diff --git a/NotificationService/NotificationService.BusinessLibrary/NotificationService.BusinessLibrary.csproj b/NotificationService/NotificationService.BusinessLibrary/NotificationService.BusinessLibrary.csproj index b9a659b..faa968a 100644 --- a/NotificationService/NotificationService.BusinessLibrary/NotificationService.BusinessLibrary.csproj +++ b/NotificationService/NotificationService.BusinessLibrary/NotificationService.BusinessLibrary.csproj @@ -9,15 +9,15 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all diff --git a/NotificationService/NotificationService.Common/Logger/AILogger.cs b/NotificationService/NotificationService.Common/Logger/AILogger.cs index 0853c6c..b2ba660 100644 --- a/NotificationService/NotificationService.Common/Logger/AILogger.cs +++ b/NotificationService/NotificationService.Common/Logger/AILogger.cs @@ -130,7 +130,7 @@ public void WriteCustomEvent(string eventName, IDictionary prope /// comma separated expressions of parameters Ex: () => ParameterVariable. public void WriteException(Exception exception, IDictionary properties = null, IDictionary metrics = null, string eventCode = null, params Expression>[] expressionOfParameters) { - var methodParameters = this.GetParameters(expressionOfParameters); + var methodParameters = GetParameters(expressionOfParameters); if (methodParameters != null && methodParameters.Count > 0) { if (properties == null) @@ -366,7 +366,7 @@ private static IDictionary UpdateEventCode(IDictionary /// comma separated expressions of parameters Ex: () => ParameterVariable. /// dictionary of properties. - private Dictionary GetParameters(params Expression>[] expressionOfParameters) + private static Dictionary GetParameters(params Expression>[] expressionOfParameters) { var result = new Dictionary(); MemberExpression memberExpression; diff --git a/NotificationService/NotificationService.Common/NotificationService.Common.csproj b/NotificationService/NotificationService.Common/NotificationService.Common.csproj index cbb6fb3..81a906c 100644 --- a/NotificationService/NotificationService.Common/NotificationService.Common.csproj +++ b/NotificationService/NotificationService.Common/NotificationService.Common.csproj @@ -13,18 +13,18 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/NotificationService/NotificationService.Contracts/NotificationService.Contracts.csproj b/NotificationService/NotificationService.Contracts/NotificationService.Contracts.csproj index ade662a..dd0c2d9 100644 --- a/NotificationService/NotificationService.Contracts/NotificationService.Contracts.csproj +++ b/NotificationService/NotificationService.Contracts/NotificationService.Contracts.csproj @@ -14,11 +14,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/NotificationService/NotificationService.Data/NotificationService.Data.csproj b/NotificationService/NotificationService.Data/NotificationService.Data.csproj index a4a3c29..5a61435 100644 --- a/NotificationService/NotificationService.Data/NotificationService.Data.csproj +++ b/NotificationService/NotificationService.Data/NotificationService.Data.csproj @@ -13,12 +13,12 @@ - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/NotificationService/NotificationService.Data/Repositories/EmailNotificationRepository.cs b/NotificationService/NotificationService.Data/Repositories/EmailNotificationRepository.cs index 228375d..8801aac 100644 --- a/NotificationService/NotificationService.Data/Repositories/EmailNotificationRepository.cs +++ b/NotificationService/NotificationService.Data/Repositories/EmailNotificationRepository.cs @@ -331,7 +331,7 @@ public async Task> GetPendingOrFailedEmailNot return updatedNotificationEntities; } - private Expression> GetMailFilterExpression(NotificationReportRequest notificationReportRequest) + private static Expression> GetMailFilterExpression(NotificationReportRequest notificationReportRequest) { Expression> filterExpression = notification => true; diff --git a/NotificationService/NotificationService.Data/Repositories/MailAttachmentRepository.cs b/NotificationService/NotificationService.Data/Repositories/MailAttachmentRepository.cs index 537a64f..009cd30 100644 --- a/NotificationService/NotificationService.Data/Repositories/MailAttachmentRepository.cs +++ b/NotificationService/NotificationService.Data/Repositories/MailAttachmentRepository.cs @@ -167,7 +167,7 @@ public async Task> DownloadMeetingInvite(IL return notificationEntities; } - private string GetBlobPath(string applicationName, string notificationId, string folderName) + private static string GetBlobPath(string applicationName, string notificationId, string folderName) { return $"{applicationName}/{folderName}/{notificationId}"; } diff --git a/NotificationService/NotificationService.Data/Repositories/MailTemplateRepository.cs b/NotificationService/NotificationService.Data/Repositories/MailTemplateRepository.cs index f5031f4..2e15bfb 100644 --- a/NotificationService/NotificationService.Data/Repositories/MailTemplateRepository.cs +++ b/NotificationService/NotificationService.Data/Repositories/MailTemplateRepository.cs @@ -171,7 +171,7 @@ public async Task DeleteMailTemplate(string applicationName, string templa /// Application sourcing the email template. /// Mail template name. /// Blob name. - private string GetBlobName(string applicationName, string templateName) + private static string GetBlobName(string applicationName, string templateName) { return $"{applicationName}/EmailTemplates/{templateName}"; } diff --git a/NotificationService/NotificationService.Data/Repositories/TableStorageEmailRepository.cs b/NotificationService/NotificationService.Data/Repositories/TableStorageEmailRepository.cs index 24bd37a..2149782 100644 --- a/NotificationService/NotificationService.Data/Repositories/TableStorageEmailRepository.cs +++ b/NotificationService/NotificationService.Data/Repositories/TableStorageEmailRepository.cs @@ -101,7 +101,7 @@ public async Task CreateEmailNotificationItemEntities(IList((List)updatedEmailNotificationItemEntities, ApplicationConstants.BatchSizeToStore).ToList(); + var batchesToCreate = SplitList((List)updatedEmailNotificationItemEntities, ApplicationConstants.BatchSizeToStore).ToList(); foreach (var batch in batchesToCreate) { @@ -202,8 +202,8 @@ public Task, TableContinuationToken>> G this.logger.TraceInformation($"Started {nameof(this.GetEmailNotifications)} method of {nameof(TableStorageEmailRepository)}."); var entities = new List(); var notificationEntities = new List(); - string filterDateExpression = this.GetDateFilterExpression(notificationReportRequest); - string filterExpression = this.GetFilterExpression(notificationReportRequest); + string filterDateExpression = GetDateFilterExpression(notificationReportRequest); + string filterExpression = GetFilterExpression(notificationReportRequest); string finalFilter = filterDateExpression != null && filterDateExpression.Length > 0 ? filterDateExpression : filterExpression; if (filterDateExpression != null && filterDateExpression.Length > 0 && filterExpression != null && filterExpression.Length > 0) { @@ -327,7 +327,7 @@ public async Task CreateMeetingNotificationItemEntities(IList updatedEmailNotificationItemEntities = await this.mailAttachmentRepository.UploadMeetingInvite(meetingNotificationItemEntities, applicationName).ConfigureAwait(false); - var batchesToCreate = this.SplitList((List)updatedEmailNotificationItemEntities, ApplicationConstants.BatchSizeToStore).ToList(); + var batchesToCreate = SplitList((List)updatedEmailNotificationItemEntities, ApplicationConstants.BatchSizeToStore).ToList(); foreach (var batch in batchesToCreate) { @@ -377,8 +377,8 @@ public Task, TableContinuationToken>> this.logger.TraceInformation($"Started {nameof(this.GetMeetingInviteNotifications)} method of {nameof(TableStorageEmailRepository)}."); var entities = new List(); var notificationEntities = new List(); - string filterDateExpression = this.GetDateFilterExpression(meetingInviteReportRequest); - string filterExpression = this.GetFilterExpression(meetingInviteReportRequest); + string filterDateExpression = GetDateFilterExpression(meetingInviteReportRequest); + string filterExpression = GetFilterExpression(meetingInviteReportRequest); string finalFilter = filterDateExpression != null && filterDateExpression.Length > 0 ? filterDateExpression : filterExpression; if (filterDateExpression != null && filterDateExpression.Length > 0 && filterExpression != null && filterExpression.Length > 0) { @@ -540,7 +540,7 @@ private static string GetStatus(int status) return statusStr; } - private string GetFilterExpression(NotificationReportRequest notificationReportRequest) + private static string GetFilterExpression(NotificationReportRequest notificationReportRequest) { var filterSet = new HashSet(); string filterExpression = null; @@ -611,7 +611,7 @@ static string PrepareFilterExp(HashSet filterSet) } } - private string GetDateFilterExpression(NotificationReportRequest notificationReportRequest) + private static string GetDateFilterExpression(NotificationReportRequest notificationReportRequest) { string filterExpression = null; if (DateTime.TryParse(notificationReportRequest.CreatedDateTimeStart, out DateTime createdDateTimeStart)) @@ -654,7 +654,7 @@ private string GetDateFilterExpression(NotificationReportRequest notificationRep /// List of objects. /// Chunk size. /// An enumerable collection of chunks. - private IEnumerable> SplitList(List listItems, int nSize = 4) + private static IEnumerable> SplitList(List listItems, int nSize = 4) { if (listItems is null) { diff --git a/NotificationService/NotificationService.FunctionalTests/NotificationService.FunctionalTests.csproj b/NotificationService/NotificationService.FunctionalTests/NotificationService.FunctionalTests.csproj index 1a4b90b..22dac45 100644 --- a/NotificationService/NotificationService.FunctionalTests/NotificationService.FunctionalTests.csproj +++ b/NotificationService/NotificationService.FunctionalTests/NotificationService.FunctionalTests.csproj @@ -16,10 +16,10 @@ - + - + diff --git a/NotificationService/NotificationService.SvCommon/NotificationService.SvCommon.csproj b/NotificationService/NotificationService.SvCommon/NotificationService.SvCommon.csproj index 1652db7..2256ef8 100644 --- a/NotificationService/NotificationService.SvCommon/NotificationService.SvCommon.csproj +++ b/NotificationService/NotificationService.SvCommon/NotificationService.SvCommon.csproj @@ -5,16 +5,16 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/NotificationService/NotificationService.UnitTests/NotificationService.UnitTests.csproj b/NotificationService/NotificationService.UnitTests/NotificationService.UnitTests.csproj index 30b618d..3908adc 100644 --- a/NotificationService/NotificationService.UnitTests/NotificationService.UnitTests.csproj +++ b/NotificationService/NotificationService.UnitTests/NotificationService.UnitTests.csproj @@ -16,8 +16,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/NotificationService/NotificationService/NotificationService.csproj b/NotificationService/NotificationService/NotificationService.csproj index 5987044..fe618e5 100644 --- a/NotificationService/NotificationService/NotificationService.csproj +++ b/NotificationService/NotificationService/NotificationService.csproj @@ -10,23 +10,23 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/NotificationService/NotificationsQueueProcessor/NotificationsQueueProcessor.csproj b/NotificationService/NotificationsQueueProcessor/NotificationsQueueProcessor.csproj index d58b74d..8082b4e 100644 --- a/NotificationService/NotificationsQueueProcessor/NotificationsQueueProcessor.csproj +++ b/NotificationService/NotificationsQueueProcessor/NotificationsQueueProcessor.csproj @@ -12,15 +12,15 @@ - - + + - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive From d6adb673fa5281b1c4b2e2442b096d76bc1eb943 Mon Sep 17 00:00:00 2001 From: Harshit Agarwal Date: Wed, 1 Mar 2023 00:07:16 +0530 Subject: [PATCH 2/2] Updating Build issues --- .../EmailNotificationRepository.cs | 30 +++++++++---------- .../Repositories/MailAttachmentRepository.cs | 8 ++--- .../Repositories/MailTemplateRepository.cs | 6 ++-- ...otificationRepositoryMeetingInviteTests.cs | 8 ++--- .../EmailNotificationRepositoryTestsBase.cs | 4 +-- .../GetEmailNotificationItemEntitiesTests.cs | 6 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NotificationService/NotificationService.Data/Repositories/EmailNotificationRepository.cs b/NotificationService/NotificationService.Data/Repositories/EmailNotificationRepository.cs index 8801aac..926df10 100644 --- a/NotificationService/NotificationService.Data/Repositories/EmailNotificationRepository.cs +++ b/NotificationService/NotificationService.Data/Repositories/EmailNotificationRepository.cs @@ -213,9 +213,9 @@ public async Task GetEmailNotificationItemEntity(st throw new System.ArgumentNullException(nameof(notificationReportRequest)); } - Expression> filterExpression = this.GetMailFilterExpression(notificationReportRequest); - Expression> projectionExpression = this.GetEmailProjectionExpression(); - Expression> orderExpression = this.GetEmailOrderExpression(); + Expression> filterExpression = GetMailFilterExpression(notificationReportRequest); + Expression> projectionExpression = GetEmailProjectionExpression(); + Expression> orderExpression = GetEmailOrderExpression(); int skip = notificationReportRequest.Skip; int take = notificationReportRequest.Take > 0 ? notificationReportRequest.Take : 100; @@ -293,8 +293,8 @@ public async Task> GetPendingOrFailedEmailNot filterExpression = filterExpression.And(notification => stringList.Contains(notification.Status)); } - Expression> projectionExpression = this.GetEmailProjectionExpression(); - Expression> orderExpression = this.GetEmailOrderExpression(); + Expression> projectionExpression = GetEmailProjectionExpression(); + Expression> orderExpression = GetEmailOrderExpression(); if (projectionExpression == null) { throw new ArgumentNullException($"Select Expression Cannot be null"); @@ -401,13 +401,13 @@ private static Expression> GetMa return filterExpression; } - private Expression> GetEmailOrderExpression() + private static Expression> GetEmailOrderExpression() { Expression> orderBy = notification => notification.SendOnUtcDate; return orderBy; } - private Expression> GetEmailProjectionExpression() + private static Expression> GetEmailProjectionExpression() { Expression> selectExpression = n => new EmailNotificationItemCosmosDbEntity { @@ -571,9 +571,9 @@ public Task UpdateMeetingNotificationItemEntities(IList> filterExpression = this.GetMeetingFilterExpression(meetingInviteReportRequest); - Expression> projectionExpression = this.GetMeetingProjectionExpression(); - Expression> orderExpression = this.GetMeetingOrderExpression(); + Expression> filterExpression = GetMeetingFilterExpression(meetingInviteReportRequest); + Expression> projectionExpression = GetMeetingProjectionExpression(); + Expression> orderExpression = GetMeetingOrderExpression(); int skip = meetingInviteReportRequest.Skip; int take = meetingInviteReportRequest.Take > 0 ? meetingInviteReportRequest.Take : 100; if (filterExpression == null) @@ -640,8 +640,8 @@ public async Task> GetPendingOrFailedMeetin filterExpression = filterExpression.And(notification => stringList.Contains(notification.Status)); } - Expression> projectionExpression = this.GetMeetingProjectionExpression(); - Expression> orderExpression = this.GetMeetingOrderExpression(); + Expression> projectionExpression = GetMeetingProjectionExpression(); + Expression> orderExpression = GetMeetingOrderExpression(); if (projectionExpression == null) { throw new ArgumentNullException($"Select Expression Cannot be null"); @@ -678,7 +678,7 @@ public async Task> GetPendingOrFailedMeetin return updatedNotificationEntities; } - private Expression> GetMeetingProjectionExpression() + private static Expression> GetMeetingProjectionExpression() { Expression> selectExpression = n => new MeetingNotificationItemCosmosDbEntity { @@ -727,13 +727,13 @@ private Expression> GetMeetingOrderExpression() + private static Expression> GetMeetingOrderExpression() { Expression> orderBy = notification => notification.SendOnUtcDate; return orderBy; } - private Expression> GetMeetingFilterExpression(NotificationReportRequest notificationReportRequest) + private static Expression> GetMeetingFilterExpression(NotificationReportRequest notificationReportRequest) { Expression> filterExpression = notification => true; diff --git a/NotificationService/NotificationService.Data/Repositories/MailAttachmentRepository.cs b/NotificationService/NotificationService.Data/Repositories/MailAttachmentRepository.cs index 009cd30..6064953 100644 --- a/NotificationService/NotificationService.Data/Repositories/MailAttachmentRepository.cs +++ b/NotificationService/NotificationService.Data/Repositories/MailAttachmentRepository.cs @@ -68,7 +68,7 @@ public async Task> UploadEmail(IList> UploadMeetingInvite(ILis Attachments = item.Attachments, TemplateData = item.TemplateData, }; - var blobpath = this.GetBlobPath(applicationName, item.NotificationId, ApplicationConstants.MeetingNotificationsFolderName); + var blobpath = GetBlobPath(applicationName, item.NotificationId, ApplicationConstants.MeetingNotificationsFolderName); var uloadedblobpath = await this.cloudStorageClient.UploadBlobAsync(blobpath, this.encryptionService.Encrypt(JsonConvert.SerializeObject(blobEmailData))).ConfigureAwait(false); notificationEntities.Add(item); } @@ -123,7 +123,7 @@ public async Task> DownloadEmail(IList(decryptedData); @@ -152,7 +152,7 @@ public async Task> DownloadMeetingInvite(IL foreach (var item in meetingNotificationItemEntities) { MeetingNotificationItemEntity notificationEntity = item; - var blobPath = this.GetBlobPath(applicationName, item.NotificationId, ApplicationConstants.MeetingNotificationsFolderName); + var blobPath = GetBlobPath(applicationName, item.NotificationId, ApplicationConstants.MeetingNotificationsFolderName); var encryptedData = await this.cloudStorageClient.DownloadBlobAsync(blobPath).ConfigureAwait(false); var decryptedData = this.encryptionService.Decrypt(encryptedData); var blobEmailData = JsonConvert.DeserializeObject(decryptedData); diff --git a/NotificationService/NotificationService.Data/Repositories/MailTemplateRepository.cs b/NotificationService/NotificationService.Data/Repositories/MailTemplateRepository.cs index 2e15bfb..b1ca3d6 100644 --- a/NotificationService/NotificationService.Data/Repositories/MailTemplateRepository.cs +++ b/NotificationService/NotificationService.Data/Repositories/MailTemplateRepository.cs @@ -62,7 +62,7 @@ public async Task GetMailTemplate(string applicationName, st this.logger.TraceInformation($"Started {nameof(this.GetMailTemplate)} method of {nameof(MailTemplateRepository)}.", traceProps); - string blobName = this.GetBlobName(applicationName, templateName); + string blobName = GetBlobName(applicationName, templateName); var contentTask = this.cloudStorageClient.DownloadBlobAsync(blobName).ConfigureAwait(false); TableOperation retrieveOperation = TableOperation.Retrieve(applicationName, templateName); @@ -117,7 +117,7 @@ public async Task UpsertEmailTemplateEntities(MailTemplateEntity mailTempl throw new ArgumentNullException(nameof(mailTemplateEntity)); } - string blobName = this.GetBlobName(mailTemplateEntity.Application, mailTemplateEntity.TemplateId); + string blobName = GetBlobName(mailTemplateEntity.Application, mailTemplateEntity.TemplateId); string blobUri = await this.cloudStorageClient.UploadBlobAsync( blobName, mailTemplateEntity.Content) @@ -144,7 +144,7 @@ public async Task DeleteMailTemplate(string applicationName, string templa this.logger.TraceInformation($"Started {nameof(this.DeleteMailTemplate)} method of {nameof(MailTemplateRepository)}.", traceProps); bool result = false; - string blobName = this.GetBlobName(applicationName, templateName); + string blobName = GetBlobName(applicationName, templateName); var status = await this.cloudStorageClient.DeleteBlobsAsync(blobName).ConfigureAwait(false); if (status) diff --git a/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/EmailNotificationRepositoryMeetingInviteTests.cs b/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/EmailNotificationRepositoryMeetingInviteTests.cs index 8d4285f..07af5a5 100644 --- a/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/EmailNotificationRepositoryMeetingInviteTests.cs +++ b/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/EmailNotificationRepositoryMeetingInviteTests.cs @@ -99,7 +99,7 @@ public void GetMeetingNotificationItemEntitiesTestValidInput() var result = this.EmailNotificationRepository.GetMeetingNotificationItemEntities(new List() { Guid.NewGuid().ToString() }); Assert.AreEqual(result.Status.ToString(), "RanToCompletion"); this.CosmosDBQueryClient.Verify(cdq => cdq.GetCosmosContainer(It.IsAny(), this.MeetingHistoryContainerName), Times.Once); - this.MeetingHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny()), Times.Once); + this.MeetingHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny(), default), Times.Once); Assert.Pass(); } @@ -120,7 +120,7 @@ public void GetMeetingNotificationItemEntityTestValidInput() { var result = this.EmailNotificationRepository.GetMeetingNotificationItemEntity(Guid.NewGuid().ToString()); this.CosmosDBQueryClient.Verify(cdq => cdq.GetCosmosContainer(It.IsAny(), this.MeetingHistoryContainerName), Times.Once); - this.MeetingHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny()), Times.Once); + this.MeetingHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny(), default), Times.Once); Assert.Pass(); } @@ -151,7 +151,7 @@ public void GetFilteredMeetingNotificationTests() Assert.AreEqual(result.Status.ToString(), "RanToCompletion"); this.CosmosDBQueryClient.Verify(cdq => cdq.GetCosmosContainer(It.IsAny(), this.MeetingHistoryContainerName), Times.Once); - this.MeetingHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny()), Times.Once); + this.MeetingHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny(), default), Times.Once); Assert.Pass(); } @@ -181,7 +181,7 @@ public async Task GetMeetingNotificationItemEntitiesBetweenDatesTestsCosmosDb() Assert.IsNotNull(result); this.CosmosDBQueryClient.Verify(cdq => cdq.GetCosmosContainer(It.IsAny(), this.MeetingHistoryContainerName), Times.Once); - this.MeetingHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny()), Times.Exactly(3)); + this.MeetingHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny(), default), Times.Exactly(3)); Assert.Pass(); } diff --git a/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/EmailNotificationRepositoryTestsBase.cs b/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/EmailNotificationRepositoryTestsBase.cs index 5fb94f8..41881f0 100644 --- a/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/EmailNotificationRepositoryTestsBase.cs +++ b/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/EmailNotificationRepositoryTestsBase.cs @@ -183,7 +183,7 @@ protected void SetupTestBase() .Returns(Task.FromResult(mockEmailItemResponse.Object)); _ = this.EmailHistoryContainer - .Setup(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny())) + .Setup(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny(), default)) .Returns(queryableEmailEntityReponse); _ = this.CosmosDBQueryClient @@ -206,7 +206,7 @@ protected void SetupTestBase() .Returns(Task.FromResult(mockMeetingItemResponse.Object)); _ = this.MeetingHistoryContainer - .Setup(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny())) + .Setup(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny(), default)) .Returns(queryableMeetingEntityReponse); _ = this.CosmosDBQueryClient diff --git a/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/GetEmailNotificationItemEntitiesTests.cs b/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/GetEmailNotificationItemEntitiesTests.cs index 51f628d..11e19cd 100644 --- a/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/GetEmailNotificationItemEntitiesTests.cs +++ b/NotificationService/NotificationService.UnitTests/Data/Repositories/EmailNotificationRepository/GetEmailNotificationItemEntitiesTests.cs @@ -42,7 +42,7 @@ public void GetEmailNotificationItemEntitiesTestValidInput() var result = this.EmailNotificationRepository.GetEmailNotificationItemEntities(new List() { Guid.NewGuid().ToString() }); Assert.AreEqual(result.Status.ToString(), "RanToCompletion"); this.CosmosDBQueryClient.Verify(cdq => cdq.GetCosmosContainer(It.IsAny(), this.MailHistoryContainerName), Times.Once); - this.EmailHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny()), Times.Once); + this.EmailHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny(), default), Times.Once); Assert.Pass(); } @@ -63,7 +63,7 @@ public void GetEmailNotificationItemEntityTestValidInput() { var result = this.EmailNotificationRepository.GetEmailNotificationItemEntity(Guid.NewGuid().ToString()); this.CosmosDBQueryClient.Verify(cdq => cdq.GetCosmosContainer(It.IsAny(), this.MailHistoryContainerName), Times.Once); - this.EmailHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny()), Times.Once); + this.EmailHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny(), default), Times.Once); Assert.Pass(); } @@ -94,7 +94,7 @@ public void GetFilteredEmailNotificationTests() Assert.AreEqual(result.Status.ToString(), "RanToCompletion"); this.CosmosDBQueryClient.Verify(cdq => cdq.GetCosmosContainer(It.IsAny(), this.MailHistoryContainerName), Times.Once); - this.EmailHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny()), Times.Once); + this.EmailHistoryContainer.Verify(container => container.GetItemLinqQueryable(It.IsAny(), It.IsAny(), It.IsAny(), default), Times.Once); Assert.Pass(); } }