diff --git a/src/main/kotlin/uk/gov/communities/prsdb/webapp/constants/PRSDWebAppConstants.kt b/src/main/kotlin/uk/gov/communities/prsdb/webapp/constants/PRSDWebAppConstants.kt deleted file mode 100644 index 7bf211a44..000000000 --- a/src/main/kotlin/uk/gov/communities/prsdb/webapp/constants/PRSDWebAppConstants.kt +++ /dev/null @@ -1,16 +0,0 @@ -package uk.gov.communities.prsdb.webapp.constants - -import org.springframework.web.servlet.support.ServletUriComponentsBuilder - -// TODO PRSD-670: Set to landlord dashboard -val LANDLORD_DASHBOARD_URL = ServletUriComponentsBuilder.fromCurrentContextPath().build().toUriString() - -const val LOCAL_AUTHORITY_PATH_SEGMENT = "local-authority" - -const val LANDLORD_PATH_SEGMENT = "landlord" - -const val PROPERTY_PATH_SEGMENT = "property" - -const val DASHBOARD_PATH_SEGMENT = "dashboard" - -const val SEARCH_PATH_SEGMENT = "search" diff --git a/src/main/kotlin/uk/gov/communities/prsdb/webapp/constants/UrlSegmentConstants.kt b/src/main/kotlin/uk/gov/communities/prsdb/webapp/constants/UrlSegmentConstants.kt index 34ab2ed7b..cde447f6d 100644 --- a/src/main/kotlin/uk/gov/communities/prsdb/webapp/constants/UrlSegmentConstants.kt +++ b/src/main/kotlin/uk/gov/communities/prsdb/webapp/constants/UrlSegmentConstants.kt @@ -2,4 +2,12 @@ package uk.gov.communities.prsdb.webapp.constants const val UPDATE_PATH_SEGMENT = "update" const val DETAILS_PATH_SEGMENT = "details" -const val LANDLORD_DETAILS_SEGMENT = "landlord-details" +const val LANDLORD_DETAILS_PATH_SEGMENT = "landlord-details" +const val LOCAL_AUTHORITY_PATH_SEGMENT = "local-authority" +const val LANDLORD_PATH_SEGMENT = "landlord" +const val PROPERTY_PATH_SEGMENT = "property" +const val DASHBOARD_PATH_SEGMENT = "dashboard" +const val SEARCH_PATH_SEGMENT = "search" + +// TODO PRSD-670: Set to landlord dashboard +val LANDLORD_DASHBOARD_URL = "/$LANDLORD_PATH_SEGMENT/$DASHBOARD_PATH_SEGMENT" diff --git a/src/main/kotlin/uk/gov/communities/prsdb/webapp/controllers/LandlordDetailsController.kt b/src/main/kotlin/uk/gov/communities/prsdb/webapp/controllers/LandlordDetailsController.kt index 0c09ae32e..d7ba9c329 100644 --- a/src/main/kotlin/uk/gov/communities/prsdb/webapp/controllers/LandlordDetailsController.kt +++ b/src/main/kotlin/uk/gov/communities/prsdb/webapp/controllers/LandlordDetailsController.kt @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.server.ResponseStatusException import uk.gov.communities.prsdb.webapp.constants.DETAILS_PATH_SEGMENT -import uk.gov.communities.prsdb.webapp.constants.LANDLORD_DETAILS_SEGMENT +import uk.gov.communities.prsdb.webapp.constants.LANDLORD_DETAILS_PATH_SEGMENT import uk.gov.communities.prsdb.webapp.constants.UPDATE_PATH_SEGMENT import uk.gov.communities.prsdb.webapp.exceptions.PrsdbWebException import uk.gov.communities.prsdb.webapp.forms.journeys.PageData @@ -140,7 +140,7 @@ class LandlordDetailsController( } companion object { - const val LANDLORD_DETAILS_ROUTE = "/$LANDLORD_DETAILS_SEGMENT" + const val LANDLORD_DETAILS_ROUTE = "/$LANDLORD_DETAILS_PATH_SEGMENT" const val UPDATE_ROUTE = "$LANDLORD_DETAILS_ROUTE/$UPDATE_PATH_SEGMENT" } }