From 27d841962d56a3eb4efef4acd90a0aee6b6b32ca Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 6 Jun 2017 23:01:04 +0200
Subject: [PATCH] let's keep controller for income and expenses separate and
 not have one "super" controller for all admin/user-financial stuff
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 ...lsAdminFinancialIncomeWebRequestBean.java} | 26 ++++++++++++-------
 ...nFinancialIncomeWebRequestController.java} |  6 ++---
 .../login_financials_add_income.xhtml         | 10 +++----
 .../login_financials_overview.xhtml           |  6 ++---
 4 files changed, 28 insertions(+), 20 deletions(-)
 rename src/java/org/mxchange/jfinancials/beans/financial/{FinancialsAdminFinancialWebRequestBean.java => income/FinancialsAdminFinancialIncomeWebRequestBean.java} (81%)
 rename src/java/org/mxchange/jfinancials/beans/financial/{FinancialsAdminFinancialWebRequestController.java => income/FinancialsAdminFinancialIncomeWebRequestController.java} (90%)

diff --git a/src/java/org/mxchange/jfinancials/beans/financial/FinancialsAdminFinancialWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsAdminFinancialIncomeWebRequestBean.java
similarity index 81%
rename from src/java/org/mxchange/jfinancials/beans/financial/FinancialsAdminFinancialWebRequestBean.java
rename to src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsAdminFinancialIncomeWebRequestBean.java
index 5907473d..dd921455 100644
--- a/src/java/org/mxchange/jfinancials/beans/financial/FinancialsAdminFinancialWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsAdminFinancialIncomeWebRequestBean.java
@@ -14,9 +14,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.mxchange.jfinancials.beans.financial;
+package org.mxchange.jfinancials.beans.financial.income;
 
-import org.mxchange.jfinancials.FinancialSessionBeanRemote;
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.List;
@@ -30,18 +29,19 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.login.user.FinancialsUserLoginWebSessionController;
+import org.mxchange.jfinancials.financial.income.FinancialIncomeSessionBeanRemote;
 import org.mxchange.jfinancials.model.income.BillableIncome;
 import org.mxchange.jfinancials.model.income.FinancialIncome;
 import org.mxchange.jfinancials.model.income.interval.FinancialInterval;
 
 /**
- * An administrative user bean (controller)
+ * An administrative financial income bean (controller)
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Named ("financialController")
+@Named ("financialIncomeController")
 @RequestScoped
-public class FinancialsAdminFinancialWebRequestBean extends BaseFinancialsController implements FinancialsAdminFinancialWebRequestController {
+public class FinancialsAdminFinancialIncomeWebRequestBean extends BaseFinancialsController implements FinancialsAdminFinancialIncomeWebRequestController {
 
 	/**
 	 * Serial number
@@ -51,7 +51,7 @@ public class FinancialsAdminFinancialWebRequestBean extends BaseFinancialsContro
 	/**
 	 * Remote contact bean
 	 */
-	private FinancialSessionBeanRemote financialBean;
+	private FinancialIncomeSessionBeanRemote financialBean;
 
 	/**
 	 * Income interval
@@ -77,14 +77,22 @@ public class FinancialsAdminFinancialWebRequestBean extends BaseFinancialsContro
 	/**
 	 * Constructor
 	 */
