Duplicated Site friendlyUrl numbering not working

• Type: Bug
• Status: Closed
• Resolution: Fixed
• Affects Version/s: Master
• Fix Version/s: 7.1.X, Master
• Component/s: Sites Administration, Staging
• Labels:
  • 7.1-could
  • QA-AUTOMATION
• Fix Priority: 3
• Git Pull Request: https://github.com/brianchandotcom/liferay-portal/pull/60217
• QA Test Name:
  • LocalFile.StagingUsecaseWithRoles#StagingDemoLocalLive4
• QA Test Score: 5

Duplicated Site friendlyUrl is concatenating the new number instead of changing it.

Steps:

1. Add new blank site named 'FriendlyTest'.
2. Add new blank site named 'FriendlyTest+'.
3. Add new blank site named 'FriendlyTest++'.
4. Check the generated friendlyUrls.

Expected friendlyUrls:

• /friendlytest
• /friendlytest-1
• /friendlytest-2

Actual friendlyUrls:

• /friendlytest
• /friendlytest-1
• /friendlytest-1-2

Other method:

1. Add new blank site named 'StagingTest'.
2. Enable local staging.

Expected friendlyUrls:

• /stagingtest
• /stagingtest-staging

Actual friendlyUrls:

• /stagingtest
• /stagingtest-1-staging