From: Roland Häder <roland@mxchange.org>
Date: Fri, 22 Apr 2016 07:52:57 +0000 (+0200)
Subject: Continued a bit:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c5bee1252c69d24b22fd3e23daff20667857a3e;p=pizzaservice-war.git

Continued a bit:
- added observer method afterAdminUpdatedContactDataEvent() to update contact and email lists
- no contact list in admin controller as the same exists in general controller
- imports cleaned up

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
index 8e479c2c..d9857c7a 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
@@ -239,11 +239,8 @@ public class PizzaAdminContactWebRequestBean implements PizzaAdminContactWebRequ
 		// Call EJB for updating contact data
 		Contact updatedContact = this.contactBean.updateContactPersonalData(contact);
 
-		// Update list
-		this.updateList(updatedContact);
-
 		// Fire event
-		this.updatedContactDataEvent.fire(new AdminContactUpdatedEvent(updatedContact));
+		this.updatedContactEvent.fire(new AdminContactUpdatedEvent(updatedContact));
 
 		// Return to contact list (for now)
 		return "admin_list_contact"; //NOI18N
diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
index 5e4338f1..2ca7817a 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
@@ -34,6 +34,7 @@ import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.ContactSessionBeanRemote;
 import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber;
@@ -209,6 +210,52 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl
 		this.emailAddressList.add(contactEmailAddress);
 	}
 
+	@Override
+	public void afterAdminUpdatedContactDataEvent (@Observes final AdminUpdatedContactEvent event) {
+		// Trace message
+		System.out.println(MessageFormat.format("ContactWebBean:afterAdminUpdatedContactDataEvent: event={0} - CALLED!", event)); //NOI18N
+
+		// event should not be null
+		if (null == event) {
+			// Throw NPE
+			throw new NullPointerException("event is null"); //NOI18N
+		} else if (event.getUpdatedContact()== null) {
+			// Throw NPE again
+			throw new NullPointerException("event.user is null"); //NOI18N
+		} else if (event.getUpdatedContact().getContactId() == null) {
+			// userId is null
+			throw new NullPointerException("event.user.userId is null"); //NOI18N
+		} else if (event.getUpdatedContact().getContactId() < 1) {
+			// Not avalid id
+			throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getUpdatedContact(), event.getUpdatedContact().getContactId())); //NOI18N
+		}
+
+		// Get iterator from list
+		Iterator<Contact> iterator = this.contactList.iterator();
+
+		// "Walk" through all entries
+		while (iterator.hasNext()) {
+			// Get next element
+			Contact next = iterator.next();
+
+			// Is id number the same?
+			if (Objects.equals(event.getUpdatedContact().getContactId(), next.getContactId())) {
+				// Found entry, so remove it and abort
+				this.contactList.remove(next);
+
+				// Remove also email from list
+				this.emailAddressList.remove(next.getContactEmailAddress());
+				break;
+			}
+		}
+
+		// Add contact to list
+		this.contactList.add(event.getUpdatedContact());
+
+		// Add email address to list
+		this.emailAddressList.add(event.getUpdatedContact().getContactEmailAddress());
+	}
+
 	@Override
 	public void afterRegistrationEvent (final @Observes UserRegisteredEvent event) {
 		// Trace message
@@ -393,6 +440,7 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl
 
 		// Trace message
 		//this.getLogger().logTrace(MessageFormat.format("createContactInstance: localContact={0} - EXIT!", localContact));
+
 		// Return it
 		return localContact;
 	}
diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java
index 44aa596f..6316691d 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java
@@ -20,6 +20,7 @@ import java.io.Serializable;
 import java.util.Date;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
@@ -76,6 +77,13 @@ public interface PizzaContactWebSessionController extends Serializable {
 	 */
 	void afterRegistrationEvent (final UserRegisteredEvent event);
 
+	/**
+	 * Event observer for updated contact data by admins
+	 * <p>
+	 * @param event Updated contact data event
+	 */
+	void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event);
+
 	/**
 	 * Event observer for logged-in user
 	 * <p>