SAN-140 STOP screen - service is down (unscheduled) #196

klai-ch · 2025-01-09T12:58:48Z

Set up page for STOP screen - service is down (unscheduled)

…duled

…duled # Conflicts: # src/main/java/uk/gov/companieshouse/web/pps/controller/pps/ConfirmationController.java # src/test/java/uk/gov/companieshouse/web/pps/controller/pps/ConfirmationControllerTest.java

…duled # Conflicts: # src/main/java/uk/gov/companieshouse/web/pps/controller/pps/BankTransferSanctionsDetailsController.java # src/test/java/uk/gov/companieshouse/web/pps/controller/pps/BankTransferSanctionsDetailsControllerTest.java

ch-code-analysis · 2025-01-09T13:06:37Z

CI: No security warnings found

acallaghan-ch · 2025-01-09T13:21:04Z

...main/java/uk/gov/companieshouse/web/pps/controller/pps/UnscheduledServiceDownController.java

+    public String getUnscheduledServiceDown(Model model) {
+
+        String loginEmail = penaltyUtils.getLoginEmail(sessionService);
+        if (loginEmail != null && !loginEmail.isEmpty()) {


You could use apache.commons here and just do:
StringUtils.isEmpty(loginEmail)

This part should be changed/removed now after SAN-166 changes

acallaghan-ch · 2025-01-09T13:21:31Z

...main/java/uk/gov/companieshouse/web/pps/controller/pps/UnscheduledServiceDownController.java

+
+    @GetMapping
+    public String getUnscheduledServiceDown(Model model) {
+


Remove empty line

Updated from review

acallaghan-ch · 2025-01-09T13:29:12Z

src/test/java/uk/gov/companieshouse/web/pps/controller/pps/ConfirmationControllerTest.java

    private static final String COMPANY_NUMBER = "12345678";
    private static final String PENALTY_REF = "EXAMPLE12345";
    private static final String PAYABLE_REF = "PR_123456";

    private static final String VIEW_CONFIRMATION_PATH = "/late-filing-penalty/company/" + COMPANY_NUMBER + "/penalty/" + PENALTY_REF + "/payable/" + PAYABLE_REF + "/confirmation";

    private static final String RESUME_URL_PATH = "redirect:/late-filing-penalty/company/" + COMPANY_NUMBER + "/penalty/" + PENALTY_REF + "/view-penalties";
+    private static final String UNSCHEDULED_SERVICE_DOWN_PATH = "/late-filing-penalty/unscheduled-service-down";

    private static final String CONFIRMATION_VIEW = "pps/confirmationPage";
    private static final String ERROR_VIEW = "error";


Remove unused variable 'ERROR_VIEW'
Also, if you don't mind, could you remove it from 'BankTransferSanctionsDetailsControllerTest.java' too? I know you didn't touch that file but it would be great to clean that up too.

Updated from review

acallaghan-ch · 2025-01-09T13:33:58Z

src/test/java/uk/gov/companieshouse/web/pps/controller/pps/SignOutControllerTest.java

@@ -64,6 +69,7 @@ class SignOutControllerTest {
    private static final String PREVIOUS_PATH = "/late-filing-penalty/enter-details";


Remove unused variables line 62:
MOCK_CONTROLLER_PATH = UrlBasedViewResolver.REDIRECT_URL_PREFIX + "mockControllerPath";
HOME = "/late-filing-penalty/";
ERROR_VIEW = "error";
Can you also check the formatting of this file, there's a load of extra line where they are not needed throughout the file.

Removed from the file and some of the empty lines also

acallaghan-ch · 2025-01-09T13:34:28Z

src/test/java/uk/gov/companieshouse/web/pps/controller/pps/StartControllerTest.java

@@ -59,6 +64,7 @@ void setup() {
    private static final String START_PATH = "/late-filing-penalty";
    private static final String START_PATH_PARAM = "/late-filing-penalty?start=0";
    private static final String MOCK_CONTROLLER_PATH = UrlBasedViewResolver.REDIRECT_URL_PREFIX + "mockControllerPath";
+    private static final String UNSCHEDULED_SERVICE_DOWN_PATH = "/late-filing-penalty/unscheduled-service-down";

    private static final String PPS_START_VIEW = "pps/home";
    private static final String ERROR_VIEW = "error";


Remove unused variable

Updated from review

acallaghan-ch · 2025-01-09T13:35:04Z

src/test/java/uk/gov/companieshouse/web/pps/controller/pps/ViewPenaltiesControllerTest.java

    @InjectMocks
    private ViewPenaltiesController controller;

    private static final String COMPANY_NUMBER = "12345678";
    private static final String PENALTY_NUMBER = "44444444";

    private static final String VIEW_PENALTIES_PATH = "/late-filing-penalty/company/" + COMPANY_NUMBER + "/penalty/" + PENALTY_NUMBER + "/view-penalties";
+    private static final String UNSCHEDULED_SERVICE_DOWN_PATH = "/late-filing-penalty/unscheduled-service-down";

    private static final String ENTER_PPS_DETAILS_VIEW = "pps/viewPenalties";
    private static final String ERROR_VIEW = "error";


Remove unused variable

Updated from review

acallaghan-ch · 2025-01-09T13:37:55Z

src/test/java/uk/gov/companieshouse/web/pps/controller/pps/EnterDetailsControllerTest.java

@@ -92,6 +97,8 @@ class EnterDetailsControllerTest {
    private static final String ALREADY_PAID_PATH =
            "redirect:/late-filing-penalty/company/" + VALID_COMPANY_NUMBER + "/penalty/" + VALID_PENALTY_REF + "/penalty-paid";

+    private static final String UNSCHEDULED_SERVICE_DOWN_PATH = "/late-filing-penalty/unscheduled-service-down";
+
    private static final String ERROR_PAGE = "error";


Remove unused variable

Updated from review

…duled # Conflicts: # src/main/java/uk/gov/companieshouse/web/pps/controller/pps/EnterDetailsController.java

ch-code-analysis · 2025-01-09T16:00:40Z

CI: No security warnings found

ch-code-analysis · 2025-01-09T16:26:27Z

CI: No security warnings found

klai-ch · 2025-01-09T16:30:37Z

Change for this ticket, adding a unscheduled down page
Change all the error view page to the new unscheduled down page

ch-code-analysis · 2025-01-10T12:23:40Z

CI: No security warnings found

…duled # Conflicts: # src/test/java/uk/gov/companieshouse/web/pps/controller/pps/EnterDetailsControllerTest.java # src/test/java/uk/gov/companieshouse/web/pps/controller/pps/PenaltyPaidControllerTest.java

ch-code-analysis · 2025-01-13T11:22:40Z

CI: No security warnings found

aonubeze-ch

I can see this expression in multiple locations: "REDIRECT_URL_PREFIX + penaltyConfigurationProperties.getUnscheduledServiceDownPath();" A method call, maybe?
I will go ahead and approve as it is just a nice to have.

ch-code-analysis · 2025-01-14T09:55:22Z

CI: No security warnings found

…duled

klai-ch · 2025-01-14T10:54:12Z

Moved "REDIRECT_URL_PREFIX + penaltyConfigurationProperties.getUnscheduledServiceDownPath();" into Util from comment

ch-code-analysis · 2025-01-14T10:57:26Z

CI: No security warnings found

klai-ch added 8 commits January 6, 2025 13:20

SAN-140 Set up page

6fcd17d

SAN-140 Update page showing

a1df16c

SAN-140 Update page showing

7bee2c2

Merge branch 'master' into feature/austin/SAN-140-Service-Down-Unsche…

3768d00

…duled

Merge branch 'master' into feature/austin/SAN-140-Service-Down-Unsche…

fc24a0a

…duled # Conflicts: # src/main/java/uk/gov/companieshouse/web/pps/controller/pps/ConfirmationController.java # src/test/java/uk/gov/companieshouse/web/pps/controller/pps/ConfirmationControllerTest.java

SAN-140 Update from merging

07051d9

SAN-140 Change error view to new redirection, update unit test

f929e55

acallaghan-ch requested changes Jan 9, 2025

View reviewed changes

klai-ch added 5 commits January 9, 2025 14:21

SAN-166 Update unit test

ca8d8b3

SAN-166 Update unit test

17195b5

SAN-140 Update from review

eef0a1c

Merge branch 'master' into feature/austin/SAN-140-Service-Down-Unsche…

58d67c7

…duled # Conflicts: # src/main/java/uk/gov/companieshouse/web/pps/controller/pps/EnterDetailsController.java

SAN-140 Update from review

c119e35

SAN-140 Update unit test

793ab03

klai-ch added 2 commits January 10, 2025 12:15

SAN-140 Add unit test

aa5671e

SAN-140 Add unit test

fffb8ae

klai-ch added 2 commits January 10, 2025 14:30

Merge branch 'master' into feature/austin/SAN-140-Service-Down-Unsche…

b0dbd4c

…duled # Conflicts: # src/test/java/uk/gov/companieshouse/web/pps/controller/pps/EnterDetailsControllerTest.java # src/test/java/uk/gov/companieshouse/web/pps/controller/pps/PenaltyPaidControllerTest.java

SAN-140 Add unit test

194d856

klai-ch requested a review from acallaghan-ch January 13, 2025 12:56

aonubeze-ch approved these changes Jan 13, 2025

View reviewed changes

acallaghan-ch approved these changes Jan 13, 2025

View reviewed changes

SAN-140 Move method into util

e935f46

klai-ch added 2 commits January 14, 2025 09:59

SAN-140 Update Unit test

b72f337

Merge branch 'master' into feature/austin/SAN-140-Service-Down-Unsche…

51afb05

…duled

dgordon-ch approved these changes Jan 14, 2025

View reviewed changes

klai-ch merged commit 5649735 into master Jan 14, 2025
1 check passed

klai-ch deleted the feature/austin/SAN-140-Service-Down-Unscheduled branch January 14, 2025 11:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SAN-140 STOP screen - service is down (unscheduled) #196

SAN-140 STOP screen - service is down (unscheduled) #196

klai-ch commented Jan 9, 2025

ch-code-analysis commented Jan 9, 2025

acallaghan-ch Jan 9, 2025

klai-ch Jan 13, 2025

acallaghan-ch Jan 9, 2025

klai-ch Jan 13, 2025

acallaghan-ch Jan 9, 2025

klai-ch Jan 13, 2025

acallaghan-ch Jan 9, 2025

klai-ch Jan 13, 2025

acallaghan-ch Jan 9, 2025

klai-ch Jan 13, 2025

acallaghan-ch Jan 9, 2025

klai-ch Jan 13, 2025

acallaghan-ch Jan 9, 2025

klai-ch Jan 13, 2025

ch-code-analysis commented Jan 9, 2025

ch-code-analysis commented Jan 9, 2025

klai-ch commented Jan 9, 2025

ch-code-analysis commented Jan 10, 2025

ch-code-analysis commented Jan 13, 2025

aonubeze-ch left a comment

ch-code-analysis commented Jan 14, 2025

klai-ch commented Jan 14, 2025

ch-code-analysis commented Jan 14, 2025


		@GetMapping
		public String getUnscheduledServiceDown(Model model) {

		@@ -64,6 +69,7 @@ class SignOutControllerTest {
		private static final String PREVIOUS_PATH = "/late-filing-penalty/enter-details";

SAN-140 STOP screen - service is down (unscheduled) #196

SAN-140 STOP screen - service is down (unscheduled) #196

Conversation

klai-ch commented Jan 9, 2025

ch-code-analysis commented Jan 9, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ch-code-analysis commented Jan 9, 2025

ch-code-analysis commented Jan 9, 2025

klai-ch commented Jan 9, 2025

ch-code-analysis commented Jan 10, 2025

ch-code-analysis commented Jan 13, 2025

aonubeze-ch left a comment

Choose a reason for hiding this comment

ch-code-analysis commented Jan 14, 2025

klai-ch commented Jan 14, 2025

ch-code-analysis commented Jan 14, 2025