diff --git a/deployment/Deploy.ps1 b/deployment/Deploy.ps1 index e8095561..fdd8d81d 100644 --- a/deployment/Deploy.ps1 +++ b/deployment/Deploy.ps1 @@ -27,7 +27,6 @@ Param( [string][Parameter()]$LogoURLpng, # URL for Publisher .png logo [string][Parameter()]$LogoURLico, # URL for Publisher .ico logo [string][Parameter()]$KeyVault, # Name of KeyVault - [switch][Parameter()]$MeteredSchedulerSupport, # Add this key like -MeteredSchedulerSupport to the command to enable Metered Scheduler Support [switch][Parameter()]$Quiet #if set, only show error / warning output from script commands ) @@ -372,7 +371,7 @@ Write-host " ➡️ Setup access to KeyVault" az keyvault set-policy --name $KeyVault --object-id $WebAppNameAdminId --secret-permissions get list --key-permissions get list --resource-group $ResourceGroupForDeployment --output $azCliOutput Write-host " ➡️ Set Configuration" az webapp config connection-string set -g $ResourceGroupForDeployment -n $WebAppNameAdmin -t SQLAzure --output $azCliOutput --settings DefaultConnection=$DefaultConnectionKeyVault -az webapp config appsettings set -g $ResourceGroupForDeployment -n $WebAppNameAdmin --output $azCliOutput --settings KnownUsers=$PublisherAdminUsers SaaSApiConfiguration__AdAuthenticationEndPoint=https://login.microsoftonline.com SaaSApiConfiguration__ClientId=$ADApplicationID SaaSApiConfiguration__ClientSecret=$ADApplicationSecretKeyVault SaaSApiConfiguration__FulFillmentAPIBaseURL=https://marketplaceapi.microsoft.com/api SaaSApiConfiguration__FulFillmentAPIVersion=2018-08-31 SaaSApiConfiguration__GrantType=client_credentials SaaSApiConfiguration__MTClientId=$ADMTApplicationID SaaSApiConfiguration__Resource=20e940b3-4c77-4b0b-9a53-9e16a1b010a7 SaaSApiConfiguration__TenantId=$TenantID SaaSApiConfiguration__SignedOutRedirectUri=https://$WebAppNamePrefix-portal.azurewebsites.net/Home/Index/ SaaSApiConfiguration__SupportmeteredBilling=$MeteredSchedulerSupport SaaSApiConfiguration_CodeHash=$SaaSApiConfiguration_CodeHash +az webapp config appsettings set -g $ResourceGroupForDeployment -n $WebAppNameAdmin --output $azCliOutput --settings KnownUsers=$PublisherAdminUsers SaaSApiConfiguration__AdAuthenticationEndPoint=https://login.microsoftonline.com SaaSApiConfiguration__ClientId=$ADApplicationID SaaSApiConfiguration__ClientSecret=$ADApplicationSecretKeyVault SaaSApiConfiguration__FulFillmentAPIBaseURL=https://marketplaceapi.microsoft.com/api SaaSApiConfiguration__FulFillmentAPIVersion=2018-08-31 SaaSApiConfiguration__GrantType=client_credentials SaaSApiConfiguration__MTClientId=$ADMTApplicationID SaaSApiConfiguration__Resource=20e940b3-4c77-4b0b-9a53-9e16a1b010a7 SaaSApiConfiguration__TenantId=$TenantID SaaSApiConfiguration__SignedOutRedirectUri=https://$WebAppNamePrefix-portal.azurewebsites.net/Home/Index/ SaaSApiConfiguration_CodeHash=$SaaSApiConfiguration_CodeHash az webapp config set -g $ResourceGroupForDeployment -n $WebAppNameAdmin --always-on true --output $azCliOutput Write-host " 🔵 Customer Portal WebApp" diff --git a/docs/Advanced-Instructions.md b/docs/Advanced-Instructions.md index 180307a6..77b5edd6 100644 --- a/docs/Advanced-Instructions.md +++ b/docs/Advanced-Instructions.md @@ -87,7 +87,6 @@ Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass | SQLAdminLoginPassword | SQL Admin password. Default: secure random password. | | LogoURLpng | The url of the company logo image in .png format with a size of 96x96 to be used on the website | | LogoURLico | The url of the company logo image in .ico format | -| MeteredSchedulerSupport | Enable the metered scheduler. This is deployed by default. Use **true** to enable the feature. More information [here](https://github.com/Azure/Commercial-Marketplace-SaaS-Accelerator/blob/main/docs/Metered-Scheduler-Manager-Instruction.md). | Quiet | Disable verbose output when running the script diff --git a/docs/Installation-Instructions.md b/docs/Installation-Instructions.md index c33ac361..a8314f1e 100644 --- a/docs/Installation-Instructions.md +++ b/docs/Installation-Instructions.md @@ -60,7 +60,6 @@ The script above will perform the following actions. -ADMTApplicationID "xxxx-xxx-xxx-xxx-xxxx" ` -LogoURLpng "https://company_com/company_logo.png" ` -LogoURLico "https://company_com/company_logo.ico" ` - -MeteredSchedulerSupport -Quiet ``` @@ -103,7 +102,6 @@ cd ./Commercial-Marketplace-SaaS-Accelerator/deployment; ` | SQLAdminLoginPassword | SQL Admin password. Default: secure random password. | | LogoURLpng | The url of the company logo image in .png format with a size of 96x96 to be used on the website | | LogoURLico | The url of the company logo image in .ico format | -| MeteredSchedulerSupport | Enable the metered scheduler. This is deployed by default. Use **true** to enable the feature. More information [here](https://github.com/Azure/Commercial-Marketplace-SaaS-Accelerator/blob/main/docs/Metered-Scheduler-Manager-Instruction.md). | Quiet | Disable verbose output when running the script ## Setting up a development environment diff --git a/docs/Metered-Scheduler-Manager-Instruction.md b/docs/Metered-Scheduler-Manager-Instruction.md index f6d2dfe2..e8047d41 100644 --- a/docs/Metered-Scheduler-Manager-Instruction.md +++ b/docs/Metered-Scheduler-Manager-Instruction.md @@ -6,15 +6,12 @@ Metered Scheduler Manager is a feature where Publisher can schedule **FIX Quanti 1. Monthly 1. Yearly 1. OneTime -## Enable and Disable Metered Scheduler Manager Feature During Installation -By default, this feature is disabled during the installation. Publisher can enable this feature during the installion process by passing an optional parameter **MeteredSchedulerSupport**. Please refer to the installation steps [here](./Installation-Instructions.md) - ## Enable and Disable Metered Scheduler Manager Feature Post Installation -Publisher can active the **Metered Scheduler** feature by updating Admin portal web configuration and set **SaaSApiConfiguration__SupportmeteredBilling** to **true** +Publisher can active the **Metered Scheduler** feature by updating Admin portal App Setting and set **IsMeteredBillingEnabled** to **true** ![home](./images/scheduler-config.png) -Publisher can disable the feature by feature by updating Admin portal web configuration and set **SaaSApiConfiguration__SupportmeteredBilling** to **false** +Publisher can disable the feature by feature by updating Admin portal web configuration and set **IsMeteredBillingEnabled** to **false** ## IMPORTANT: Enable Scheduler Frequencies Publisher must enable scheduler Frequencies before start scheduling tasks. From **App Config**, publisher can enable or disable available frequencies per business needs. Without enable the frequencies, Publisher will not able to add tasks also the scheduler engine will skip any disabled frequencies. diff --git a/docs/images/scheduler-config.png b/docs/images/scheduler-config.png index e84d86d2..9604d7fa 100644 Binary files a/docs/images/scheduler-config.png and b/docs/images/scheduler-config.png differ diff --git a/src/AdminSite/Controllers/ApplicationConfigController.cs b/src/AdminSite/Controllers/ApplicationConfigController.cs index 35aa53a4..fb191132 100644 --- a/src/AdminSite/Controllers/ApplicationConfigController.cs +++ b/src/AdminSite/Controllers/ApplicationConfigController.cs @@ -6,6 +6,8 @@ using System.Web; using Marketplace.SaaS.Accelerator.DataAccess.Contracts; using Marketplace.SaaS.Accelerator.DataAccess.Entities; +using Marketplace.SaaS.Accelerator.DataAccess.Services; +using Marketplace.SaaS.Accelerator.Services.Configurations; using Marketplace.SaaS.Accelerator.Services.Services; using Marketplace.SaaS.Accelerator.Services.Utilities; using Microsoft.AspNetCore.Http; @@ -30,9 +32,10 @@ public class ApplicationConfigController : BaseController /// private readonly IEmailTemplateRepository emailTemplateRepository; - public ApplicationConfigController( - ApplicationConfigService appConfigService, - IEmailTemplateRepository emailTemplateRepository, SaaSClientLogger logger) + public ApplicationConfigController(ApplicationConfigService appConfigService, + IEmailTemplateRepository emailTemplateRepository, + SaaSClientLogger logger, + IApplicationConfigRepository appConfigRepository) : base(appConfigRepository) { this.appConfigService = appConfigService; this.emailTemplateRepository = emailTemplateRepository; @@ -46,7 +49,7 @@ public ApplicationConfigController( [ServiceFilter(typeof(ExceptionHandlerAttribute))] public IActionResult Index() { - var getAllAppConfigData = this.appConfigService.GetAllApplicationConfiguration(); + var getAllAppConfigData = this.appConfigService.GetAllApplicationConfiguration(); return this.View(getAllAppConfigData); } diff --git a/src/AdminSite/Controllers/ApplicationLogController.cs b/src/AdminSite/Controllers/ApplicationLogController.cs index b5955126..3297137b 100644 --- a/src/AdminSite/Controllers/ApplicationLogController.cs +++ b/src/AdminSite/Controllers/ApplicationLogController.cs @@ -4,6 +4,8 @@ using System.Text.RegularExpressions; using Marketplace.SaaS.Accelerator.DataAccess.Contracts; using Marketplace.SaaS.Accelerator.DataAccess.Entities; +using Marketplace.SaaS.Accelerator.DataAccess.Services; +using Marketplace.SaaS.Accelerator.Services.Configurations; using Marketplace.SaaS.Accelerator.Services.Services; using Marketplace.SaaS.Accelerator.Services.Utilities; using Microsoft.AspNetCore.Mvc; @@ -20,7 +22,9 @@ public class ApplicationLogController : BaseController private readonly IApplicationLogRepository appLogRepository; - public ApplicationLogController(IApplicationLogRepository applicationLogRepository, SaaSClientLogger logger) + public ApplicationLogController(IApplicationLogRepository applicationLogRepository, + SaaSClientLogger logger, + IApplicationConfigRepository applicationConfigRepository) : base(applicationConfigRepository) { this.appLogRepository = applicationLogRepository; this.logger = logger; diff --git a/src/AdminSite/Controllers/BaseController.cs b/src/AdminSite/Controllers/BaseController.cs index cecb004e..afe4c7eb 100644 --- a/src/AdminSite/Controllers/BaseController.cs +++ b/src/AdminSite/Controllers/BaseController.cs @@ -1,10 +1,13 @@ using System.Linq; using System.Web; +using Marketplace.SaaS.Accelerator.DataAccess.Contracts; using Marketplace.SaaS.Accelerator.Services.Models; +using Marketplace.SaaS.Accelerator.Services.Services; using Marketplace.SaaS.Accelerator.Services.Utilities; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; namespace Marketplace.SaaS.Accelerator.AdminSite.Controllers; @@ -18,11 +21,32 @@ public class BaseController : Controller /// Initializes a new instance of the class. /// /// - public BaseController() + private readonly IApplicationConfigRepository applicationConfigRepository; + private readonly ApplicationConfigService applicationConfigService; + public BaseController(IApplicationConfigRepository applicationConfigRepository) { + this.applicationConfigRepository = applicationConfigRepository; + this.applicationConfigService = new ApplicationConfigService(this.applicationConfigRepository); this.CheckAuthentication(); } + public override void OnActionExecuting(ActionExecutingContext filterContext) + { + if (TempData is not null) + { + bool.TryParse(this.applicationConfigService.GetValueByName("IsMeteredBillingEnabled"), out bool supportMeteredBilling); + if (supportMeteredBilling) + { + TempData["SupportMeteredBilling"] = "1"; + } + else + { + TempData["SupportMeteredBilling"] = "0"; + } + } + + base.OnActionExecuting(filterContext); + } /// /// Gets Current Logged in User Email Address. /// @@ -64,6 +88,8 @@ public PartnerDetailViewModel GetCurrentUserDetail() return new PartnerDetailViewModel(); } + + /// /// Checks the authentication. /// diff --git a/src/AdminSite/Controllers/HomeController.cs b/src/AdminSite/Controllers/HomeController.cs index 8836107e..6a5121cc 100644 --- a/src/AdminSite/Controllers/HomeController.cs +++ b/src/AdminSite/Controllers/HomeController.cs @@ -132,7 +132,26 @@ public class HomeController : BaseController /// The offers repository. /// The offers attribute repository. public HomeController( - IUsersRepository usersRepository, IMeteredBillingApiService billingApiService, ISubscriptionsRepository subscriptionRepo, IPlansRepository planRepository, ISubscriptionUsageLogsRepository subscriptionUsageLogsRepository, IMeteredDimensionsRepository dimensionsRepository, ISubscriptionLogRepository subscriptionLogsRepo, IApplicationConfigRepository applicationConfigRepository, IUsersRepository userRepository, IFulfillmentApiService fulfillApiService, IApplicationLogRepository applicationLogRepository, IEmailTemplateRepository emailTemplateRepository, IPlanEventsMappingRepository planEventsMappingRepository, IEventsRepository eventsRepository, SaaSApiClientConfiguration saaSApiClientConfiguration, ILoggerFactory loggerFactory, IEmailService emailService, IOffersRepository offersRepository, IOfferAttributesRepository offersAttributeRepository, SaaSClientLogger logger) + IUsersRepository usersRepository, + IMeteredBillingApiService billingApiService, + ISubscriptionsRepository subscriptionRepo, + IPlansRepository planRepository, + ISubscriptionUsageLogsRepository subscriptionUsageLogsRepository, + IMeteredDimensionsRepository dimensionsRepository, + ISubscriptionLogRepository subscriptionLogsRepo, + IApplicationConfigRepository applicationConfigRepository, + IUsersRepository userRepository, + IFulfillmentApiService fulfillApiService, + IApplicationLogRepository applicationLogRepository, + IEmailTemplateRepository emailTemplateRepository, + IPlanEventsMappingRepository planEventsMappingRepository, + IEventsRepository eventsRepository, + SaaSApiClientConfiguration saaSApiClientConfiguration, + ILoggerFactory loggerFactory, + IEmailService emailService, + IOffersRepository offersRepository, + IOfferAttributesRepository offersAttributeRepository, + SaaSClientLogger logger):base(applicationConfigRepository) { this.billingApiService = billingApiService; this.subscriptionRepo = subscriptionRepo; @@ -212,12 +231,6 @@ public IActionResult Index() this.applicationConfigService.SaveFileToDisk("FaviconFile", "favicon.ico"); var userId = this.userService.AddUser(this.GetCurrentUserDetail()); - - if (this.saaSApiClientConfiguration.SupportMeteredBilling) - { - this.TempData.Add("SupportMeteredBilling", "1"); - this.HttpContext.Session.SetString("SupportMeteredBilling", "1"); - } return this.View(); } catch (Exception ex) diff --git a/src/AdminSite/Controllers/KnownUsersController.cs b/src/AdminSite/Controllers/KnownUsersController.cs index 8ff43b88..ad5c53cf 100644 --- a/src/AdminSite/Controllers/KnownUsersController.cs +++ b/src/AdminSite/Controllers/KnownUsersController.cs @@ -3,6 +3,9 @@ using System.Web; using Marketplace.SaaS.Accelerator.DataAccess.Contracts; using Marketplace.SaaS.Accelerator.DataAccess.Entities; +using Marketplace.SaaS.Accelerator.DataAccess.Services; +using Marketplace.SaaS.Accelerator.Services.Configurations; +using Marketplace.SaaS.Accelerator.Services.Services; using Marketplace.SaaS.Accelerator.Services.Utilities; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; @@ -24,7 +27,9 @@ public class KnownUsersController : BaseController /// The known users repository. /// The logger. - public KnownUsersController(IKnownUsersRepository knownUsersRepository, SaaSClientLogger logger) + public KnownUsersController(IKnownUsersRepository knownUsersRepository, + SaaSClientLogger logger, + IApplicationConfigRepository applicationConfigRepository) : base(applicationConfigRepository) { this.knownUsersRepository = knownUsersRepository; this.logger = logger; diff --git a/src/AdminSite/Controllers/OffersController.cs b/src/AdminSite/Controllers/OffersController.cs index a186be48..a0f8d947 100644 --- a/src/AdminSite/Controllers/OffersController.cs +++ b/src/AdminSite/Controllers/OffersController.cs @@ -49,7 +49,8 @@ public OffersController( IApplicationConfigRepository applicationConfigRepository, IUsersRepository usersRepository, IValueTypesRepository valueTypesRepository, - IOfferAttributesRepository offersAttributeRepository, SaaSClientLogger logger) + IOfferAttributesRepository offersAttributeRepository, + SaaSClientLogger logger) : base(applicationConfigRepository) { this.applicationConfigRepository = applicationConfigRepository; this.usersRepository = usersRepository; diff --git a/src/AdminSite/Controllers/PlansController.cs b/src/AdminSite/Controllers/PlansController.cs index 868a9d6a..b31ae9bd 100644 --- a/src/AdminSite/Controllers/PlansController.cs +++ b/src/AdminSite/Controllers/PlansController.cs @@ -51,7 +51,13 @@ public class PlansController : BaseController /// The offer attribute repository. /// The offer repository. /// The logger. - public PlansController(ISubscriptionsRepository subscriptionRepository, IUsersRepository usersRepository, IApplicationConfigRepository applicationConfigRepository, IPlansRepository plansRepository, IOfferAttributesRepository offerAttributeRepository, IOffersRepository offerRepository, SaaSClientLogger logger) + public PlansController(ISubscriptionsRepository subscriptionRepository, + IUsersRepository usersRepository, + IApplicationConfigRepository applicationConfigRepository, + IPlansRepository plansRepository, + IOfferAttributesRepository offerAttributeRepository, + IOffersRepository offerRepository, + SaaSClientLogger logger) : base(applicationConfigRepository) { this.subscriptionRepository = subscriptionRepository; this.usersRepository = usersRepository; diff --git a/src/AdminSite/Controllers/SchedulerController.cs b/src/AdminSite/Controllers/SchedulerController.cs index 9c67063d..f597061f 100644 --- a/src/AdminSite/Controllers/SchedulerController.cs +++ b/src/AdminSite/Controllers/SchedulerController.cs @@ -5,9 +5,11 @@ using System.Web; using Marketplace.SaaS.Accelerator.DataAccess.Contracts; using Marketplace.SaaS.Accelerator.DataAccess.Entities; +using Marketplace.SaaS.Accelerator.Services.Configurations; using Marketplace.SaaS.Accelerator.Services.Models; using Marketplace.SaaS.Accelerator.Services.Services; using Marketplace.SaaS.Accelerator.Services.Utilities; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.Extensions.Logging; @@ -46,6 +48,7 @@ public class SchedulerController : BaseController /// private readonly IUsersRepository usersRepository; + /// /// Initializes a new instance of the class. /// @@ -64,7 +67,8 @@ public SchedulerController(ISubscriptionsRepository subscriptionRepository, ISchedulerManagerViewRepository schedulerViewRepository, IUsersRepository usersRepository, SaaSClientLogger logger, - ISubscriptionUsageLogsRepository subscriptionUsageLogsRepository,IApplicationConfigRepository applicationConfigRepository) + ISubscriptionUsageLogsRepository subscriptionUsageLogsRepository, + IApplicationConfigRepository applicationConfigRepository) : base(applicationConfigRepository) { this.usersRepository = usersRepository; @@ -72,6 +76,7 @@ public SchedulerController(ISubscriptionsRepository subscriptionRepository, this.meteredRepository = meteredRepository; this.schedulerService = new MeteredPlanSchedulerManagementService(frequencyRepository, schedulerRepository, schedulerViewRepository,subscriptionUsageLogsRepository,applicationConfigRepository); this.subscriptionService = new SubscriptionService(subscriptionRepository,plansRepository); + } @@ -81,21 +86,29 @@ public SchedulerController(ISubscriptionsRepository subscriptionRepository, /// return All subscription. public IActionResult Index() { - this.logger.Info("Scheduler Controller / Get all data"); - try + if (this.User.Identity.IsAuthenticated) { - List getAllSchedulerManagerViewData = new List(); - this.TempData["ShowWelcomeScreen"] = "True"; - var currentUserDetail = this.usersRepository.GetPartnerDetailFromEmail(this.CurrentUserEmailAddress); - getAllSchedulerManagerViewData = this.schedulerService.GetAllSchedulerManagerList(); + this.logger.Info("Scheduler Controller / Get all data"); - return this.View(getAllSchedulerManagerViewData); + try + { + List getAllSchedulerManagerViewData = new List(); + this.TempData["ShowWelcomeScreen"] = "True"; + var currentUserDetail = this.usersRepository.GetPartnerDetailFromEmail(this.CurrentUserEmailAddress); + + getAllSchedulerManagerViewData = this.schedulerService.GetAllSchedulerManagerList(); + return this.View(getAllSchedulerManagerViewData); + } + catch (Exception ex) + { + this.logger.LogError($"Message:{ex.Message} :: {ex.InnerException}"); + return this.View("Error", ex); + } } - catch (Exception ex) + else { - this.logger.LogError($"Message:{ex.Message} :: {ex.InnerException}"); - return this.View("Error", ex); + return this.RedirectToAction(nameof(this.Index)); } } @@ -272,9 +285,11 @@ public IActionResult DeleteSchedulerItem(string id) public IActionResult SchedulerLogDetail(string id) { + this.logger.Info(HttpUtility.HtmlEncode($"Scheduler Controller / Get Schedule Item Details: Id {id}")); try { + var SchedulerItem = this.schedulerService.GetSchedulerManagerById(int.Parse(id)); var detail = this.schedulerService.GetSchedulerItemRunHistory(int.Parse(id)); SchedulerUsageViewModel schedulerUsageViewModel = new SchedulerUsageViewModel(); diff --git a/src/AdminSite/Views/Home/Index.cshtml b/src/AdminSite/Views/Home/Index.cshtml index 683a34bb..9a4e9f58 100644 --- a/src/AdminSite/Views/Home/Index.cshtml +++ b/src/AdminSite/Views/Home/Index.cshtml @@ -109,7 +109,7 @@ - @if (this.TempData["SupportMeteredBilling"]!=null) + @if ((this.TempData["SupportMeteredBilling"] != null) && (this.TempData["SupportMeteredBilling"].ToString()== "1")) {
  • Scheduler diff --git a/src/AdminSite/Views/Home/RecordUsage.cshtml b/src/AdminSite/Views/Home/RecordUsage.cshtml index d763f6fe..a1d1e235 100644 --- a/src/AdminSite/Views/Home/RecordUsage.cshtml +++ b/src/AdminSite/Views/Home/RecordUsage.cshtml @@ -40,9 +40,12 @@
    -
    - -
    + @if ((this.TempData["SupportMeteredBilling"] != null) && (this.TempData["SupportMeteredBilling"].ToString() == "1")) + { +
    + +
    + } diff --git a/src/AdminSite/Views/Scheduler/Index.cshtml b/src/AdminSite/Views/Scheduler/Index.cshtml index 2fcd9fab..6843f420 100644 --- a/src/AdminSite/Views/Scheduler/Index.cshtml +++ b/src/AdminSite/Views/Scheduler/Index.cshtml @@ -5,6 +5,8 @@
    + @if ((this.TempData["SupportMeteredBilling"] != null) && (this.TempData["SupportMeteredBilling"].ToString() == "1")) + {
    @@ -112,6 +114,15 @@ float-right cm-button-default">Add New Scheduled Metered Trigger }
    + } + else + { + +
    +

    Please activate Scheduler feature to access this section

    +
    + } +
    diff --git a/src/AdminSite/Views/Scheduler/NewScheduler.cshtml b/src/AdminSite/Views/Scheduler/NewScheduler.cshtml index e23cef0b..756850ac 100644 --- a/src/AdminSite/Views/Scheduler/NewScheduler.cshtml +++ b/src/AdminSite/Views/Scheduler/NewScheduler.cshtml @@ -46,7 +46,8 @@ - + @if ((this.TempData["SupportMeteredBilling"] != null) && (this.TempData["SupportMeteredBilling"].ToString() == "1")) + {
    @@ -124,7 +125,15 @@
    - + } + else + { + +
    +

    Please activate Scheduler feature to access this section

    + +
    + } diff --git a/src/AdminSite/Views/Scheduler/SchedulerLogDetail.cshtml b/src/AdminSite/Views/Scheduler/SchedulerLogDetail.cshtml index 3ef4dbf4..b70e1bea 100644 --- a/src/AdminSite/Views/Scheduler/SchedulerLogDetail.cshtml +++ b/src/AdminSite/Views/Scheduler/SchedulerLogDetail.cshtml @@ -33,7 +33,8 @@ detailModal.style.display = "block"; } - + @if ((this.TempData["SupportMeteredBilling"] != null) && (this.TempData["SupportMeteredBilling"].ToString() == "1")) + {

    Activity Log

    @@ -128,4 +129,13 @@
    - \ No newline at end of file + } + else + { + +
    +

    Please activate Scheduler feature to access this section

    + +
    + } + \ No newline at end of file diff --git a/src/AdminSite/Views/Shared/_Layout.cshtml b/src/AdminSite/Views/Shared/_Layout.cshtml index 6b966dc8..c5cd95c4 100644 --- a/src/AdminSite/Views/Shared/_Layout.cshtml +++ b/src/AdminSite/Views/Shared/_Layout.cshtml @@ -106,7 +106,7 @@ - @if (this.Context.Session.GetString("SupportMeteredBilling") != null) + @if ((this.TempData["SupportMeteredBilling"] != null) && (this.TempData["SupportMeteredBilling"].ToString() == "1")) {
  • diff --git a/src/DataAccess/Migrations/20231115232155_Baseline_v741.Designer.cs b/src/DataAccess/Migrations/20231115232155_Baseline_v741.Designer.cs new file mode 100644 index 00000000..991901df --- /dev/null +++ b/src/DataAccess/Migrations/20231115232155_Baseline_v741.Designer.cs @@ -0,0 +1,1162 @@ +// +using System; +using Marketplace.SaaS.Accelerator.DataAccess.Context; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace Marketplace.SaaS.Accelerator.DataAccess.Migrations +{ + [DbContext(typeof(SaasKitContext))] + [Migration("20231115232155_Baseline_v741")] + partial class Baseline_v741 + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.1") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.ApplicationConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("ID"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Description") + .HasMaxLength(255) + .HasColumnType("nvarchar(255)"); + + b.Property("Name") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("ApplicationConfiguration"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.ApplicationLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("ActionTime") + .HasColumnType("datetime"); + + b.Property("LogDetail") + .HasMaxLength(4000) + .IsUnicode(false) + .HasColumnType("varchar(4000)"); + + b.HasKey("Id"); + + b.ToTable("ApplicationLog"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.DatabaseVersionHistory", b => + { + b.Property("ChangeLog") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("CreateBy") + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("ID"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("VersionNumber") + .HasColumnType("decimal(6,2)"); + + b.ToTable("DatabaseVersionHistory"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.EmailTemplate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("ID"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Bcc") + .HasMaxLength(1000) + .IsUnicode(false) + .HasColumnType("varchar(1000)") + .HasColumnName("BCC"); + + b.Property("Cc") + .HasMaxLength(1000) + .IsUnicode(false) + .HasColumnType("varchar(1000)") + .HasColumnName("CC"); + + b.Property("Description") + .HasMaxLength(1000) + .IsUnicode(false) + .HasColumnType("varchar(1000)"); + + b.Property("InsertDate") + .HasColumnType("datetime"); + + b.Property("IsActive") + .HasColumnType("bit"); + + b.Property("Status") + .HasMaxLength(1000) + .IsUnicode(false) + .HasColumnType("varchar(1000)"); + + b.Property("Subject") + .HasMaxLength(1000) + .IsUnicode(false) + .HasColumnType("varchar(1000)"); + + b.Property("TemplateBody") + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.Property("ToRecipients") + .HasMaxLength(1000) + .IsUnicode(false) + .HasColumnType("varchar(1000)"); + + b.HasKey("Id"); + + b.ToTable("EmailTemplate"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Events", b => + { + b.Property("EventsId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("EventsId"), 1L, 1); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("EventsName") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("IsActive") + .HasColumnType("bit"); + + b.HasKey("EventsId"); + + b.ToTable("Events"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.KnownUsers", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("RoleId") + .HasColumnType("int"); + + b.Property("UserEmail") + .HasMaxLength(50) + .IsUnicode(false) + .HasColumnType("varchar(50)"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("KnownUsers"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.MeteredAuditLogs", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("CreatedBy") + .HasColumnType("int"); + + b.Property("CreatedDate") + .HasColumnType("datetime"); + + b.Property("RequestJson") + .HasMaxLength(500) + .IsUnicode(false) + .HasColumnType("varchar(500)"); + + b.Property("ResponseJson") + .HasMaxLength(500) + .IsUnicode(false) + .HasColumnType("varchar(500)"); + + b.Property("RunBy") + .HasMaxLength(255) + .IsUnicode(false) + .HasColumnType("varchar(255)"); + + b.Property("StatusCode") + .HasMaxLength(100) + .IsUnicode(false) + .HasColumnType("varchar(100)"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.Property("SubscriptionUsageDate") + .HasColumnType("datetime"); + + b.HasKey("Id"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("MeteredAuditLogs"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.MeteredDimensions", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("CreatedDate") + .HasColumnType("datetime"); + + b.Property("Description") + .HasMaxLength(250) + .IsUnicode(false) + .HasColumnType("varchar(250)"); + + b.Property("Dimension") + .HasMaxLength(150) + .IsUnicode(false) + .HasColumnType("varchar(150)"); + + b.Property("PlanId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("PlanId"); + + b.ToTable("MeteredDimensions"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.MeteredPlanSchedulerManagement", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("DimensionId") + .IsRequired() + .HasColumnType("int"); + + b.Property("FrequencyId") + .IsRequired() + .HasColumnType("int"); + + b.Property("NextRunTime") + .HasColumnType("datetime2"); + + b.Property("PlanId") + .IsRequired() + .HasColumnType("int"); + + b.Property("Quantity") + .IsRequired() + .HasColumnType("float"); + + b.Property("SchedulerName") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("StartDate") + .IsRequired() + .HasColumnType("datetime2"); + + b.Property("SubscriptionId") + .IsRequired() + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("DimensionId"); + + b.HasIndex("FrequencyId"); + + b.HasIndex("PlanId"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("MeteredPlanSchedulerManagement"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.OfferAttributes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("ID"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("Description") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("DisplayName") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("DisplaySequence") + .HasColumnType("int"); + + b.Property("FromList") + .HasColumnType("bit"); + + b.Property("IsDelete") + .HasColumnType("bit"); + + b.Property("IsRequired") + .HasColumnType("bit"); + + b.Property("Isactive") + .HasColumnType("bit"); + + b.Property("Max") + .HasColumnType("int"); + + b.Property("Min") + .HasColumnType("int"); + + b.Property("OfferId") + .HasColumnType("uniqueidentifier"); + + b.Property("ParameterId") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("Type") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.Property("ValueTypeId") + .HasColumnType("int"); + + b.Property("ValuesList") + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.HasKey("Id"); + + b.ToTable("OfferAttributes"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Offers", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("OfferGuid") + .HasColumnType("uniqueidentifier") + .HasColumnName("OfferGUId"); + + b.Property("OfferId") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("OfferName") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("Offers"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.PlanAttributeMapping", b => + { + b.Property("PlanAttributeId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("PlanAttributeId"), 1L, 1); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("IsEnabled") + .HasColumnType("bit"); + + b.Property("OfferAttributeId") + .HasColumnType("int") + .HasColumnName("OfferAttributeID"); + + b.Property("PlanId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("PlanAttributeId") + .HasName("PK__PlanAttr__8B476A98C058FAF2"); + + b.ToTable("PlanAttributeMapping"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.PlanAttributeOutput", b => + { + b.Property("RowNumber") + .HasColumnType("int"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("IsEnabled") + .HasColumnType("bit"); + + b.Property("OfferAttributeId") + .HasColumnType("int"); + + b.Property("PlanAttributeId") + .HasColumnType("int"); + + b.Property("PlanId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.HasKey("RowNumber") + .HasName("PK__PlanAttr__AAAC09D888FE3E40"); + + b.ToTable("PlanAttributeOutput"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.PlanEventsMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("CopyToCustomer") + .HasColumnType("bit"); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("EventId") + .HasColumnType("int"); + + b.Property("FailureStateEmails") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("Isactive") + .HasColumnType("bit"); + + b.Property("PlanId") + .HasColumnType("uniqueidentifier"); + + b.Property("SuccessStateEmails") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("PlanEventsMapping"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.PlanEventsOutPut", b => + { + b.Property("RowNumber") + .HasColumnType("int"); + + b.Property("CopyToCustomer") + .HasColumnType("bit"); + + b.Property("EventId") + .HasColumnType("int"); + + b.Property("EventsName") + .IsRequired() + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("FailureStateEmails") + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.Property("Id") + .HasColumnType("int") + .HasColumnName("ID"); + + b.Property("Isactive") + .HasColumnType("bit"); + + b.Property("PlanId") + .HasColumnType("uniqueidentifier"); + + b.Property("SuccessStateEmails") + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.HasKey("RowNumber") + .HasName("PK__PlanEven__AAAC09D8C9229532"); + + b.ToTable("PlanEventsOutPut"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Plans", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Description") + .HasMaxLength(500) + .IsUnicode(false) + .HasColumnType("varchar(500)"); + + b.Property("DisplayName") + .HasMaxLength(100) + .IsUnicode(false) + .HasColumnType("varchar(100)"); + + b.Property("IsPerUser") + .HasColumnType("bit"); + + b.Property("IsmeteringSupported") + .HasColumnType("bit"); + + b.Property("OfferId") + .HasColumnType("uniqueidentifier") + .HasColumnName("OfferID"); + + b.Property("PlanGuid") + .HasColumnType("uniqueidentifier") + .HasColumnName("PlanGUID"); + + b.Property("PlanId") + .HasMaxLength(100) + .IsUnicode(false) + .HasColumnType("varchar(100)"); + + b.HasKey("Id"); + + b.ToTable("Plans"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Roles", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Name") + .HasMaxLength(50) + .IsUnicode(false) + .HasColumnType("varchar(50)"); + + b.HasKey("Id"); + + b.ToTable("Roles"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.SchedulerFrequency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Frequency") + .IsRequired() + .HasMaxLength(50) + .IsUnicode(false) + .HasColumnType("varchar(50)"); + + b.HasKey("Id"); + + b.ToTable("SchedulerFrequency"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.SchedulerManagerView", b => + { + b.Property("AMPSubscriptionId") + .HasColumnType("uniqueidentifier"); + + b.Property("Dimension") + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.Property("Frequency") + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.Property("Id") + .HasColumnType("int"); + + b.Property("NextRunTime") + .HasColumnType("datetime2"); + + b.Property("PlanId") + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.Property("PurchaserEmail") + .HasColumnType("nvarchar(max)"); + + b.Property("Quantity") + .HasColumnType("float"); + + b.Property("SchedulerName") + .HasColumnType("nvarchar(max)"); + + b.Property("StartDate") + .HasColumnType("datetime2"); + + b.Property("SubscriptionName") + .HasColumnType("nvarchar(max)"); + + b.ToView("SchedulerManagerView"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.SubscriptionAttributeValues", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("ID"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("OfferId") + .HasColumnType("uniqueidentifier") + .HasColumnName("OfferID"); + + b.Property("PlanAttributeId") + .HasColumnType("int"); + + b.Property("PlanId") + .HasColumnType("uniqueidentifier") + .HasColumnName("PlanID"); + + b.Property("SubscriptionId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserId") + .HasColumnType("int"); + + b.Property("Value") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.HasKey("Id"); + + b.ToTable("SubscriptionAttributeValues"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.SubscriptionAuditLogs", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Attribute") + .HasMaxLength(20) + .IsUnicode(false) + .HasColumnType("varchar(20)"); + + b.Property("CreateBy") + .HasColumnType("int"); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("NewValue") + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.Property("OldValue") + .HasMaxLength(50) + .IsUnicode(false) + .HasColumnType("varchar(50)"); + + b.Property("SubscriptionId") + .HasColumnType("int") + .HasColumnName("SubscriptionID"); + + b.HasKey("Id"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("SubscriptionAuditLogs"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.SubscriptionEmailOutput", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Name") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("Value") + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.ToTable("SubscriptionEmailOutput"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.SubscriptionParametersOutput", b => + { + b.Property("RowNumber") + .HasColumnType("int"); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("DisplaySequence") + .HasColumnType("int"); + + b.Property("FromList") + .HasColumnType("bit"); + + b.Property("Htmltype") + .IsRequired() + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)") + .HasColumnName("HTMLType"); + + b.Property("Id") + .HasColumnType("int"); + + b.Property("IsEnabled") + .HasColumnType("bit"); + + b.Property("IsRequired") + .HasColumnType("bit"); + + b.Property("Max") + .HasColumnType("int"); + + b.Property("Min") + .HasColumnType("int"); + + b.Property("OfferAttributeId") + .HasColumnType("int") + .HasColumnName("OfferAttributeID"); + + b.Property("OfferId") + .HasColumnType("uniqueidentifier"); + + b.Property("PlanAttributeId") + .HasColumnType("int"); + + b.Property("PlanId") + .HasColumnType("uniqueidentifier"); + + b.Property("SubscriptionId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .IsRequired() + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.Property("Value") + .IsRequired() + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.Property("ValueType") + .IsRequired() + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("ValuesList") + .IsRequired() + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.HasKey("RowNumber") + .HasName("PK__Subscrip__AAAC09D8BA727059"); + + b.ToTable("SubscriptionParametersOutput"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Subscriptions", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("AmpplanId") + .HasMaxLength(100) + .IsUnicode(false) + .HasColumnType("varchar(100)") + .HasColumnName("AMPPlanId"); + + b.Property("Ampquantity") + .HasColumnType("int") + .HasColumnName("AMPQuantity"); + + b.Property("AmpsubscriptionId") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier") + .HasColumnName("AMPSubscriptionId") + .HasDefaultValueSql("(newid())"); + + b.Property("CreateBy") + .HasColumnType("int"); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("IsActive") + .HasColumnType("bit"); + + b.Property("ModifyDate") + .HasColumnType("datetime"); + + b.Property("Name") + .HasMaxLength(100) + .IsUnicode(false) + .HasColumnType("varchar(100)"); + + b.Property("PurchaserEmail") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.Property("PurchaserTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("SubscriptionStatus") + .HasMaxLength(50) + .IsUnicode(false) + .HasColumnType("varchar(50)"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Subscriptions"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Users", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("UserId"), 1L, 1); + + b.Property("CreatedDate") + .HasColumnType("datetime"); + + b.Property("EmailAddress") + .HasMaxLength(100) + .IsUnicode(false) + .HasColumnType("varchar(100)"); + + b.Property("FullName") + .HasMaxLength(200) + .IsUnicode(false) + .HasColumnType("varchar(200)"); + + b.HasKey("UserId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.ValueTypes", b => + { + b.Property("ValueTypeId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("ValueTypeId"), 1L, 1); + + b.Property("CreateDate") + .HasColumnType("datetime"); + + b.Property("Htmltype") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)") + .HasColumnName("HTMLType"); + + b.Property("ValueType") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.HasKey("ValueTypeId") + .HasName("PK__ValueTyp__A51E9C5AEA096123"); + + b.ToTable("ValueTypes"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.WebJobSubscriptionStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasColumnName("ID"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Description") + .IsUnicode(false) + .HasColumnType("varchar(max)"); + + b.Property("InsertDate") + .HasColumnType("datetime"); + + b.Property("SubscriptionId") + .HasColumnType("uniqueidentifier"); + + b.Property("SubscriptionStatus") + .HasMaxLength(225) + .IsUnicode(false) + .HasColumnType("varchar(225)"); + + b.HasKey("Id"); + + b.ToTable("WebJobSubscriptionStatus"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.KnownUsers", b => + { + b.HasOne("Marketplace.SaaS.Accelerator.DataAccess.Entities.Roles", "Role") + .WithMany("KnownUsers") + .HasForeignKey("RoleId") + .IsRequired() + .HasConstraintName("FK__KnownUser__RoleI__619B8048"); + + b.Navigation("Role"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.MeteredAuditLogs", b => + { + b.HasOne("Marketplace.SaaS.Accelerator.DataAccess.Entities.Subscriptions", "Subscription") + .WithMany("MeteredAuditLogs") + .HasForeignKey("SubscriptionId") + .HasConstraintName("FK__MeteredAu__Subsc__628FA481"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.MeteredDimensions", b => + { + b.HasOne("Marketplace.SaaS.Accelerator.DataAccess.Entities.Plans", "Plan") + .WithMany("MeteredDimensions") + .HasForeignKey("PlanId") + .HasConstraintName("FK__MeteredDi__PlanI__6383C8BA"); + + b.Navigation("Plan"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.MeteredPlanSchedulerManagement", b => + { + b.HasOne("Marketplace.SaaS.Accelerator.DataAccess.Entities.MeteredDimensions", "MeteredDimensions") + .WithMany("MeteredPlanSchedulerManagements") + .HasForeignKey("DimensionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Marketplace.SaaS.Accelerator.DataAccess.Entities.SchedulerFrequency", "SchedulerFrequency") + .WithMany("MeteredPlanSchedulerManagements") + .HasForeignKey("FrequencyId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Marketplace.SaaS.Accelerator.DataAccess.Entities.Plans", "Plan") + .WithMany("MeteredPlanSchedulerManagements") + .HasForeignKey("PlanId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Marketplace.SaaS.Accelerator.DataAccess.Entities.Subscriptions", "Subscriptions") + .WithMany("MeteredPlanSchedulerManagements") + .HasForeignKey("SubscriptionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MeteredDimensions"); + + b.Navigation("Plan"); + + b.Navigation("SchedulerFrequency"); + + b.Navigation("Subscriptions"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.SubscriptionAuditLogs", b => + { + b.HasOne("Marketplace.SaaS.Accelerator.DataAccess.Entities.Subscriptions", "Subscription") + .WithMany("SubscriptionAuditLogs") + .HasForeignKey("SubscriptionId") + .HasConstraintName("FK__Subscript__Subsc__6477ECF3"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Subscriptions", b => + { + b.HasOne("Marketplace.SaaS.Accelerator.DataAccess.Entities.Users", "User") + .WithMany("Subscriptions") + .HasForeignKey("UserId") + .HasConstraintName("FK__Subscript__UserI__656C112C"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.MeteredDimensions", b => + { + b.Navigation("MeteredPlanSchedulerManagements"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Plans", b => + { + b.Navigation("MeteredDimensions"); + + b.Navigation("MeteredPlanSchedulerManagements"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Roles", b => + { + b.Navigation("KnownUsers"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.SchedulerFrequency", b => + { + b.Navigation("MeteredPlanSchedulerManagements"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Subscriptions", b => + { + b.Navigation("MeteredAuditLogs"); + + b.Navigation("MeteredPlanSchedulerManagements"); + + b.Navigation("SubscriptionAuditLogs"); + }); + + modelBuilder.Entity("Marketplace.SaaS.Accelerator.DataAccess.Entities.Users", b => + { + b.Navigation("Subscriptions"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/DataAccess/Migrations/20231115232155_Baseline_v741.cs b/src/DataAccess/Migrations/20231115232155_Baseline_v741.cs new file mode 100644 index 00000000..7d32c1d9 --- /dev/null +++ b/src/DataAccess/Migrations/20231115232155_Baseline_v741.cs @@ -0,0 +1,20 @@ +using Marketplace.SaaS.Accelerator.DataAccess.Migrations.Custom; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Marketplace.SaaS.Accelerator.DataAccess.Migrations +{ + public partial class Baseline_v741 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.BaselineV741_SeedData(); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.BaselineV741_DeSeedData(); + } + } +} diff --git a/src/DataAccess/Migrations/Custom/BaselineV741_Seed.cs b/src/DataAccess/Migrations/Custom/BaselineV741_Seed.cs new file mode 100644 index 00000000..647e239b --- /dev/null +++ b/src/DataAccess/Migrations/Custom/BaselineV741_Seed.cs @@ -0,0 +1,35 @@ +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Query.Internal; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Marketplace.SaaS.Accelerator.DataAccess.Migrations.Custom +{ + internal static class BaselineV741_Seed + { + public static void BaselineV741_SeedData(this MigrationBuilder migrationBuilder) + { + var seedDate = DateTime.Now; + migrationBuilder.Sql(@$" + IF NOT EXISTS (SELECT * FROM [dbo].[ApplicationConfiguration] WHERE [Name] = 'IsMeteredBillingEnabled') + BEGIN + INSERT [dbo].[ApplicationConfiguration] ( [Name], [Value], [Description]) VALUES ( N'IsMeteredBillingEnabled', N'true', N'Enable Metered Billing Feature') + END + GO"); + } + + public static void BaselineV741_DeSeedData(this MigrationBuilder migrationBuilder) + { + migrationBuilder.Sql(@$" + + IF EXISTS (SELECT * FROM [dbo].[ApplicationConfiguration] WHERE [Name] = 'IsMeteredBillingEnabled') + BEGIN + DELETE FROM [dbo].[ApplicationConfiguration] WHERE [Name] = 'IsMeteredBillingEnabled' + END + GO"); + } + } +} \ No newline at end of file diff --git a/src/DataAccess/Migrations/Custom/BaselineV7_Seed.cs b/src/DataAccess/Migrations/Custom/BaselineV7_Seed.cs index 295a9262..92367a0e 100644 --- a/src/DataAccess/Migrations/Custom/BaselineV7_Seed.cs +++ b/src/DataAccess/Migrations/Custom/BaselineV7_Seed.cs @@ -18,7 +18,6 @@ IF NOT EXISTS (SELECT * FROM [dbo].[ApplicationConfiguration] WHERE [Name] = 'We BEGIN INSERT [dbo].[ApplicationConfiguration] ( [Name], [Value], [Description]) VALUES ( N'WebNotificationUrl', N'', N'Setting this URL will enable pushing LandingPage/Webhook events to this external URL') END - IF NOT EXISTS (SELECT * FROM [dbo].[ApplicationConfiguration] WHERE [Name] = 'EnablesSuccessfulSchedulerEmail') BEGIN INSERT [dbo].[ApplicationConfiguration] ( [Name], [Value], [Description]) VALUES ( N'EnablesSuccessfulSchedulerEmail', N'False', N'This will enable sending email for successful metered usage.') @@ -53,7 +52,6 @@ IF NOT EXISTS (SELECT * FROM [dbo].[EmailTemplate] WHERE [Status] = 'Missing') BEGIN INSERT [dbo].[EmailTemplate] ([Status],[Description],[InsertDate],[TemplateBody],[Subject],[isActive]) VALUES (N'Missing',N'Missing',GetDate(),N'

    Subscription ****SubscriptionName****


    The Scheduled Task ****SchedulerTaskName**** was skipped by scheduler engine!


    Please try again or contact technical support to troubleshoot the issue.

    The following section is the deatil results.

    ****ResponseJson****
    ',N'Scheduled SaaS Metered Task was Skipped!',N'True') END - GO"); } @@ -64,7 +62,6 @@ IF EXISTS (SELECT * FROM [dbo].[ApplicationConfiguration] WHERE [Name] = 'WebNot BEGIN DELETE FROM [dbo].[ApplicationConfiguration] WHERE [Name] = 'WebNotificationUrl' END - IF EXISTS (SELECT * FROM [dbo].[ApplicationConfiguration] WHERE [Name] = 'EnablesSuccessfulSchedulerEmail') BEGIN DELETE FROM [dbo].[ApplicationConfiguration] WHERE [Name] = 'EnablesSuccessfulSchedulerEmail' diff --git a/src/MeteredTriggerJob/MeteredTriggerHelper.cs b/src/MeteredTriggerJob/MeteredTriggerHelper.cs index 858fe46d..70b3329b 100644 --- a/src/MeteredTriggerJob/MeteredTriggerHelper.cs +++ b/src/MeteredTriggerJob/MeteredTriggerHelper.cs @@ -104,83 +104,87 @@ public Executor(ISchedulerFrequencyRepository frequencyRepository, /// Execute the scheduler engine /// public void Execute() - { - //Get all Scheduled Data - var getAllScheduledTasks = schedulerService.GetScheduledTasks(); - - - //GetCurrentUTC time - DateTime _currentUTCTime = DateTime.UtcNow; - TimeSpan ts = new TimeSpan(DateTime.UtcNow.Hour, 0, 0); - _currentUTCTime = _currentUTCTime.Date + ts; - - // Send Email in case of missing Scheduler - bool.TryParse(this.applicationConfigService.GetValueByName("EnablesMissingSchedulerEmail"), out bool enablesMissingSchedulerEmail); - //Process each scheduler frequency - foreach (SchedulerFrequencyEnum frequency in Enum.GetValues(typeof(SchedulerFrequencyEnum))) + { + bool.TryParse(this.applicationConfigService.GetValueByName("IsMeteredBillingEnabled"), out bool supportMeteredBilling); + if (supportMeteredBilling) { - - var ableToParse = bool.TryParse(this.applicationConfigService.GetValueByName($"Enable{frequency}MeterSchedules"), out bool runSchedulerForThisFrequency); + //Get all Scheduled Data + var getAllScheduledTasks = schedulerService.GetScheduledTasks(); + - if (ableToParse && runSchedulerForThisFrequency) + //GetCurrentUTC time + DateTime _currentUTCTime = DateTime.UtcNow; + TimeSpan ts = new TimeSpan(DateTime.UtcNow.Hour, 0, 0); + _currentUTCTime = _currentUTCTime.Date + ts; + + // Send Email in case of missing Scheduler + bool.TryParse(this.applicationConfigService.GetValueByName("EnablesMissingSchedulerEmail"), out bool enablesMissingSchedulerEmail); + //Process each scheduler frequency + foreach (SchedulerFrequencyEnum frequency in Enum.GetValues(typeof(SchedulerFrequencyEnum))) { - LogLine($"==== Checking all {frequency} scheduled items at {_currentUTCTime} UTC. ===="); - var scheduledItems = getAllScheduledTasks - .Where(a => a.Frequency == frequency.ToString()) - .ToList(); + var ableToParse = bool.TryParse(this.applicationConfigService.GetValueByName($"Enable{frequency}MeterSchedules"), out bool runSchedulerForThisFrequency); - foreach (var scheduledItem in scheduledItems) + if (ableToParse && runSchedulerForThisFrequency) { - // Get the run time. - //Always pickup the NextRuntime, durnig firstRun or OneTime then pickup StartDate, as the NextRunTime will be null - DateTime? _nextRunTime = scheduledItem.NextRunTime ?? scheduledItem.StartDate; - int timeDifferentInHours = (int)_currentUTCTime.Subtract(_nextRunTime.Value).TotalHours; - - // Print the scheduled Item and the expected run date - PrintScheduler(scheduledItem, - _nextRunTime, - timeDifferentInHours); - - //Past scheduler items - if (timeDifferentInHours > 0) + LogLine($"==== Checking all {frequency} scheduled items at {_currentUTCTime} UTC. ===="); + + var scheduledItems = getAllScheduledTasks + .Where(a => a.Frequency == frequency.ToString()) + .ToList(); + + foreach (var scheduledItem in scheduledItems) { - var msg = $"Scheduled Item Id: {scheduledItem.Id} will not run as {_nextRunTime} has passed. Please check audit logs if its has run previously."; - LogLine(msg,true); - - - if (enablesMissingSchedulerEmail) + // Get the run time. + //Always pickup the NextRuntime, durnig firstRun or OneTime then pickup StartDate, as the NextRunTime will be null + DateTime? _nextRunTime = scheduledItem.NextRunTime ?? scheduledItem.StartDate; + int timeDifferentInHours = (int)_currentUTCTime.Subtract(_nextRunTime.Value).TotalHours; + + // Print the scheduled Item and the expected run date + PrintScheduler(scheduledItem, + _nextRunTime, + timeDifferentInHours); + + //Past scheduler items + if (timeDifferentInHours > 0) { - var newMeteredAuditLog = new MeteredAuditLogs() + var msg = $"Scheduled Item Id: {scheduledItem.Id} will not run as {_nextRunTime} has passed. Please check audit logs if its has run previously."; + LogLine(msg, true); + + + if (enablesMissingSchedulerEmail) { - StatusCode = "Missing", - ResponseJson = msg - }; - SendMissingEmail(scheduledItem,newMeteredAuditLog); + var newMeteredAuditLog = new MeteredAuditLogs() + { + StatusCode = "Missing", + ResponseJson = msg + }; + SendMissingEmail(scheduledItem, newMeteredAuditLog); + } + + continue; } + else if (timeDifferentInHours < 0) + { + LogLine($"Scheduled Item Id: {scheduledItem.Id} future run will be at {_nextRunTime} UTC."); - continue; - } - else if (timeDifferentInHours < 0) - { - LogLine($"Scheduled Item Id: {scheduledItem.Id} future run will be at {_nextRunTime} UTC."); - - continue; - } - else if (timeDifferentInHours == 0) - { - TriggerSchedulerItem(scheduledItem); - } - else - { - LogLine($"Scheduled Item Id: {scheduledItem.Id} will not run as it doesn't match any time difference logic. {_nextRunTime} UTC."); - } + continue; + } + else if (timeDifferentInHours == 0) + { + TriggerSchedulerItem(scheduledItem); + } + else + { + LogLine($"Scheduled Item Id: {scheduledItem.Id} will not run as it doesn't match any time difference logic. {_nextRunTime} UTC."); + } + } + } + else + { + LogLine($"{frequency} scheduled items will not be run as it's disabled in the application config."); } - } - else - { - LogLine($"{frequency} scheduled items will not be run as it's disabled in the application config."); } } } diff --git a/src/MeteredTriggerJob/Program.cs b/src/MeteredTriggerJob/Program.cs index 47f4aff8..cd134d26 100644 --- a/src/MeteredTriggerJob/Program.cs +++ b/src/MeteredTriggerJob/Program.cs @@ -27,6 +27,7 @@ static void Main (string[] args) IConfiguration configuration = new ConfigurationBuilder() .AddEnvironmentVariables() + .AddJsonFile("appsettings.json") .Build(); var config = new SaaSApiClientConfiguration() diff --git a/src/MeteredTriggerJob/appsettings.json b/src/MeteredTriggerJob/appsettings.json index 3a11bde2..dd62ab7e 100644 --- a/src/MeteredTriggerJob/appsettings.json +++ b/src/MeteredTriggerJob/appsettings.json @@ -1,16 +1,16 @@ { "IsEncrypted": false, "saasapiconfiguration": { - "granttype": "", - "tenantid": "", - "clientid": "", - "clientsecret": "", - "resource": "", + "granttype": "client_credentials", + "tenantid": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "clientid": "79997859-0d0c-4316-a298-68679e386868", + "clientsecret": "Nqe8Q~tTONVQ1V9afKyKHU6cTohCJdm6YID9xcAt", + "resource": "20e940b3-4c77-4b0b-9a53-9e16a1b010a7", "adauthenticationendpoint": "https://login.microsoftonline.com", "supportmeteredbilling": true }, "connectionstrings": { - "defaultconnection": "" + "defaultconnection": "Data Source=tcp:sass-msalem-20231-sql.database.windows.net,1433;Initial Catalog=AMPSaaSDB;User Id=saasdbadmin602@sass-msalem-20231-sql.database.windows.net;Password=NjI3MTc2MzQtZTgwMC00MjhhLTk4NzAtZDJjMzQxYTg3ZmE3=;" }, "AllowedHosts": "*" } \ No newline at end of file diff --git a/src/Services/Services/MeteredPlanSchedulerManagementService.cs b/src/Services/Services/MeteredPlanSchedulerManagementService.cs index 1326a8b8..9e34f961 100644 --- a/src/Services/Services/MeteredPlanSchedulerManagementService.cs +++ b/src/Services/Services/MeteredPlanSchedulerManagementService.cs @@ -296,15 +296,18 @@ public bool CheckIfSchedulerRun(int id, string schedulerName) var scheduledItem = this.schedulerRepository.Get(id); var meteredAudits = this.subscriptionUsageLogsRepository.GetMeteredAuditLogsBySubscriptionId(Convert.ToInt32(scheduledItem.SubscriptionId)); var scheduledItemView = this.schedulerViewRepository.GetById(id); - foreach (var auditLog in meteredAudits) + if (scheduledItemView.Frequency == SchedulerFrequencyEnum.OneTime.ToString()) { - var MeteringUsageRequest = JsonSerializer.Deserialize(auditLog.RequestJson); - - if ((MeteringUsageRequest.Dimension == scheduledItemView.Dimension) && (auditLog.RunBy == $"Scheduler - {schedulerName}")) + foreach (var auditLog in meteredAudits) { + var MeteringUsageRequest = JsonSerializer.Deserialize(auditLog.RequestJson); + + if ((MeteringUsageRequest.Dimension == scheduledItemView.Dimension) && (auditLog.RunBy == $"Scheduler - {schedulerName}")) + { return true; - } + } + } } return false;