DDLS-387 Pull the NDR report through to the reports page

api/app/tests/Behat/bootstrap/v2/Common/AuthTrait.php

@@ -552,4 +552,20 @@ private function getActiveClientIds(): void
             }
         }
     }
+
+    /**
+     * @Then I should see the NDR report on the reports page
+     */
+    public function theyShouldBeOnNDRReportPage(): void
+    {
+        $this->assertPageContainsText('New deputy report');
+    }
+
+    /**
+     * @Then I should not see the NDR report on the reports page
+     */
+    public function theyShouldNotBeOnNDRReportPage(): void
+    {
+        $this->assertPageNotContainsText('New deputy report');
+    }
 }

api/app/tests/Behat/bootstrap/v2/Common/IShouldBeOnFrontendTrait.php

@@ -148,14 +148,6 @@ public function iAmOnLayMainPage(): bool
         return $this->iAmOnPage('/client\/.*/');
     }
 
-    /**
-     * @Then I should be on the Ndr Lay homepage
-     */
-    public function iAmOnNdrLayMainPage(): bool
-    {
-        return $this->iAmOnPage('/ndr$/');
-    }
-
     /**
      * @Then I should be on the Lay reports overview page
      */

api/app/tests/Behat/bootstrap/v2/Common/UserExistsTrait.php

@@ -59,4 +59,32 @@ public function aProfessionalTeamDeputyExists()
 
         $this->interactingWithUserDetails = $this->profTeamDeputyNotStartedHealthWelfareDetails;
     }
+
+    /**
+     * @Given a Multi-client Lay Deputy exists and I select the non-primary user
+     *
+     * @throws BehatException
+     */
+    public function aMultiClientLayDeputyExists()
+    {
+        if (empty($this->layPfaHighNotStartedMultiClientDeputyNonPrimaryUser)) {
+            throw new BehatException('It looks like fixtures are not loaded - missing $layPfaHighNotStartedMultiClientDeputyNonPrimaryUser');
+        }
+
+        $this->interactingWithUserDetails = $this->layPfaHighNotStartedMultiClientDeputyNonPrimaryUser;
+    }
+
+    /**
+     * @Given a Multi-client Lay Deputy exists and I select the primary user with NDR
+     *
+     * @throws BehatException
+     */
+    public function aMultiClientLayDeputyExistsWithNDR()
+    {
+        if (empty($this->layPfaHighNotStartedMultiClientDeputyPrimaryUser)) {
+            throw new BehatException('It looks like fixtures are not loaded - missing $layPfaHighNotStartedMultiClientDeputyPrimaryUser');
+        }
+
+        $this->interactingWithUserDetails = $this->layPfaHighNotStartedMultiClientDeputyPrimaryUser;
+    }
 }

api/app/tests/Behat/bootstrap/v2/DeputyManagement/DeputyManagementTrait.php

@@ -189,4 +189,30 @@ public function iShouldNotBeAbleToAccessClientDetailsLink()
     {
         $this->assertElementNotOnPage('govuk-link behat-link-client-show');
     }
+
+    /**
+     * @Then /^I enable the NDR for this user$/
+     */
+    public function iShouldBeAbleToToggleNdrEnabled()
+    {
+        $this->iVisitAdminEditUserPageForInteractingWithUser();
+
+        $this->checkOption('admin_ndrEnabled');
+
+        $this->pressButton('Update user');
+        $this->em->clear();
+    }
+
+    /**
+     * @Then /^I disable the NDR for this user$/
+     */
+    public function iShouldBeDisableNdrEnabled()
+    {
+        $this->iVisitAdminEditUserPageForInteractingWithUser();
+
+        $this->uncheckOption('admin_ndrEnabled');
+
+        $this->pressButton('Update user');
+        $this->em->clear();
+    }
 }

api/app/tests/Behat/bootstrap/v2/Helpers/FixtureHelper.php

@@ -934,7 +934,7 @@ public function createLayNdrNotStarted(string $testRunId, ?string $caseNumber =
             null,
             $caseNumber,
             true,
-            false,
+            true,
             $deputyUid
         );
 