-	public FinancialsAdminFinancialWebRequestBean () {
+	public FinancialsAdminFinancialIncomeWebRequestBean () {
 		// Call super constructor
 		super();
 	}
 
+	/**
+	 * Adds income data by calling proper business method of the EJB.
+	 * <p>
+	 * @return Redirect outcome
+	 */
 	public String addFinancialIncome () {
 		// Is all data valid?
-		if (null == this.getIncomeInterval()) {
+		if (!this.userLoginController.isUserLoggedIn()) {
+			// Not logged-in
+			throw new IllegalStateException("User is not logged-in"); //NOI18N
+		} else if (null == this.getIncomeInterval()) {
 			// Throw NPE
 			throw new NullPointerException("incomeInterval is null"); //NOI18N
 		} else if (null == this.getIncomeSingleAmount()) {
@@ -162,7 +170,7 @@ public class FinancialsAdminFinancialWebRequestBean extends BaseFinancialsContro
 			Context context = new InitialContext();
 
 			// Try to lookup
-			this.financialBean = (FinancialSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/financial!org.mxchange.jfinancials.FinancialSessionBeanRemote"); //NOI18N
+			this.financialBean = (FinancialIncomeSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/financial!org.mxchange.jfinancials.financial.income.FinancialIncomeSessionBeanRemote"); //NOI18N
 		} catch (final NamingException e) {
 			// Throw again
 			throw new FaceletException(e);
diff --git a/src/java/org/mxchange/jfinancials/beans/financial/FinancialsAdminFinancialWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsAdminFinancialIncomeWebRequestController.java
similarity index 90%
rename from src/java/org/mxchange/jfinancials/beans/financial/FinancialsAdminFinancialWebRequestController.java
rename to src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsAdminFinancialIncomeWebRequestController.java
index df46fe68..85b993d7 100644
--- a/src/java/org/mxchange/jfinancials/beans/financial/FinancialsAdminFinancialWebRequestController.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsAdminFinancialIncomeWebRequestController.java
@@ -14,18 +14,18 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.mxchange.jfinancials.beans.financial;
+package org.mxchange.jfinancials.beans.financial.income;
 
 import java.io.Serializable;
 import java.util.List;
 import org.mxchange.jfinancials.model.income.interval.FinancialInterval;
 
 /**
- * An administrative interface for user beans
+ * An administrative interface for financial income beans
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-public interface FinancialsAdminFinancialWebRequestController extends Serializable {
+public interface FinancialsAdminFinancialIncomeWebRequestController extends Serializable {
 
 	/**
 	 * Getter for income single amount
diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml
index 274a26b3..b789487e 100644
--- a/web/user/financials/login_financials_add_income.xhtml
+++ b/web/user/financials/login_financials_add_income.xhtml
@@ -28,7 +28,7 @@
 						</div>
 
 						<div class="table_right_medium">
-							<h:inputText styleClass="input" id="incomeTitle" size="2" maxlength="10" value="#{financialController.incomeTitle}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_TITLE_REQUIRED}">
+							<h:inputText styleClass="input" id="incomeTitle" size="2" maxlength="10" value="#{financialIncomeController.incomeTitle}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_TITLE_REQUIRED}">
 								<f:validator validatorId="IncomeTitleValidator" />
 							</h:inputText>
 						</div>
@@ -42,9 +42,9 @@
 						</div>
 
 						<div class="table_right_medium">
-							<h:selectOneMenu styleClass="select" id="incomeInterval" value="#{financialController.incomeInterval}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_REQUIRED}">
+							<h:selectOneMenu styleClass="select" id="incomeInterval" value="#{financialIncomeController.incomeInterval}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_REQUIRED}">
 								<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
-								<f:selectItems value="#{financialController.allIncomeIntervals}" var="incomeInterval" itemValue="#{incomeInterval}" itemLabel="#{msg[incomeInterval.concat('_INTERVAL')]}" />
+								<f:selectItems value="#{financialIncomeController.allIncomeIntervals}" var="incomeInterval" itemValue="#{incomeInterval}" itemLabel="#{msg[incomeInterval.concat('_INTERVAL')]}" />
 							</h:selectOneMenu>
 						</div>
 
@@ -57,7 +57,7 @@
 						</div>
 
 						<div class="table_right_medium">
-							<h:inputText styleClass="input" id="incomeSingleValue" size="5" maxlength="20" value="#{financialController.incomeSingleAmount}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED}">
+							<h:inputText styleClass="input" id="incomeSingleValue" size="5" maxlength="20" value="#{financialIncomeController.incomeSingleAmount}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED}">
 								<f:validator validatorId="CurrencyAmountValidator" />
 							</h:inputText>
 						</div>
@@ -68,7 +68,7 @@
 					<div class="table_footer">
 						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-						<h:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{financialController.addFinancialIncome()}" value="#{msg.BUTTON_LOGIN_FINCIAL_ADD_INCOME}" />
+						<h:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{financialIncomeController.addFinancialIncome()}" value="#{msg.BUTTON_LOGIN_FINCIAL_ADD_INCOME}" />
 					</div>
 				</h:panelGroup>
 			</h:form>
diff --git a/web/user/financials/login_financials_overview.xhtml b/web/user/financials/login_financials_overview.xhtml
index 5a5fae09..15aaec65 100644
--- a/web/user/financials/login_financials_overview.xhtml
+++ b/web/user/financials/login_financials_overview.xhtml
@@ -25,19 +25,19 @@
 					<h:column>
 						<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_RECEIPTS}" />
 
-						<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_receipts" value="#{financialController.receipts.size()}" />
+						<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_receipts" value="#{financialIncomeController.receipts.size()}" />
 					</h:column>
 
 					<h:column>
 						<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_OTHER_EXPENSES}" />
 
-						<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_other_expenses" value="#{financialController.income.size()}" />
+						<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_other_expenses" value="#{financialIncomeController.otherExpenses.size()}" />
 					</h:column>
 
 					<h:column>
 						<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_INCOME}" />
 
-						<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_income" value="#{financialController.income.size()}" />
+						<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_income" value="#{financialIncomeController.income.size()}" />
 					</h:column>
 				</h:panelGrid>
 			</h:panelGroup>
-- 
2.39.5