1 files changed, 48 insertions, 25 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateNaturalPersonBirthDateAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateNaturalPersonBirthDateAttributeBuilder.java
index e644f49e4..663e927fc 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateNaturalPersonBirthDateAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateNaturalPersonBirthDateAttributeBuilder.java
@@ -32,13 +32,13 @@ import org.w3c.dom.Element;
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.persondata._20020228_.PhysicalPersonType;
 import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
-import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.data.IAuthData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.InvalidDateFormatAttributeException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.NoMandateDataAttributeException;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 public class MandateNaturalPersonBirthDateAttributeBuilder implements IPVPAttributeBuilder {
 	
@@ -49,33 +49,56 @@ public class MandateNaturalPersonBirthDateAttributeBuilder implements IPVPAttrib
 	public <ATT> ATT build(IOAAuthParameters oaParam, IAuthData authData,
 			IAttributeGenerator<ATT> g) throws AttributeException {
 		if (authData.isUseMandate()) {
-			Element mandate = authData.getMandate();
-			if (mandate == null) {
-				throw new NoMandateDataAttributeException();
-			}
-			Mandate mandateObject = MandateBuilder.buildMandate(mandate);
-			if (mandateObject == null) {
-				throw new NoMandateDataAttributeException();
-			}
-			PhysicalPersonType physicalPerson = mandateObject.getMandator().getPhysicalPerson();
-			if (physicalPerson == null) {
-				Logger.error("No physicalPerson mandate");
-				throw new NoMandateDataAttributeException();
-			}
 			
-			String dateOfBirth = physicalPerson.getDateOfBirth();
-			try {
-				DateFormat mandateFormat = new SimpleDateFormat(MandateBuilder.MANDATE_DATE_OF_BIRTH_FORMAT);
-				Date date = mandateFormat.parse(dateOfBirth);
-				DateFormat pvpDateFormat = new SimpleDateFormat(MANDATE_NAT_PER_BIRTHDATE_FORMAT_PATTERN);
-				String dateString = pvpDateFormat.format(date);
+			//get PVP attribute directly, if exists 
+			String birthDayString = authData.getGenericData(MANDATE_NAT_PER_BIRTHDATE_NAME, String.class);
+			
+			if (MiscUtil.isEmpty(birthDayString)) {
+				//read bPK from mandate if it is not directly included
+				Element mandate = authData.getMandate();
+				if (mandate == null) {
+					throw new NoMandateDataAttributeException();
+				}
+				Mandate mandateObject = MandateBuilder.buildMandate(mandate);
+				if (mandateObject == null) {
+					throw new NoMandateDataAttributeException();
+				}
+				PhysicalPersonType physicalPerson = mandateObject.getMandator().getPhysicalPerson();
+				if (physicalPerson == null) {
+					Logger.error("No physicalPerson mandate");
+					throw new NoMandateDataAttributeException();
+				}
+				
+				String dateOfBirth = physicalPerson.getDateOfBirth();
+				try {
+					DateFormat mandateFormat = new SimpleDateFormat(MandateBuilder.MANDATE_DATE_OF_BIRTH_FORMAT);
+					mandateFormat.setLenient(false);
+					Date date = mandateFormat.parse(dateOfBirth);
+					DateFormat pvpDateFormat = new SimpleDateFormat(MANDATE_NAT_PER_BIRTHDATE_FORMAT_PATTERN);
+					birthDayString = pvpDateFormat.format(date);
+							
+				}
+				catch (ParseException e) {
+					Logger.warn("MIS mandate birthday has an incorrect formt. (Value:" + dateOfBirth, e);
+					throw new InvalidDateFormatAttributeException();
+					
+				}
+				
+			} else {
+				try {
+					DateFormat pvpDateFormat = new SimpleDateFormat(MANDATE_NAT_PER_BIRTHDATE_FORMAT_PATTERN);
+					pvpDateFormat.setLenient(false);
+					pvpDateFormat.parse(birthDayString);
+					
+				} catch (ParseException e) {
+					Logger.warn("Format of direct included PVP Attribute " + MANDATE_NAT_PER_BIRTHDATE_FRIENDLY_NAME 
+							+ " has an incorrect formt. (Value:" + birthDayString, e);
+					throw new InvalidDateFormatAttributeException();
+				}
 				
-				return g.buildStringAttribute(MANDATE_NAT_PER_BIRTHDATE_FRIENDLY_NAME, MANDATE_NAT_PER_BIRTHDATE_NAME, dateString);
-			}
-			catch (ParseException e) {
-				e.printStackTrace();
-				throw new InvalidDateFormatAttributeException();
 			}
+			
+			return g.buildStringAttribute(MANDATE_NAT_PER_BIRTHDATE_FRIENDLY_NAME, MANDATE_NAT_PER_BIRTHDATE_NAME, birthDayString);
 		}
 		return null;