LPD-51804 Generate new URL to view calendar booking

Author: carolmariaabb

modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/notification/NotificationTemplateContextFactory.java

@@ -28,6 +28,8 @@
 import com.liferay.portal.kernel.service.GroupLocalService;
 import com.liferay.portal.kernel.service.LayoutLocalService;
 import com.liferay.portal.kernel.service.ServiceContext;
+import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
+import com.liferay.portal.kernel.theme.ThemeDisplay;
 import com.liferay.portal.kernel.util.CalendarUtil;
 import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil;
 import com.liferay.portal.kernel.util.FileUtil;
@@ -217,6 +219,21 @@ private static String _getCalendarBookingURL(
 			User user)
 		throws Exception {
 
+		ServiceContext serviceContext =
+			ServiceContextThreadLocal.getServiceContext();
+
+		if (serviceContext != null) {
+			ThemeDisplay themeDisplay = serviceContext.getThemeDisplay();
+
+			if (themeDisplay != null) {
+				return StringBundler.concat(
+					themeDisplay.getPortalURL(),
+					themeDisplay.getPathFriendlyURLPublic(),
+					"/calendar/shared/-/calendar/",
+					calendarBooking.getCalendarBookingId());
+			}
+		}
+
 		String url = layoutURL;
 
 		if (layoutURL == null) {

modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/info/item/provider/CalendarBookingInfoItemFieldValuesProvider.java

@@ -18,6 +18,7 @@
 import com.liferay.info.item.provider.InfoItemFieldValuesProvider;
 import com.liferay.info.localized.InfoLocalizedValue;
 import com.liferay.layout.page.template.info.item.provider.DisplayPageInfoItemFieldSetProvider;
+import com.liferay.petra.string.StringBundler;
 import com.liferay.petra.string.StringPool;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.language.Language;
@@ -92,6 +93,16 @@ calendarBooking, _getThemeDisplay())
 	 * User, long)}
 	 */
 	protected String getCalendarBookingURL(CalendarBooking calendarBooking) {
+		ThemeDisplay themeDisplay = _getThemeDisplay();
+
+		if (themeDisplay != null) {
+			return StringBundler.concat(
+				themeDisplay.getPortalURL(),
+				themeDisplay.getPathFriendlyURLPublic(),
+				"/calendar/shared/-/calendar/",
+				calendarBooking.getCalendarBookingId());
+		}
+
 		try {
 			Company company = _companyLocalService.getCompany(
 				calendarBooking.getCompanyId());