api/app/tests/Behat/features-v2/acl/login/login.feature

@@ -126,3 +126,23 @@ Feature: Users logging into the service
         And they discharge the deputy from "2" secondary client(s)
         Then a Lay Deputy tries to login with their "primary" email address
         Then they should be on the add your client page
+
+    @super-admin @lay-pfa-high-not-started-multi-client-deputy
+    Scenario: A user logs into the service with their primary account and ticks the NDR checkbox attached to non-primary account
+        Given a super admin user accesses the admin app
+        When a Multi-client Lay Deputy exists and I select the non-primary user
+        And I enable the NDR for this user
+        Then a Lay Deputy tries to login with their "primary" email address
+        When they choose their "non-primary" Client
+        Then they should be on the "non-primary" Client's dashboard
+        And I should see the NDR report on the reports page
+
+    @super-admin @lay-pfa-high-not-started-multi-client-deputy-with-ndr
+    Scenario: A user logs into the service with their primary account and unticks the NDR checkbox attached to primary account
+        Given a super admin user accesses the admin app
+        When a Multi-client Lay Deputy exists and I select the primary user with NDR
+        And I disable the NDR for this user
+        Then a Lay Deputy tries to login with their "primary" email address
+        When they choose their "primary" Client
+        Then they should be on the "primary" Client's dashboard
+        And I should not see the NDR report on the reports page

api/app/tests/Behat/features-v2/registration/activate.ndr.feature

@@ -12,7 +12,7 @@ Feature: Activate user account - Lay users (NDR)
         Then the partially registered users 'active flag' should 'not be' set
         And the partially registered users 'registration date' should 'not be' set
         When the user completes the final registration step
-        Then I should be on the Ndr Lay homepage
+        Then I should be on the Lay homepage
         And an admin user accesses the admin app
         Then the partially registered users 'active flag' should 'be' set
         And the partially registered users 'registration date' should 'be' set

client/app/src/Controller/ClientController.php

