RIA-7875 fix the sonar problem for the bug and code coverage

[DennisHoV1]

JIRA link (if applicable)

https://tools.hmcts.net/jira/browse/RIA-7875

Change description

• Fix the problem of sonar including bug, code coverage and duplication

Does this PR introduce a breaking change? (check one with "x")

[ ] Yes
[X] No