Merge remote-tracking branch 'origin/master'

src/main/java/com/prowidesoftware/brilliance/mx2mt/mt900910/impl/Field50aGenerate.java

@@ -45,30 +45,17 @@ public class Field50aGenerate extends AbstractMx2MtFieldsGenerate {
                 if (dbtr.getId() != null
                     && dbtr.getId().getOrgId() != null
                     && !StringUtil.isEmpty(dbtr.getId().getOrgId().getBICOrBEI())) {
-                    String bicCode = dbtr.getId().getOrgId().getBICOrBEI();
                     field50aOption = "A";
-                    String iban = "";
-                    String otherId = "";
-                    CashAccount16 dbtrAcct = rltdPties.getDbtrAcct();
-                    if (dbtrAcct.getId() != null) {
-                        iban = dbtrAcct.getId().getIBAN();
-                        if (StringUtil.isEmpty(iban)) {
-                            GenericAccountIdentification1 othr = dbtrAcct.getId().getOthr();
-                            if (othr != null) {
-                                otherId = othr.getId();
-                            }
-                        }
-                    }
-                    if (!StringUtil.isEmpty(iban)) {
-                        field50a = "/"+iban + Mx2MtConstants.NEW_LINE + bicCode;
-                    } else if (!StringUtil.isEmpty(otherId)) {
-                        field50a = "//CH"+otherId + Mx2MtConstants.NEW_LINE + bicCode;
+                    String bicCode = dbtr.getId().getOrgId().getBICOrBEI();
+                    String account = getMtFormatAccount(rltdPties.getDbtrAcct());
+                    if (StringUtil.isNotEmpty(account)) {
+                        field50a = account + Mx2MtConstants.NEW_LINE + bicCode;
                     } else {
                         field50a = bicCode;
                     }
                 } else if (!StringUtil.isEmpty(dbtr.getNm())) {
                     field50aOption = "K";
-                    field50a = "/" + dbtr.getNm();
+                    String nameAddr = "";
                     PostalAddress6 pstlAdr = dbtr.getPstlAdr();
                     if (pstlAdr != null) {
                         List<String> adrLineList = pstlAdr.getAdrLine();
@@ -81,10 +68,20 @@ public class Field50aGenerate extends AbstractMx2MtFieldsGenerate {
                                 if (adrLine.length() > 35) {
                                     adrLine = adrLine.substring(0, 35);
                                 }
-                                field50a += Mx2MtConstants.NEW_LINE+adrLine;
+                                if (i == 0) {
+                                    nameAddr += adrLine;
+                                } else {
+                                    nameAddr += Mx2MtConstants.NEW_LINE+adrLine;
+                                }
                             }
                         }
                     }
+                    String account = getMtFormatAccount(rltdPties.getDbtrAcct());
+                    if (!StringUtil.isEmpty(account)) {
+                        field50a = account + Mx2MtConstants.NEW_LINE + nameAddr;;
+                    } else {
+                        field50a = nameAddr;
+                    }
                 }
             }
             if (StringUtil.isNotEmpty(field50aOption) && StringUtil.isNotEmpty(field50a)) {

src/main/java/com/prowidesoftware/brilliance/mx2mt/mt900910/impl/Field52aGenerate.java

@@ -29,13 +29,13 @@ public class Field52aGenerate extends AbstractMx2MtFieldsGenerate {
             FinancialInstitutionIdentification7 finInstnId = crDrTrAgt.getFinInstnId();
             if (finInstnId != null) {
                 String bicCode = finInstnId.getBIC();
+                String memberId = "";
+                ClearingSystemMemberIdentification2 clrSysMmbId = finInstnId.getClrSysMmbId();
+                if (clrSysMmbId != null) {
+                    memberId = clrSysMmbId.getMmbId();
+                }
                 if (StringUtil.isNotEmpty(bicCode)) {
                     field52aOption = "A";
-                    String memberId = "";
-                    ClearingSystemMemberIdentification2 clrSysMmbId = finInstnId.getClrSysMmbId();
-                    if (clrSysMmbId != null) {
-                        memberId = clrSysMmbId.getMmbId();
-                    }
                     if (StringUtil.isNotEmpty(memberId)) {
                         field52a = "/" + memberId + Mx2MtConstants.NEW_LINE + bicCode;
                     } else {
@@ -43,7 +43,9 @@ public class Field52aGenerate extends AbstractMx2MtFieldsGenerate {
                     }
                 } else if (!StringUtil.isEmpty(finInstnId.getNm())){
                     field52aOption = "D";
-                    field52a = "/" + finInstnId.getNm();
+                    if (StringUtil.isNotEmpty(memberId)) {
+                        field52a = "/" + memberId;
+                    }
                     PostalAddress6 pstlAdr = finInstnId.getPstlAdr();
                     if (pstlAdr != null) {
                         List<String> adrLineList = pstlAdr.getAdrLine();

src/main/java/com/prowidesoftware/brilliance/mx2mt/mt900910/impl/Field56aGenerate.java

@@ -33,13 +33,13 @@ public class Field56aGenerate extends AbstractMx2MtFieldsGenerate {
             FinancialInstitutionIdentification7 finInstnId = intrmyAgt1.getFinInstnId();
             if (finInstnId != null) {
                 String bicCode = finInstnId.getBIC();
+                String memberId = "";
+                ClearingSystemMemberIdentification2 clrSysMmbId = finInstnId.getClrSysMmbId();
+                if (clrSysMmbId != null) {
+                    memberId = clrSysMmbId.getMmbId();
+                }
                 if (StringUtil.isNotEmpty(bicCode)) {
                     field56aOption = "A";
-                    String memberId = "";
-                    ClearingSystemMemberIdentification2 clrSysMmbId = finInstnId.getClrSysMmbId();
-                    if (clrSysMmbId != null) {
-                        memberId = clrSysMmbId.getMmbId();
-                    }
                     if (StringUtil.isNotEmpty(memberId)) {
                         field56a = "/" + memberId + Mx2MtConstants.NEW_LINE + bicCode;
                     } else {
@@ -47,7 +47,9 @@ public class Field56aGenerate extends AbstractMx2MtFieldsGenerate {
                     }
                 } else if (!StringUtil.isEmpty(finInstnId.getNm())){
                     field56aOption = "D";
-                    field56a = "/" + finInstnId.getNm();
+                    if (StringUtil.isNotEmpty(memberId)) {
+                        field56a = "/" + memberId;
+                    }
                     PostalAddress6 pstlAdr = finInstnId.getPstlAdr();
                     if (pstlAdr != null) {
                         List<String> adrLineList = pstlAdr.getAdrLine();