@@ -193,7 +193,7 @@ public function addAction(Request $request, Redirector $redirector, TranslatorIn
                 $this->clientApi->updateDeputy($response['id'], $deputyResponse['id']);
 
                 $url = $currentUser->isNdrEnabled()
-                    ? $this->generateUrl('ndr_index')
+                    ? $this->generateUrl('lay_home', ['clientId' => $response['id']])
                     : $this->generateUrl('report_create', ['clientId' => $response['id']]);
 
                 if ($currentUser->isNdrEnabled()) {

client/app/src/Controller/CoDeputyController.php

@@ -175,9 +175,7 @@ public function addAction(Request $request, Redirector $redirector)
         $invitedUser = new User();
         $form = $this->createForm(FormDir\CoDeputyInviteType::class, $invitedUser);
 
-        $backLink = $loggedInUser->isNdrEnabled() ?
-            $this->generateUrl('ndr_index')
-            : $this->generateUrl('lay_home', ['clientId' => $loggedInUser->getFirstClient()->getId()]);
+        $backLink = $this->generateUrl('lay_home', ['clientId' => $loggedInUser->getFirstClient()->getId()]);
 
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
@@ -229,9 +227,7 @@ public function resendActivationAction(Request $request, string $email)
 
         $form = $this->createForm(FormDir\CoDeputyInviteType::class, $existingCoDeputy);
 
-        $backLink = $loggedInUser->isNdrEnabled() ?
-            $this->generateUrl('ndr_index')
-            : $this->generateUrl('lay_home', ['clientId' => $loggedInUser->getFirstClient()->getId()]);
+        $backLink = $this->generateUrl('lay_home', ['clientId' => $loggedInUser->getFirstClient()->getId()]);
 
         $form->handleRequest($request);
 

client/app/src/Controller/Ndr/ActionController.php

@@ -4,6 +4,7 @@
 
 use App\Controller\AbstractController;
 use App\Form as FormDir;
+use App\Service\Client\Internal\ClientApi;
 use App\Service\Client\Internal\ReportApi;
 use App\Service\Client\RestClient;
 use App\Service\NdrStatusService;
@@ -36,39 +37,50 @@ class ActionController extends AbstractController
         'ndr-action-more-info',
     ];
 
+    /**
+     * @var ClientApi
+     */
+    private $clientApi;
+
     public function __construct(
         ReportApi $reportApi,
         RestClient $restClient,
-        StepRedirector $stepRedirector
+        StepRedirector $stepRedirector,
+        ClientApi $clientApi
     ) {
         $this->reportApi = $reportApi;
         $this->restClient = $restClient;
         $this->stepRedirector = $stepRedirector;
+        $this->clientApi = $clientApi;
     }
 
     /**
      * @Route("/ndr/{ndrId}/actions", name="ndr_actions")
-     * @Template("@App/Ndr/Action/start.html.twig")
      *
-     * @param Request $request
-     * @param $ndrId
+     * @Template("@App/Ndr/Action/start.html.twig")
      *
      * @return array|RedirectResponse
      */
     public function startAction($ndrId)
     {
+        /** @var User $user */
+        $user = $this->getUser();
+        $isMultiClientDeputy = 'ROLE_LAY_DEPUTY' == $user->getRoleName() ? $this->clientApi->checkDeputyHasMultiClients($user->getDeputyUid()) : null;
+
         $ndr = $this->reportApi->getNdrIfNotSubmitted($ndrId, self::$jmsGroups);
         if (NdrStatusService::STATE_NOT_STARTED != $ndr->getStatusService()->getActionsState()['state']) {
             return $this->redirectToRoute('ndr_actions_summary', ['ndrId' => $ndrId]);
         }
 
         return [
             'ndr' => $ndr,
+            'isMultiClientDeputy' => $isMultiClientDeputy,
         ];
     }
 
     /**
      * @Route("/ndr/{ndrId}/actions/step/{step}", name="ndr_actions_step")
+     *
      * @Template("@App/Ndr/Action/step.html.twig")
      */
     public function stepAction(Request $request, $ndrId, $step)
@@ -115,6 +127,7 @@ public function stepAction(Request $request, $ndrId, $step)
 
     /**
      * @Route("/ndr/{ndrId}/actions/summary", name="ndr_actions_summary")
+     *
      * @Template("@App/Ndr/Action/summary.html.twig")
      */
     public function summaryAction(Request $request, $ndrId)

client/app/src/Controller/Ndr/AssetController.php

@@ -5,6 +5,7 @@
 use App\Controller\AbstractController;
 use App\Entity as EntityDir;
 use App\Form as FormDir;
+use App\Service\Client\Internal\ClientApi;
 use App\Service\Client\Internal\ReportApi;
 use App\Service\Client\RestClient;
 use App\Service\NdrStatusService;
@@ -33,38 +34,50 @@ class AssetController extends AbstractController
      */
     private $stepRedirector;
 
+    /**
+     * @var ClientApi
+     */
+    private $clientApi;
+
     public function __construct(
         ReportApi $reportApi,
         RestClient $restClient,
-        StepRedirector $stepRedirector
+        StepRedirector $stepRedirector,
+        ClientApi $clientApi
     ) {
         $this->reportApi = $reportApi;
         $this->restClient = $restClient;
         $this->stepRedirector = $stepRedirector;
+        $this->clientApi = $clientApi;
     }
 
     /**
      * @Route("/ndr/{ndrId}/assets", name="ndr_assets")
-     * @Template("@App/Ndr/Asset/start.html.twig")
      *
-     * @param $ndrId
+     * @Template("@App/Ndr/Asset/start.html.twig")
      *
      * @return array|RedirectResponse
      */
     public function startAction($ndrId)
     {
+        /** @var User $user */
+        $user = $this->getUser();
+        $isMultiClientDeputy = 'ROLE_LAY_DEPUTY' == $user->getRoleName() ? $this->clientApi->checkDeputyHasMultiClients($user->getDeputyUid()) : null;
+
         $ndr = $this->reportApi->getNdrIfNotSubmitted($ndrId, self::$jmsGroups);
         if (NdrStatusService::STATE_NOT_STARTED != $ndr->getStatusService()->getAssetsState()['state']) {
             return $this->redirectToRoute('ndr_assets_summary', ['ndrId' => $ndrId]);
         }
 
         return [
             'ndr' => $ndr,
+            'isMultiClientDeputy' => $isMultiClientDeputy,
         ];
     }
 
     /**
      * @Route("/ndr/{ndrId}/assets/exist", name="ndr_assets_exist")
+     *
      * @Template("@App/Ndr/Asset/exist.html.twig")
      */
     public function existAction(Request $request, $ndrId)
@@ -85,7 +98,7 @@ public function existAction(Request $request, $ndrId)
             switch ($ndr->getNoAssetToAdd()) {
                 case 0: // yes
                     return $this->redirectToRoute('ndr_assets_type', ['ndrId' => $ndrId]);
-                case 1: //no
+                case 1: // no
                     $this->restClient->put('ndr/'.$ndrId, $ndr, ['noAssetsToAdd']);
 
                     return $this->redirectToRoute('ndr_assets_summary', ['ndrId' => $ndrId]);
@@ -106,6 +119,7 @@ public function existAction(Request $request, $ndrId)
 
     /**
      * @Route("/ndr/{ndrId}/assets/step-type", name="ndr_assets_type")
+     *
      * @Template("@App/Ndr/Asset/type.html.twig")
      */
     public function typeAction(Request $request, $ndrId)
@@ -135,6 +149,7 @@ public function typeAction(Request $request, $ndrId)
 
     /**
      * @Route("/ndr/{ndrId}/assets/other/{title}/add", name="ndr_asset_other_add")
+     *
      * @Template("@App/Ndr/Asset/Other/add.html.twig")
      */
     public function otherAddAction(Request $request, $ndrId, $title)
@@ -166,6 +181,7 @@ public function otherAddAction(Request $request, $ndrId, $title)
 
     /**
      * @Route("/ndr/{ndrId}/assets/other/edit/{assetId}", name="ndr_asset_other_edit")
+     *
      * @Template("@App/Ndr/Asset/Other/edit.html.twig")
      */
     public function otherEditAction(Request $request, $ndrId, $assetId = null)
@@ -199,6 +215,7 @@ public function otherEditAction(Request $request, $ndrId, $assetId = null)
 
     /**
      * @Route("/ndr/{ndrId}/assets/add_another", name="ndr_assets_add_another")
+     *
      * @Template("@App/Ndr/Asset/addAnother.html.twig")
      */
     public function addAnotherAction(Request $request, $ndrId)
@@ -225,6 +242,7 @@ public function addAnotherAction(Request $request, $ndrId)
 
     /**
      * @Route("/ndr/{ndrId}/assets/property/step{step}/{assetId}", name="ndr_assets_property_step", requirements={"step":"\d+"})
+     *
      * @Template("@App/Ndr/Asset/Property/step.html.twig")
      */
     public function propertyStepAction(Request $request, $ndrId, $step, $assetId = null)
@@ -346,9 +364,8 @@ public function propertyStepAction(Request $request, $ndrId, $step, $assetId = n
 
     /**
      * @Route("/ndr/{ndrId}/assets/summary", name="ndr_assets_summary")
-     * @Template("@App/Ndr/Asset/summary.html.twig")
      *
-     * @param $ndrId
+     * @Template("@App/Ndr/Asset/summary.html.twig")
      *
      * @return array|RedirectResponse
      */
@@ -366,6 +383,7 @@ public function summaryAction($ndrId)
 
     /**
      * @Route("/ndr/{ndrId}/assets/{assetId}/delete", name="ndr_asset_delete")
+     *
      * @Template("@App/Common/confirmDelete.html.twig")
      *
      * @return array|RedirectResponse