Merge pull request #2636 from TechnologyEnhancedLearning/Develop/Fixes/TD-3956-ReplaceuserresearchlinkforparticipantrecruitmentonDLS

TD-3956 replace user research link for participant recruitment on dls

Author: rshrirohit

DigitalLearningSolutions.Web.Tests/Controllers/UserFeedbackControllerTest.cs

@@ -46,7 +46,7 @@ public void SetUp()
         public void UserFeedbackTaskAchieved_ShouldReturnCorrectView()
         {
              // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackTaskAchieved(userFeedbackViewModel) as ViewResult;
@@ -61,7 +61,7 @@ public void UserFeedbackTaskAchieved_ShouldReturnCorrectView()
         public void UserFeedbackTaskAttempted_ShouldReturnCorrectView()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackTaskAttempted(userFeedbackViewModel) as ViewResult;
@@ -76,7 +76,7 @@ public void UserFeedbackTaskAttempted_ShouldReturnCorrectView()
         public void UserFeedbackTaskDifficulty_ShouldReturnCorrectView()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackTaskDifficulty(userFeedbackViewModel) as ViewResult;
@@ -91,7 +91,7 @@ public void UserFeedbackTaskDifficulty_ShouldReturnCorrectView()
         public void UserFeedbackComplete_ShouldReturnCorrectView()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackComplete(userFeedbackViewModel) as ViewResult;
@@ -106,7 +106,7 @@ public void UserFeedbackComplete_ShouldReturnCorrectView()
         public void GuestFeedbackStart_ShouldReturnCorrectView()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.GuestFeedbackStart(userFeedbackViewModel) as ViewResult;
@@ -161,7 +161,7 @@ public void Index_WithNonNullUserId_ShouldRedirectToStartUserFeedbackSession()
         public void UserFeedbackTaskAchievedSet_ShouldRedirectToUserFeedbackTaskAttempted()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackTaskAchievedSet(userFeedbackViewModel) as RedirectToActionResult;
@@ -175,7 +175,7 @@ public void UserFeedbackTaskAchievedSet_ShouldRedirectToUserFeedbackTaskAttempte
         public void UserFeedbackTaskAttemptedSet_ShouldRedirectToUserFeedbackTaskDifficulty()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackTaskAttemptedSet(userFeedbackViewModel) as RedirectToActionResult;
@@ -189,7 +189,7 @@ public void UserFeedbackTaskAttemptedSet_ShouldRedirectToUserFeedbackTaskDifficu
         public void UserFeedbackTaskDifficultySet_ShouldRedirectToUserFeedbackSave()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackTaskDifficultySet(userFeedbackViewModel) as RedirectToActionResult;
@@ -203,7 +203,7 @@ public void UserFeedbackTaskDifficultySet_ShouldRedirectToUserFeedbackSave()
         public void UserFeedbackSave_ShouldCallSaveUserFeedbackAndRedirectToUserFeedbackComplete()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
             A.CallTo(() => _multiPageFormService.GetMultiPageFormData<UserFeedbackTempData>(
                     MultiPageFormDataFeature.AddUserFeedback, _tempData))
                 .Returns(new UserFeedbackTempData());
@@ -222,7 +222,7 @@ public void UserFeedbackSave_ShouldCallSaveUserFeedbackAndRedirectToUserFeedback
         public void GuestFeedbackComplete_ShouldCallSaveUserFeedbackAndRenderGuestFeedbackCompleteView()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
             userFeedbackViewModel.FeedbackText = FeedbackText;
 
             // When
@@ -239,7 +239,7 @@ public void GuestFeedbackComplete_ShouldCallSaveUserFeedbackAndRenderGuestFeedba
         public void GuestFeedbackComplete_ShouldNotCallSaveUserFeedbackIfNoFeedbackProvided()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.GuestFeedbackComplete(userFeedbackViewModel) as RedirectToActionResult;
@@ -269,7 +269,7 @@ public void UserFeedbackReturnToUrl_ShouldRedirectToSourceUrl()
         public void StartUserFeedbackSession_ShouldSetTempDataAndRedirectToUserFeedbackTaskAchieved()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.StartUserFeedbackSession(userFeedbackViewModel) as RedirectToActionResult;
@@ -285,7 +285,7 @@ public void StartUserFeedbackSession_ShouldSetTempDataAndRedirectToUserFeedbackT
         public void UserFeedbackTaskAchieved_ShouldRenderUserFeedbackTaskAchievedView()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackTaskAchieved(userFeedbackViewModel) as ViewResult;
@@ -299,7 +299,7 @@ public void UserFeedbackTaskAchieved_ShouldRenderUserFeedbackTaskAchievedView()
         public void UserFeedbackTaskAttempted_ShouldRenderUserFeedbackTaskAttemptedView()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackTaskAttempted(userFeedbackViewModel) as ViewResult;
@@ -313,7 +313,7 @@ public void UserFeedbackTaskAttempted_ShouldRenderUserFeedbackTaskAttemptedView(
         public void UserFeedbackTaskDifficulty_ShouldRenderUserFeedbackTaskDifficultyView()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackTaskDifficulty(userFeedbackViewModel) as ViewResult;
@@ -327,7 +327,7 @@ public void UserFeedbackTaskDifficulty_ShouldRenderUserFeedbackTaskDifficultyVie
         public void GuestFeedbackStart_ShouldRenderGuestFeedbackStartView()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.GuestFeedbackStart(userFeedbackViewModel) as ViewResult;
@@ -341,7 +341,7 @@ public void GuestFeedbackStart_ShouldRenderGuestFeedbackStartView()
         public void UserFeedbackComplete_ShouldRenderUserFeedbackCompleteView()
         {
             // Given
-            var userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            var userFeedbackViewModel = new UserFeedbackViewModel();
 
             // When
             var result = _userFeedbackController.UserFeedbackComplete(userFeedbackViewModel) as ViewResult;

DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs

@@ -29,7 +29,7 @@ IMultiPageFormService multiPageFormService
         {
             this._userFeedbackDataService = userFeedbackDataService;
             this._multiPageFormService = multiPageFormService;
-            this._userFeedbackViewModel = new UserFeedbackViewModel(config.GetUserResearchUrl());
+            this._userFeedbackViewModel = new UserFeedbackViewModel();
             this.config = config; 
         }
 
@@ -40,7 +40,7 @@ public IActionResult Index(string sourceUrl, string sourcePageTitle)
 
             _multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddUserFeedback, TempData);
 
-            _userFeedbackViewModel = new(config.GetUserResearchUrl())
+            _userFeedbackViewModel = new()
             {
                 UserId = User.GetUserId(),
                 UserRoles = DeriveUserRoles(),

DigitalLearningSolutions.Web/ViewModels/UserFeedback/UserFeedbackViewModel.cs

@@ -2,6 +2,7 @@
 {
     public class UserFeedbackViewModel
     {
+        public UserFeedbackViewModel() { }
         public UserFeedbackViewModel(string userResearchUrl)
         {
             UserId = null;