From e9bb22c8dbab55bde30b96aa37e55571daae9cc4 Mon Sep 17 00:00:00 2001 From: Norbert Truchsess Date: Fri, 20 Sep 2024 12:04:02 +0200 Subject: [PATCH] fix ApproveOfferRequestAsync not saving created mail-processes --- .../Offers.Library/Service/OfferService.cs | 24 ++++++++----------- .../Service/OfferSubscriptionService.cs | 10 ++++---- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/marketplace/Offers.Library/Service/OfferService.cs b/src/marketplace/Offers.Library/Service/OfferService.cs index 0aad304564..d57b49ce3d 100644 --- a/src/marketplace/Offers.Library/Service/OfferService.cs +++ b/src/marketplace/Offers.Library/Service/OfferService.cs @@ -485,23 +485,21 @@ public async Task ApproveOfferRequestAsync(Guid offerId, OfferTypeId offerTypeId await notificationService.CreateNotifications(approveOfferRoles, _identityData.IdentityId, content, offerDetails.ProviderCompanyId.Value).AwaitAll().ConfigureAwait(false); await notificationService.SetNotificationsForOfferToDone(catenaAdminRoles, submitOfferNotificationTypeIds, offerId).ConfigureAwait(ConfigureAwaitOptions.None); - await portalRepositories.SaveAsync().ConfigureAwait(ConfigureAwaitOptions.None); - await mailingProcessCreation.RoleBaseSendMail( notificationRecipients, - new[] - { + [ ("offerName", offerDetails.OfferName), ("offerSubscriptionUrl", mailParams.SubscriptionUrl), ("offerDetailUrl", $"{mailParams.DetailUrl}/{offerId}"), (offerTypeId == OfferTypeId.APP ? "appId" : "serviceId", offerId.ToString()) - }, + ], ("offerProviderName", "User"), - new[] - { + [ $"{offerTypeId.ToString().ToLower()}-release-activation" - }, + ], offerDetails.ProviderCompanyId.Value).ConfigureAwait(ConfigureAwaitOptions.None); + + await portalRepositories.SaveAsync().ConfigureAwait(ConfigureAwaitOptions.None); } /// @@ -562,17 +560,15 @@ public async Task DeclineOfferAsync(Guid offerId, OfferDeclineRequest data, Offe await mailingProcessCreation.RoleBaseSendMail( notificationRecipients, - new[] - { + [ ("offerName", declineData.OfferName), ("url", basePortalAddress), ("declineMessage", data.Message), - }, + ], ("offerProviderName", "Service Manager"), - new[] - { + [ $"{offerType.ToString().ToLower()}-request-decline" - }, + ], declineData.CompanyId.Value).ConfigureAwait(ConfigureAwaitOptions.None); await portalRepositories.SaveAsync().ConfigureAwait(ConfigureAwaitOptions.None); diff --git a/src/marketplace/Offers.Library/Service/OfferSubscriptionService.cs b/src/marketplace/Offers.Library/Service/OfferSubscriptionService.cs index 81834b028f..84e5bdf706 100644 --- a/src/marketplace/Offers.Library/Service/OfferSubscriptionService.cs +++ b/src/marketplace/Offers.Library/Service/OfferSubscriptionService.cs @@ -89,16 +89,14 @@ public async Task AddOfferSubscriptionAsync(Guid offerId, IEnumerable