From 7e5ad3519764af5829470ca24c8bfb9bce5fc2c6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 20 May 2020 18:42:59 +0200
Subject: [PATCH] Please cherry-pick: - renamed userCreated -> userEntryCreated
 - renamed userUpdated -> userEntryUpdated - updateUserData() may throw a
 checked UserNotFoundException, let's catch it   here and throw a
 FacesException with it as cause - same with confirmAccount()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 lib/jbonuscard-core.jar                         | Bin 0 -> 10916 bytes
 .../user/FinancialsAdminUserWebRequestBean.java |  12 ++++++++++--
 ...inancialsConfirmationLinkWebRequestBean.java |   3 ++-
 .../admin/user/admin_show_user_data.tpl         |   8 ++++----
 .../admin/user/admin_show_user_data_mini.tpl    |   4 ++--
 web/admin/user/admin_user_activity_log.xhtml    |   2 +-
 web/admin/user/admin_user_list.xhtml            |   9 ++++-----
 web/guest/user/user_list.xhtml                  |   2 +-
 8 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 lib/jbonuscard-core.jar

diff --git a/lib/jbonuscard-core.jar b/lib/jbonuscard-core.jar
new file mode 100644
index 0000000000000000000000000000000000000000..2aa8f1a660334f7e17265433ecb5be4f04973100
GIT binary patch
literal 10916
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
Z<FcLZKdXwbzwn&~{+&uD+Pg|h{{*zOI!XWl

literal 0
HcmV?d00001

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java
index f8cbb418..37af0ee8 100644
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java
@@ -431,8 +431,16 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsBean implem
 			this.getUser().setUserEncryptedPassword(encryptedPassword);
 		}
 
-		// Call EJB for updating user data
-		final User updatedUser = this.userBean.updateUserData(this.getUser());
+		// Init updated User instance
+		final User updatedUser;
+
+		try {
+			// Call EJB for updating user data
+			updatedUser = this.userBean.updateUserData(this.getUser());
+		} catch (final UserNotFoundException ex) {
+			// Throw as cause
+			throw new FacesException(ex);
+		}
 
 		// Fire event
 		this.updatedUserDataEvent.fire(new AdminPostUserDataUpdatedEvent(updatedUser));
diff --git a/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java
index ab615016..0025e5b0 100644
--- a/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java
@@ -32,6 +32,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsBean;
 import org.mxchange.jfinancials.beans.user.list.FinancialsUserListWebViewController;
 import org.mxchange.jusercore.events.user.created.CreatedUserEvent;
 import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent;
+import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.exceptions.UserStatusConfirmedException;
 import org.mxchange.jusercore.exceptions.UserStatusLockedException;
 import org.mxchange.jusercore.model.user.User;
@@ -183,7 +184,7 @@ public class FinancialsConfirmationLinkWebRequestBean extends BaseFinancialsBean
 
 			// Confirm account
 			updatedUser = this.userBean.confirmAccount(user, baseUrl);
-		} catch (final UserStatusConfirmedException | UserStatusLockedException ex) {
+		} catch (final UserStatusConfirmedException | UserStatusLockedException | UserNotFoundException ex) {
 			// Something unexpected happened
 			throw new FacesException(MessageFormat.format("Cannot confirm user account {0}", user.getUserName()), ex); //NOI18N
 		}
diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
index 28f60d9e..e114c2d9 100644
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
@@ -37,17 +37,17 @@
 		</ui:fragment>
 
 		<p:column>
-			<p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
+			<p:outputLabel for="userEntryCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
-			<h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated}">
+			<h:outputText id="userEntryCreated" styleClass="table-data-field" value="#{beanHelper.user.userEntryCreated}">
 				<f:convertDateTime type="both" />
 			</h:outputText>
 		</p:column>
 
 		<p:column>
-			<p:outputLabel for="userUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
+			<p:outputLabel for="userEntryUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
 
-			<h:outputText id="userUpdated" styleClass="table-data-field" value="#{beanHelper.user.userUpdated}">
+			<h:outputText id="userEntryUpdated" styleClass="table-data-field" value="#{beanHelper.user.userEntryUpdated}">
 				<f:convertDateTime type="both" />
 			</h:outputText>
 		</p:column>
diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
index 23db73bd..b6a0db4d 100644
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
@@ -46,9 +46,9 @@
 		</ui:fragment>
 
 		<p:column>
-			<p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
+			<p:outputLabel for="userEntryCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
-			<h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated}">
+			<h:outputText id="userEntryCreated" styleClass="table-data-field" value="#{beanHelper.user.userEntryCreated}">
 				<f:convertDateTime type="both" />
 			</h:outputText>
 		</p:column>
diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 63b7cde7..e0ec4c6d 100644
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -117,7 +117,7 @@
 					<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TIMESTAMP}" />
 				</f:facet>
 
-				<h:outputText id="userCreated" value="#{userActivity.activityTimestamp}">
+				<h:outputText value="#{userActivity.activityTimestamp}">
 					<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 				</h:outputText>
 			</p:column>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index a3fed78d..425ae0d4 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -241,20 +241,20 @@
 
 				<p:column
 					headerText="#{msg.ENTRY_CREATED_HEADER}"
-					sortBy="#{user.userCreated}"
+					sortBy="#{user.userEntryCreated}"
 					filterable="false"
 					>
-					<h:outputText value="#{user.userCreated}">
+					<h:outputText value="#{user.userEntryCreated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
 
 				<p:column
 					headerText="#{msg.ENTRY_UPDATED_HEADER}"
-					sortBy="#{user.userUpdated}"
+					sortBy="#{user.userEntryUpdated}"
 					filterable="false"
 					>
-					<h:outputText value="#{user.userUpdated}">
+					<h:outputText value="#{user.userEntryUpdated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
@@ -358,7 +358,6 @@
 
 						<p:commandButton
 							type="submit"
-							id="submit_add_user"
 							value="#{msg.BUTTON_ADMIN_ADD_USER}"
 							action="#{adminUserController.addUser()}"
 							update="form-list-users:userList"
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index e602e32e..43392523 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -56,7 +56,7 @@
 							<h:outputText value="#{msg.USER_CREATED}" />
 						</f:facet>
 
-						<h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
+						<h:outputFormat id="userEntryCreated" value="#{user.userEntryCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
 					</p:column>
 				</ui:fragment>
 			</p:dataTable>
-- 
2.39.5