diff --git a/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownNoticeWithoutADSSListing.feature.cs b/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownNoticeWithoutADSSListing.feature.cs index 4aa8d58c..151a02ae 100644 --- a/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownNoticeWithoutADSSListing.feature.cs +++ b/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownNoticeWithoutADSSListing.feature.cs @@ -26,16 +26,13 @@ public partial class SendDelistingWarningWithoutADSSListingFeatureFeature private TechTalk.SpecFlow.ITestRunner testRunner; - private string[] _featureTags = ((string[])(null)); - -#line 1 "SendTakeDownNoticeWithoutADSSListing.feature" -#line hidden + private static string[] featureTags = ((string[])(null)); [NUnit.Framework.OneTimeSetUpAttribute()] public virtual void FeatureSetup() { testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); - TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "SendDelistingWarningWithoutADSSListingFeature", "Link to a feature: https://hous-hpb.atlassian.net/browse/DSS-71", ProgrammingLanguage.CSharp, ((string[])(null))); + TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "SendDelistingWarningWithoutADSSListingFeature", "Link to a feature: https://hous-hpb.atlassian.net/browse/DSS-71", ProgrammingLanguage.CSharp, featureTags); testRunner.OnFeatureStart(featureInfo); } @@ -47,28 +44,28 @@ public virtual void FeatureTearDown() } [NUnit.Framework.SetUpAttribute()] - public virtual void TestInitialize() + public void TestInitialize() { } [NUnit.Framework.TearDownAttribute()] - public virtual void TestTearDown() + public void TestTearDown() { testRunner.OnScenarioEnd(); } - public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo) { testRunner.OnScenarioInitialize(scenarioInfo); testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); } - public virtual void ScenarioStart() + public void ScenarioStart() { testRunner.OnScenarioStart(); } - public virtual void ScenarioCleanup() + public void ScenarioCleanup() { testRunner.CollectScenarioErrors(); } @@ -76,123 +73,59 @@ public virtual void ScenarioCleanup() [NUnit.Framework.TestAttribute()] [NUnit.Framework.DescriptionAttribute("SendDelistingWarningWithoutADSSListing")] [NUnit.Framework.CategoryAttribute("Delisting")] - public virtual void SendDelistingWarningWithoutADSSListing() + public void SendDelistingWarningWithoutADSSListing() { string[] tagsOfScenario = new string[] { "Delisting"}; System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("SendDelistingWarningWithoutADSSListing", null, tagsOfScenario, argumentsOfScenario, this._featureTags); -#line 5 -this.ScenarioInitialize(scenarioInfo); -#line hidden - bool isScenarioIgnored = default(bool); - bool isFeatureIgnored = default(bool); - if ((tagsOfScenario != null)) - { - isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any(); - } - if ((this._featureTags != null)) - { - isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any(); - } - if ((isScenarioIgnored || isFeatureIgnored)) + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("SendDelistingWarningWithoutADSSListing", null, tagsOfScenario, argumentsOfScenario, featureTags); + this.ScenarioInitialize(scenarioInfo); + if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) { testRunner.SkipScenario(); } else { this.ScenarioStart(); -#line 7 -testRunner.Given("I am an authenticated LG staff member", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line hidden -#line 9 -testRunner.When("I navigate to the delisting warning feature", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 12 -testRunner.Then("I should be presented with an input form that includes fields for the listing URL" + + testRunner.Given("I am an authenticated LG staff member", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); + testRunner.When("I navigate to the delisting warning feature", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("I should be presented with an input form that includes fields for the listing URL" + ", and an optional field for the host email address", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 14 -testRunner.And("I should be presented with a field to select which platform to send the warning t" + + testRunner.And("I should be presented with a field to select which platform to send the warning t" + "o", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 16 -testRunner.And("I should be presented with a dropdown menu to select reason for delisting", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 18 -testRunner.And("I should see an optional field for Listing ID", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 20 -testRunner.And("I should see an optional field for adding a LG staff user email address to be cop" + + testRunner.And("I should be presented with a dropdown menu to select reason for delisting", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I should see an optional field for Listing ID", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I should see an optional field for adding a LG staff user email address to be cop" + "ied on the email", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 24 -testRunner.When("Entering the listing URL \"ListingURL\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 26 -testRunner.Then("The system should validate the URL format and ensure it is a valid link to the pr" + + testRunner.When("Entering the listing URL \"ListingURL\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("The system should validate the URL format and ensure it is a valid link to the pr" + "operty listing", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 29 -testRunner.When("selecting the platform", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 31 -testRunner.Then("the system should present a list of available platform options to populate the fi" + + testRunner.When("selecting the platform", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("the system should present a list of available platform options to populate the fi" + "eld", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 34 -testRunner.When("entering the optional host email address", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 36 -testRunner.Then("the system should validate the email format", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 40 -testRunner.When("I select a reason for delisting", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 42 -testRunner.Then("the system should present a list of reasons for requesting delisting: No business" + + testRunner.When("entering the optional host email address", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("the system should validate the email format", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.When("I select a reason for delisting", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("the system should present a list of reasons for requesting delisting: No business" + " licence provided, invalid business licence number, expired business licence, or" + " suspended business license", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 46 -testRunner.When("all required fields are entered", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 48 -testRunner.Then("I see a template delisting warning message that will be sent to both the platform" + + testRunner.When("all required fields are entered", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("I see a template delisting warning message that will be sent to both the platform" + " and host", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 52 -testRunner.When("I submit the form with valid information", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 54 -testRunner.Then("the system should send the delisting warning message to the provided platform and" + + testRunner.When("I submit the form with valid information", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("the system should send the delisting warning message to the provided platform and" + " host email addresses", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 58 -testRunner.When("successful submission", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 60 -testRunner.Then("I should receive a confirmation message indicating that the delisting warning has" + + testRunner.When("successful submission", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("I should receive a confirmation message indicating that the delisting warning has" + " been sent", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 62 -testRunner.Then("I should be copied on the email", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 65 -testRunner.When("the delisting warning is submitted", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 67 -testRunner.Then("the platform and host should receive email notifications containing the delisting" + + testRunner.Then("I should be copied on the email", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.When("the delisting warning is submitted", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("the platform and host should receive email notifications containing the delisting" + " warning and instructions for compliance", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 71 -testRunner.When("there are issues with the submission, such as invalid email addresses or a missin" + + testRunner.When("there are issues with the submission, such as invalid email addresses or a missin" + "g URL", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 73 -testRunner.Then("the system should provide clear error messages guiding me on how to correct the i" + + testRunner.Then("the system should provide clear error messages guiding me on how to correct the i" + "ssues", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden } this.ScenarioCleanup(); } diff --git a/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownRequestWithoutADSSListing.feature b/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownRequestWithoutADSSListing.feature index b3a8a187..b8b95c04 100644 --- a/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownRequestWithoutADSSListing.feature +++ b/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownRequestWithoutADSSListing.feature @@ -4,78 +4,83 @@ Link to a feature: https://hous-hpb.atlassian.net/browse/DSS-74 @Delisting Scenario: SendDelistingRequestWithoutADSSListing #User Authentication -Given I am an authenticated LG staff member + Given I am an authenticated LG staff member and the expected result is "" -When I navigate to the delisting request feature + When I navigate to the delisting request feature #Input Form -Then I should be presented with an input form that includes fields for the listing URL + Then I should be presented with an input form that includes fields for the listing URL -And I Should be Presented with an Input form that Lists requests Initiated By + And I Should be Presented with an Input form that Lists requests Initiated By -And I should be presented with a field to select which platform to send the request to + And I should be presented with a field to select which platform to send the request to -And I should see an optional field for adding a LG staff user email address to be copied on the email + And I should see an optional field for adding a LG staff user email address to be copied on the email #Initiated By -When Selecting the LG for Initiated By + When Selecting the LG for Initiated By -Then The system should present a list of available LG options to populate the field + Then The system should present a list of available LG options to populate the field #ListingIDField -When Entering the listing ID "" + When Entering the listing ID "" -Then The system should validate the ID is a number + Then The system should validate the ID is a number #ListingURLField -When Entering the listing URL "http://listingURL.com" + When Entering the listing URL "" -Then The system should validate the URL format and ensure it is a valid link to the property listing + Then The system should validate the URL format and ensure it is a valid link to the property listing #PlatformField -When selecting the platform + When selecting the platform -Then the system should present a list of available platform options to populate the field + Then the system should present a list of available platform options to populate the field #DelistingRequestMessage -When all required fields are entered + When all required fields are entered -Then I click the review button + Then I click the review button -Then I see a template delisting request message that will be sent to both the platform + Then I see a template delisting request message that will be sent to both the platform #SendDelistingRequest -When I submit the form with valid information + When I submit the form with valid information -Then the system should send the delisting request message to the platform email addresses associated with the selected platform + Then the system should send the delisting request message to the platform email addresses associated with the selected platform #ConfirmationMessage -When successful submission + When successful submission -Then I should receive a confirmation message indicating that the delisting request has been sent + Then I should receive a confirmation message indicating that the delisting request has been sent -Then I should be copied on the email + Then I should be copied on the email #NotificationToPlatformAndHost -When the delisting request is submitted + When the delisting request is submitted -Then the platform and host should receive email notifications containing the delisting request and instructions for compliance + Then the platform and host should receive email notifications containing the delisting request and instructions for compliance #FrontEndErrorHandling -When there are issues with the submission, such as invalid email addresses or a missing URL + When there are issues with the submission, such as invalid email addresses or a missing URL -Then the system should provide clear error messages guiding me on how to correct the issues + Then the system should provide clear error messages guiding me on how to correct the issues Examples: -| ListingID | Comment | -| -1 | Negative | -| 0 | Boundary | -| 9999 | Max | -| test | string | \ No newline at end of file + | ListingID | Description | ExpectedResult | ListingURL | AdditionalCCsTextBox | + | -1 | ListingID - Negative number test | fail | http://listingURL.com | richard.anderson@dxc.com | + | 0 | ListingID - Boundary | pass | http://listingURL.com | richard.anderson@dxc.com | + | 9223372036854775807 | ListingID - Test for Max value | pass | http://listingURL.com | richard.anderson@dxc.com | + | test | ListingID - Test for string | fail | http://listingURL.com | richard.anderson@dxc.com | + | e | ListingID - Test for exponential | fail | http://listingURL.com | richard.anderson@dxc.com | + | 0 | ListingURL - Valid URL | pass | HTTP://listingURL.com | richard.anderson@dxc.com | + | 0 | ListingURL - Valid URL | pass | HTTPS://listingURL.com | richard.anderson@dxc.com | + | 0 | ListingURL - Invalid URL | fail | http://listingURL | richard.anderson@dxc.com | + | 0 | ListingURL - Long URL | pass | http://ReallylongURLstring123123123123123123123123123123.com | richard.anderson@dxc.com | \ No newline at end of file diff --git a/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownRequestWithoutADSSListing.feature.cs b/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownRequestWithoutADSSListing.feature.cs index 2aea4fcc..4508503e 100644 --- a/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownRequestWithoutADSSListing.feature.cs +++ b/Test/UITest/SpecFlowProjectBDD/Features/SendTakeDownRequestWithoutADSSListing.feature.cs @@ -26,16 +26,13 @@ public partial class SendDelistingRequestWithoutADSSListingFeatureFeature private TechTalk.SpecFlow.ITestRunner testRunner; - private string[] _featureTags = ((string[])(null)); - -#line 1 "SendTakeDownRequestWithoutADSSListing.feature" -#line hidden + private static string[] featureTags = ((string[])(null)); [NUnit.Framework.OneTimeSetUpAttribute()] public virtual void FeatureSetup() { testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); - TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "SendDelistingRequestWithoutADSSListingFeature", "Link to a feature: https://hous-hpb.atlassian.net/browse/DSS-74", ProgrammingLanguage.CSharp, ((string[])(null))); + TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "SendDelistingRequestWithoutADSSListingFeature", "Link to a feature: https://hous-hpb.atlassian.net/browse/DSS-74", ProgrammingLanguage.CSharp, featureTags); testRunner.OnFeatureStart(featureInfo); } @@ -47,28 +44,28 @@ public virtual void FeatureTearDown() } [NUnit.Framework.SetUpAttribute()] - public virtual void TestInitialize() + public void TestInitialize() { } [NUnit.Framework.TearDownAttribute()] - public virtual void TestTearDown() + public void TestTearDown() { testRunner.OnScenarioEnd(); } - public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo) { testRunner.OnScenarioInitialize(scenarioInfo); testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); } - public virtual void ScenarioStart() + public void ScenarioStart() { testRunner.OnScenarioStart(); } - public virtual void ScenarioCleanup() + public void ScenarioCleanup() { testRunner.CollectScenarioErrors(); } @@ -76,11 +73,16 @@ public virtual void ScenarioCleanup() [NUnit.Framework.TestAttribute()] [NUnit.Framework.DescriptionAttribute("SendDelistingRequestWithoutADSSListing")] [NUnit.Framework.CategoryAttribute("Delisting")] - [NUnit.Framework.TestCaseAttribute("-1", "Negative", null)] - [NUnit.Framework.TestCaseAttribute("0", "Boundary", null)] - [NUnit.Framework.TestCaseAttribute("9999", "Max", null)] - [NUnit.Framework.TestCaseAttribute("test", "string", null)] - public virtual void SendDelistingRequestWithoutADSSListing(string listingID, string comment, string[] exampleTags) + [NUnit.Framework.TestCaseAttribute("-1", "ListingID - Negative number test", "fail", "http://listingURL.com", "richard.anderson@dxc.com", null)] + [NUnit.Framework.TestCaseAttribute("0", "ListingID - Boundary", "pass", "http://listingURL.com", "richard.anderson@dxc.com", null)] + [NUnit.Framework.TestCaseAttribute("9223372036854775807", "ListingID - Test for Max value", "pass", "http://listingURL.com", "richard.anderson@dxc.com", null)] + [NUnit.Framework.TestCaseAttribute("test", "ListingID - Test for string", "fail", "http://listingURL.com", "richard.anderson@dxc.com", null)] + [NUnit.Framework.TestCaseAttribute("e", "ListingID - Test for exponential", "fail", "http://listingURL.com", "richard.anderson@dxc.com", null)] + [NUnit.Framework.TestCaseAttribute("0", "ListingURL - Valid URL", "pass", "HTTP://listingURL.com", "richard.anderson@dxc.com", null)] + [NUnit.Framework.TestCaseAttribute("0", "ListingURL - Valid URL", "pass", "HTTPS://listingURL.com", "richard.anderson@dxc.com", null)] + [NUnit.Framework.TestCaseAttribute("0", "ListingURL - Invalid URL", "fail", "http://listingURL", "richard.anderson@dxc.com", null)] + [NUnit.Framework.TestCaseAttribute("0", "ListingURL - Long URL", "pass", "http://ReallylongURLstring123123123123123123123123123123.com", "richard.anderson@dxc.com", null)] + public void SendDelistingRequestWithoutADSSListing(string listingID, string description, string expectedResult, string listingURL, string additionalCCsTextBox, string[] exampleTags) { string[] @__tags = new string[] { "Delisting"}; @@ -91,117 +93,56 @@ public virtual void SendDelistingRequestWithoutADSSListing(string listingID, str string[] tagsOfScenario = @__tags; System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); argumentsOfScenario.Add("ListingID", listingID); - argumentsOfScenario.Add("Comment", comment); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("SendDelistingRequestWithoutADSSListing", null, tagsOfScenario, argumentsOfScenario, this._featureTags); -#line 5 -this.ScenarioInitialize(scenarioInfo); -#line hidden - bool isScenarioIgnored = default(bool); - bool isFeatureIgnored = default(bool); - if ((tagsOfScenario != null)) - { - isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any(); - } - if ((this._featureTags != null)) - { - isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any(); - } - if ((isScenarioIgnored || isFeatureIgnored)) + argumentsOfScenario.Add("Description", description); + argumentsOfScenario.Add("ExpectedResult", expectedResult); + argumentsOfScenario.Add("ListingURL", listingURL); + argumentsOfScenario.Add("AdditionalCCsTextBox", additionalCCsTextBox); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("SendDelistingRequestWithoutADSSListing", null, tagsOfScenario, argumentsOfScenario, featureTags); + this.ScenarioInitialize(scenarioInfo); + if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) { testRunner.SkipScenario(); } else { this.ScenarioStart(); -#line 7 -testRunner.Given("I am an authenticated LG staff member", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line hidden -#line 9 -testRunner.When("I navigate to the delisting request feature", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 12 -testRunner.Then("I should be presented with an input form that includes fields for the listing URL" + + testRunner.Given(string.Format("I am an authenticated LG staff member and the expected result is \"{0}\"", expectedResult), ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); + testRunner.When("I navigate to the delisting request feature", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("I should be presented with an input form that includes fields for the listing URL" + "", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 14 -testRunner.And("I Should be Presented with an Input form that Lists requests Initiated By", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 16 -testRunner.And("I should be presented with a field to select which platform to send the request t" + + testRunner.And("I Should be Presented with an Input form that Lists requests Initiated By", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I should be presented with a field to select which platform to send the request t" + "o", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 18 -testRunner.And("I should see an optional field for adding a LG staff user email address to be cop" + + testRunner.And("I should see an optional field for adding a LG staff user email address to be cop" + "ied on the email", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 22 -testRunner.When("Selecting the LG for Initiated By", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 24 -testRunner.Then("The system should present a list of available LG options to populate the field", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 28 -testRunner.When(string.Format("Entering the listing ID \"{0}\"", listingID), ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 30 -testRunner.Then("The system should validate the ID is a number", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 34 -testRunner.When("Entering the listing URL \"http://listingURL.com\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 36 -testRunner.Then("The system should validate the URL format and ensure it is a valid link to the pr" + + testRunner.When("Selecting the LG for Initiated By", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("The system should present a list of available LG options to populate the field", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.When(string.Format("Entering the listing ID \"{0}\"", listingID), ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("The system should validate the ID is a number", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.When(string.Format("Entering the listing URL \"{0}\"", listingURL), ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("The system should validate the URL format and ensure it is a valid link to the pr" + "operty listing", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 39 -testRunner.When("selecting the platform", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 41 -testRunner.Then("the system should present a list of available platform options to populate the fi" + + testRunner.When("selecting the platform", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("the system should present a list of available platform options to populate the fi" + "eld", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 45 -testRunner.When("all required fields are entered", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 47 -testRunner.Then("I click the review button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 49 -testRunner.Then("I see a template delisting request message that will be sent to both the platform" + + testRunner.When("all required fields are entered", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("I click the review button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.Then("I see a template delisting request message that will be sent to both the platform" + "", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 53 -testRunner.When("I submit the form with valid information", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 55 -testRunner.Then("the system should send the delisting request message to the platform email addres" + + testRunner.When("I submit the form with valid information", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("the system should send the delisting request message to the platform email addres" + "ses associated with the selected platform", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 59 -testRunner.When("successful submission", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 61 -testRunner.Then("I should receive a confirmation message indicating that the delisting request has" + + testRunner.When("successful submission", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("I should receive a confirmation message indicating that the delisting request has" + " been sent", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 63 -testRunner.Then("I should be copied on the email", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 66 -testRunner.When("the delisting request is submitted", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 68 -testRunner.Then("the platform and host should receive email notifications containing the delisting" + + testRunner.Then("I should be copied on the email", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.When("the delisting request is submitted", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.Then("the platform and host should receive email notifications containing the delisting" + " request and instructions for compliance", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden -#line 72 -testRunner.When("there are issues with the submission, such as invalid email addresses or a missin" + + testRunner.When("there are issues with the submission, such as invalid email addresses or a missin" + "g URL", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 74 -testRunner.Then("the system should provide clear error messages guiding me on how to correct the i" + + testRunner.Then("the system should provide clear error messages guiding me on how to correct the i" + "ssues", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden } this.ScenarioCleanup(); } diff --git a/Test/UITest/SpecFlowProjectBDD/SpecFlowProjectBDD.csproj b/Test/UITest/SpecFlowProjectBDD/SpecFlowProjectBDD.csproj index 607c92e3..79e7a60b 100644 --- a/Test/UITest/SpecFlowProjectBDD/SpecFlowProjectBDD.csproj +++ b/Test/UITest/SpecFlowProjectBDD/SpecFlowProjectBDD.csproj @@ -11,12 +11,12 @@ - + - - - - + + + + diff --git a/Test/UITest/SpecFlowProjectBDD/StepDefinitions/SendTakeDownNoticeWithoutADSSListing.cs b/Test/UITest/SpecFlowProjectBDD/StepDefinitions/SendTakeDownNoticeWithoutADSSListing.cs index cdffcb60..97a48dfe 100644 --- a/Test/UITest/SpecFlowProjectBDD/StepDefinitions/SendTakeDownNoticeWithoutADSSListing.cs +++ b/Test/UITest/SpecFlowProjectBDD/StepDefinitions/SendTakeDownNoticeWithoutADSSListing.cs @@ -3,6 +3,7 @@ using UITest.TestDriver; using TestFrameWork.Models; using Configuration; +using NUnit.Framework.Legacy; namespace SpecFlowProjectBDD.StepDefinitions { @@ -117,7 +118,7 @@ public void WhenSelectingThePlatform() public void TheSystemShouldPresentAListOfAvailablePlatformOption() { _DelistingWarningPage.PlatformReceipientDropdown.ExecuteJavaScript(@"document.querySelector(""#platformId_0"").click()"); - Assert.IsTrue(_DelistingWarningPage.PlatformReceipientDropdown.Text.ToUpper().Contains("AIRBNB")); + ClassicAssert.IsTrue(_DelistingWarningPage.PlatformReceipientDropdown.Text.ToUpper().Contains("AIRBNB")); } @@ -185,7 +186,7 @@ public void ThenIShouldReceiveAConfirmationMessage() { //Validate message and return to home page System.Threading.Thread.Sleep(3000); - Assert.IsTrue(_DelistingWarningPage.EmbededDriver.PageSource.Contains("Your Notice of Takedown was Successfully Submitted!")); + ClassicAssert.IsTrue(_DelistingWarningPage.EmbededDriver.PageSource.Contains("Your Notice of Takedown was Successfully Submitted!")); _DelistingWarningPage.ReturnHomeButton.Click(); } diff --git a/Test/UITest/SpecFlowProjectBDD/StepDefinitions/SendTakeDownRequestWithoutADSSListing.cs b/Test/UITest/SpecFlowProjectBDD/StepDefinitions/SendTakeDownRequestWithoutADSSListing.cs index 9bdc9b96..2729ac1c 100644 --- a/Test/UITest/SpecFlowProjectBDD/StepDefinitions/SendTakeDownRequestWithoutADSSListing.cs +++ b/Test/UITest/SpecFlowProjectBDD/StepDefinitions/SendTakeDownRequestWithoutADSSListing.cs @@ -3,6 +3,10 @@ using UITest.TestDriver; using Configuration; using TestFrameWork.Models; +using TechTalk.SpecFlow; +using TechTalk.SpecFlow.Assist; +using Gherkin.CucumberMessages.Types; +using NUnit.Framework.Legacy; namespace SpecFlowProjectBDD.StepDefinitions { @@ -17,10 +21,23 @@ public sealed class SendTakeDownRequestWithoutADSSListing IDRLoginPage _IDRLoginPage; string _TestUserName; string _TestPassword; + int _CurrentRow = 0; + bool _ExpectedResult = false; + bool _ActualResult = false; + //IEnumerable _ScenarioParameters; + //private readonly ScenarioContext _scenarioContext; IDriver _driver; - + [AfterScenario] + public void AfterScenario() + { + + + } + + + public SendTakeDownRequestWithoutADSSListing(SeleniumDriver Driver) { _driver = Driver; @@ -35,18 +52,25 @@ public SendTakeDownRequestWithoutADSSListing(SeleniumDriver Driver) } //User Authentication - [Given("I am an authenticated LG staff member")] - public void GivenIAmAauthenticatedLGStaffMemberUser() + [Given(@"I am an authenticated LG staff member and the expected result is ""(.*)""")] + public void GivenIAmAauthenticatedLGStaffMemberUser(string ExpectedResult) { + _ActualResult = true; + //var inputsTable = ScenarioContext.Current["table"] as Table; + //_ScenarioParameters = inputsTable.CreateSet().ToList(); + _ExpectedResult = ExpectedResult.ToUpper() == "PASS" ? true : false; + _driver.Url = "http://127.0.0.1:4200/delisting-request"; _driver.Navigate(); - + _PathFinderPage.IDRButton.Click(); + _IDRLoginPage.UserNameTextBox.WaitFor(); _IDRLoginPage.UserNameTextBox.EnterText(_TestUserName); _IDRLoginPage.PasswordTextBox.EnterText(_TestPassword); _IDRLoginPage.ContinueButton.Click(); + _ActualResult = true; } @@ -67,7 +91,7 @@ public void IshouldBePresentedWithAnInputFormThatIncludesFields() [Then("I Should be Presented with an Input form that Lists requests Initiated By")] public void IShouldBePresentedWithAnInputFormThatListsRequestsInitiatedBy() - { + { } @@ -86,9 +110,9 @@ public void IShouldSeeAnOptionalFieldForAddingALGStaffUserEmailAddressToBeCopied //ListingID [When(@"Entering the listing ID ""(.*)""")] - public void WhenEnteringTheListingID(String ID) + public void WhenEnteringTheListingID(string ListingID) { - _DelistingRequestPage.ListingIDNumberTextBox.EnterText(ID); + _DelistingRequestPage.ListingIDNumberTextBox.EnterText(ListingID); } [Then("The system should validate the ID is a number")] @@ -97,8 +121,9 @@ public void TheSystemShouldValidateTheIDFormat() } //ListingURLField + //[When(@"Entering the listing URL")] [When(@"Entering the listing URL ""(.*)""")] - public void WhenEnteringTheListingURL(String URL) + public void WhenEnteringTheListingURL(string URL) { _DelistingRequestPage.ListingUrlTextBox.EnterText(URL); } @@ -114,7 +139,7 @@ public void SelectingTheLGForInitiatedBy() { _DelistingRequestPage.RequestInitiatedByDropDown.Click(); _DelistingRequestPage.RequestInitiatedByDropDown.ExecuteJavaScript(@"document.querySelector(""#lgId_0"").click()"); - //Assert.IsTrue(_DelistingRequestPage.PlatformReceipientDropdown.Text.Contains("AIRBNB")); + //ClassicAssert.IsTrue(_DelistingRequestPage.PlatformReceipientDropdown.Text.Contains("AIRBNB")); } [Then("The system should present a list of available LG options to populate the field")] @@ -128,7 +153,7 @@ public void WhenSelectingThePlatform() { _DelistingRequestPage.PlatformReceipientDropdown.Click(); _DelistingRequestPage.PlatformReceipientDropdown.ExecuteJavaScript(@"document.querySelector(""#platformId_0"").click()"); - Assert.IsTrue( _DelistingRequestPage.PlatformReceipientDropdown.Text.ToUpper().Contains("AIRBNB")); + ClassicAssert.IsTrue(_DelistingRequestPage.PlatformReceipientDropdown.Text.ToUpper().Contains("AIRBNB")); } [Then("the system should present a list of available platform options to populate the field")] @@ -138,46 +163,60 @@ public void TheSystemShouldPresentAListOfAvailablePlatformOption() //DelistingRequestMessage [When("all required fields are entered")] - public void WhenAllRequiredFieldsAreEntered() - { + public void WhenAllRequiredFieldsAreEntered() + { } [Then("I click the review button")] public void ThenIClickTheReviewButton() { - _DelistingRequestPage.ReviewButton.Click(); + try + { + _DelistingRequestPage.ReviewButton.Click(); + _ActualResult = true; + } + catch (Exception ex) + { + if (_ExpectedResult == true) + Assert.Fail(); + } + } [Then("I see a template delisting request message that will be sent to both the platform")] - public void ThenISeeATemplateDelistingRequestMessage() - { + public void ThenISeeATemplateDelistingRequestMessage() + { } //SendDelistingRequest [When("I submit the form with valid information")] - public void WhenISubmitTheFormWithValidInformation() + public void WhenISubmitTheFormWithValidInformation() { + _ActualResult = false; _TakeDownRequestPage.SubmitButton.Click(); + _ActualResult = true; } [Then("the system should send the delisting request message to the platform email addresses associated with the selected platform")] - public void ThenTheSystemShouldSendTheDelistingRequestMessage() + public void ThenTheSystemShouldSendTheDelistingRequestMessage() { } //ConfirmationMessage [When("successful submission")] - public void WhenSuccessfulSubmission() + public void WhenSuccessfulSubmission() { } [Then("I should receive a confirmation message indicating that the delisting request has been sent")] public void ThenIShouldReceiveAConfirmationMessage() { + _ActualResult = false; System.Threading.Thread.Sleep(3000); - Assert.IsTrue(_DelistingRequestPage.EmbededDriver.PageSource.Contains("Your Notice of Takedown was Successfully Submitted!")); + ClassicAssert.IsTrue(_DelistingRequestPage.EmbededDriver.PageSource.Contains("Your Notice of Takedown was Successfully Submitted!")); _DelistingRequestPage.ReturnHomeButton.Click(); + _ActualResult = true; } [Then("I should be copied on the email")] @@ -207,4 +246,14 @@ public void ThenTheSystemShouldProvideClearErrorMessages() { } } + + public class ScenarioParameters + { + public string ListingID { get; set; } + public string Comment { get; set; } + public string LIDExpectedResult { get; set; } + public string ListingURL { get; set; } + public string LstExpectedResult { get; set; } + + } } diff --git a/Test/UITest/XUnitTests/HousrSTRE2E.cs b/Test/UITest/XUnitTests/HousrSTRE2E.cs index 96c5c28c..1f814e4a 100644 --- a/Test/UITest/XUnitTests/HousrSTRE2E.cs +++ b/Test/UITest/XUnitTests/HousrSTRE2E.cs @@ -84,6 +84,9 @@ public void TestLoginAndRequestDelisting() _TakeDownRequestPage.SubmitButton.Click(); //Validate successful submission + + //Wait for page source to load + System.Threading.Thread.Sleep(3000); Assert.True(_DelistingRequestPage.EmbededDriver.PageSource.Contains("Your Notice of Takedown was Successfully Submitted!")); _DelistingRequestPage.ReturnHomeButton.Click(); @@ -166,6 +169,9 @@ public void TestLoginAndSendWarningDelisting() //Validate successful submission + + //Wait for page source to load + System.Threading.Thread.Sleep(3000); Assert.True(_DelistingWarningPage.EmbededDriver.PageSource.Contains("Your Notice of Takedown was Successfully Submitted!")); //If submit is sucessful, then return to home page @@ -201,9 +207,10 @@ public void TestRequestAccess() _IDRLoginPage.ContinueButton.Click(); _RequestAccessPage.UserRoleDropDown.Click(); - _RequestAccessPage.UserRoleDropDown.ExecuteJavaScript("@\"document.querySelector(\"\"##organizationType_0\"\").click()\""); + _RequestAccessPage.UserRoleDropDown.WaitFor(); + _RequestAccessPage.UserRoleDropDown.ExecuteJavaScript(@"document.querySelector(""#organizationType_0"").click()"); _RequestAccessPage.UserOrganizationTextBox.EnterText("Test Org"); - + _RequestAccessPage.SubmitButton.Click(); } finally { diff --git a/crunchydb/values-uat.yaml b/crunchydb/values-uat.yaml index 1b2b9f97..69abead0 100644 --- a/crunchydb/values-uat.yaml +++ b/crunchydb/values-uat.yaml @@ -4,7 +4,7 @@ crunchy-postgres: name: ha # high availability replicas: 2 dataVolumeClaimSpec: - storage: 5Gi + storage: 6Gi storageClassName: netapp-block-standard requests: cpu: 1m @@ -19,6 +19,19 @@ crunchy-postgres: limits: cpu: 50m memory: 64Mi + + pgBackRest: + retention: "10" # Ideally a larger number such as 30 backups/days + # If retention-full-type set to 'count' then the oldest backups will expire when the number of backups reach the number defined in retention + # If retention-full-type set to 'time' then the number defined in retention will take that many days worth of full backups before expiration + retentionFullType: count + repos: + schedules: + full: 0 8 * * * + incremental: 0 0,4,12,16,20 * * * + volume: + accessModes: "ReadWriteOnce" + storage: 2Gi crunchy-postgres-tools: networking: route: diff --git a/postman/str-dss.postman_collection.json b/postman/str-dss.postman_collection.json index c957ee3b..9ef2d5b7 100644 --- a/postman/str-dss.postman_collection.json +++ b/postman/str-dss.postman_collection.json @@ -354,7 +354,7 @@ "method": "GET", "header": [], "url": { - "raw": "{{host}}/api/users?status=&pageSize=20&pageNumber=1&orderby=organizationNm", + "raw": "{{host}}/api/users?status=&pageSize=20&pageNumber=1&orderby=organizationNm&organizationId=4", "host": [ "{{host}}" ], @@ -378,6 +378,10 @@ { "key": "orderby", "value": "organizationNm" + }, + { + "key": "organizationId", + "value": "4" } ] } diff --git a/server/StrDss.Api/Controllers/RentalReportsController.cs b/server/StrDss.Api/Controllers/RentalReportsController.cs new file mode 100644 index 00000000..2a97b7e4 --- /dev/null +++ b/server/StrDss.Api/Controllers/RentalReportsController.cs @@ -0,0 +1,20 @@ +using Asp.Versioning; +using AutoMapper; +using Microsoft.AspNetCore.Mvc; +using StrDss.Model; + +namespace StrDss.Api.Controllers +{ + [ApiVersion("1.0")] + [Route("api/[controller]")] + [ApiController] + public class RentalReportsController : BaseApiController + { + public RentalReportsController(ICurrentUser currentUser, IMapper mapper, IConfiguration config) + : base(currentUser, mapper, config) + { + } + + + } +} diff --git a/server/StrDss.Api/Controllers/UsersController.cs b/server/StrDss.Api/Controllers/UsersController.cs index 4ccdb42e..c45213cf 100644 --- a/server/StrDss.Api/Controllers/UsersController.cs +++ b/server/StrDss.Api/Controllers/UsersController.cs @@ -31,9 +31,9 @@ public ActionResult GetCurrentUser() [ApiAuthorize] [HttpGet("", Name = "GetUserList")] - public async Task>> GetUserList(string? status, int pageSize, int pageNumber, string orderBy = "UpdDtm", string direction = "desc") + public async Task>> GetUserList(string? status, string? search, long? organizationId, int pageSize, int pageNumber, string orderBy = "UpdDtm", string direction = "desc") { - var list = await _userService.GetUserListAsync(status ?? "", pageSize, pageNumber, orderBy, direction); + var list = await _userService.GetUserListAsync(status ?? "", search ?? "", organizationId, pageSize, pageNumber, orderBy, direction); return Ok(list); } diff --git a/server/StrDss.Common/RegexInfo.cs b/server/StrDss.Common/RegexInfo.cs index 1a235e60..a3f803f5 100644 --- a/server/StrDss.Common/RegexInfo.cs +++ b/server/StrDss.Common/RegexInfo.cs @@ -58,7 +58,7 @@ static RegexDefs() _regexInfos.Add(Url, new RegexInfo { - Regex = @"\b(https?|ftp|file):\/\/[-A-Za-z0-9+&@#/%?=~_|!:,.;]*[-A-Za-z0-9+&@#/%=~_|]", + Regex = @"\b(?:[Hh][Tt][Tt][Pp][Ss]?):\/\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]*[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid Url" }); } diff --git a/server/StrDss.Data/Repositories/UserRepository.cs b/server/StrDss.Data/Repositories/UserRepository.cs index 3f903b0e..d8753a3d 100644 --- a/server/StrDss.Data/Repositories/UserRepository.cs +++ b/server/StrDss.Data/Repositories/UserRepository.cs @@ -9,7 +9,7 @@ namespace StrDss.Data.Repositories { public interface IUserRepository { - Task> GetUserListAsync(string status, int pageSize, int pageNumber, string orderBy, string direction); + Task> GetUserListAsync(string status, string search, long? orgranizationId, int pageSize, int pageNumber, string orderBy, string direction); Task CreateUserAsync(UserCreateDto dto); Task<(UserDto? user, List permissions)> GetUserAndPermissionsByGuidAsync(Guid guid); Task GetUserById(long id); @@ -28,7 +28,7 @@ public UserRepository(DssDbContext dbContext, IMapper mapper, ICurrentUser curre { } - public async Task> GetUserListAsync(string status, int pageSize, int pageNumber, string orderBy, string direction) + public async Task> GetUserListAsync(string status, string search, long? orgranizationId, int pageSize, int pageNumber, string orderBy, string direction) { var query = _dbContext.DssUserIdentityViews.AsNoTracking(); @@ -37,6 +37,21 @@ public async Task> GetUserListAsync(string status, int pa query = query.Where(x => x.AccessRequestStatusCd == status); } + if (orgranizationId != null) + { + query = query.Where(x => x.RepresentedByOrganizationId == orgranizationId); + } + + if (search.IsNotEmpty()) + { + query = query.Where(x => x.GivenNm != null && x.GivenNm.Contains(search) + || x.FamilyNm != null && x.FamilyNm.Contains(search) + || x.OrganizationNm != null && x.OrganizationNm.Contains(search) + || x.OrganizationType != null && x.OrganizationType.Contains(search) + || x.EmailAddressDsc != null && x.EmailAddressDsc.Contains(search) + ); + } + var results = await Page(query, pageSize, pageNumber, orderBy, direction); return results; diff --git a/server/StrDss.Service/StrDss.Service.csproj b/server/StrDss.Service/StrDss.Service.csproj index fd934574..c6bcc939 100644 --- a/server/StrDss.Service/StrDss.Service.csproj +++ b/server/StrDss.Service/StrDss.Service.csproj @@ -6,6 +6,7 @@ enable + diff --git a/server/StrDss.Service/UserService.cs b/server/StrDss.Service/UserService.cs index cfeaef5b..cab48ec1 100644 --- a/server/StrDss.Service/UserService.cs +++ b/server/StrDss.Service/UserService.cs @@ -11,7 +11,7 @@ namespace StrDss.Service { public interface IUserService { - Task> GetUserListAsync(string status, int pageSize, int pageNumber, string orderBy, string direction); + Task> GetUserListAsync(string status, string search, long? orgranizationId, int pageSize, int pageNumber, string orderBy, string direction); Task<(UserDto? user, List permissions)> GetUserByGuidAsync(Guid guid); Task>> CreateAccessRequestAsync(AccessRequestCreateDto dto); Task>> DenyAccessRequest(AccessRequestDenyDto dto); @@ -35,9 +35,9 @@ public UserService(ICurrentUser currentUser, IFieldValidatorService validator, I _emailService = emailService; } - public async Task> GetUserListAsync(string status, int pageSize, int pageNumber, string orderBy, string direction) + public async Task> GetUserListAsync(string status, string search, long? orgranizationId, int pageSize, int pageNumber, string orderBy, string direction) { - return await _userRepo.GetUserListAsync(status, pageSize, pageNumber, orderBy, direction); + return await _userRepo.GetUserListAsync(status, search, orgranizationId, pageSize, pageNumber, orderBy, direction); } public async Task<(UserDto? user, List permissions)> GetUserByGuidAsync(Guid guid)