Add parsing for orgId in related parties and add proprietary amount support

Marko Petrovic · Marko Petrovic · commit c3eea10d921f · 2023-03-07T13:56:03.000+01:00
diff --git a/src/DTO/Creditor.php b/src/DTO/Creditor.php
@@ -7,6 +7,7 @@
 class Creditor implements RelatedPartyTypeInterface
 {
     private ?Address $address = null;
+	private ?string $orgId;
 
     public function __construct(private ?string $name)
     {
@@ -26,4 +27,14 @@ public function getName(): ?string
     {
         return $this->name;
     }
+
+	public function setOrgId(?string $orgId): void
+	{
+		$this->orgId = $orgId;
+	}
+
+	public function getOrgId(): ?string
+	{
+		return $this->orgId;
+	}
 }
diff --git a/src/DTO/Debtor.php b/src/DTO/Debtor.php
@@ -7,6 +7,7 @@
 class Debtor implements RelatedPartyTypeInterface
 {
     private ?Address $address = null;
+	private ?string $orgId;
 
     public function __construct(private ?string $name)
     {
@@ -26,4 +27,14 @@ public function getName(): ?string
     {
         return $this->name;
     }
+
+	public function setOrgId(?string $orgId): void
+	{
+		$this->orgId = $orgId;
+	}
+
+	public function getOrgId(): ?string
+	{
+		return $this->orgId;
+	}
 }
diff --git a/src/Decoder/EntryTransactionDetail.php b/src/Decoder/EntryTransactionDetail.php
@@ -106,7 +106,9 @@ protected function addRelatedParty(DTO\EntryTransactionDetail $detail, SimpleXML
 
         $xmlRelatedPartyName = (isset($xmlPartyDetail->Nm)) ? (string) $xmlPartyDetail->Nm : null;
         $relatedPartyType = new $relatedPartyTypeClass($xmlRelatedPartyName);
+		$orgId = $xmlRelatedPartyType?->Id?->OrgId?->Othr?->Id;
 
+		$relatedPartyType->setOrgId((string) $orgId);
         if (isset($xmlPartyDetail->PstlAdr)) {
             $relatedPartyType->setAddress(DTOFactory\Address::createFromXml($xmlPartyDetail->PstlAdr));
         }
@@ -330,10 +332,13 @@ public function addCharges(DTO\EntryTransactionDetail $detail, SimpleXMLElement
 
     public function addAmountDetails(DTO\EntryTransactionDetail $detail, SimpleXMLElement $xmlDetail, SimpleXMLElement $CdtDbtInd): void
     {
-        if (isset($xmlDetail->AmtDtls, $xmlDetail->AmtDtls->TxAmt, $xmlDetail->AmtDtls->TxAmt->Amt)) {
-            $money = $this->moneyFactory->create($xmlDetail->AmtDtls->TxAmt->Amt, $CdtDbtInd);
-            $detail->setAmountDetails($money);
-        }
+		if (isset($xmlDetail->AmtDtls, $xmlDetail->AmtDtls->TxAmt, $xmlDetail->AmtDtls->TxAmt->Amt)) {
+			$money = $this->moneyFactory->create($xmlDetail->AmtDtls->TxAmt->Amt, $CdtDbtInd);
+			$detail->setAmountDetails($money);
+		} elseif(isset($xmlDetail->AmtDtls->PrtryAmt, $xmlDetail->AmtDtls->PrtryAmt->Amt, $xmlDetail->AmtDtls->PrtryAmt->Tp)) {
+			$money = $this->moneyFactory->create($xmlDetail->AmtDtls->PrtryAmt->Amt, $xmlDetail->AmtDtls->PrtryAmt->Tp);
+			$detail->setAmountDetails($money);
+		}
     }
 
     public function addAmount(DTO\EntryTransactionDetail $detail, SimpleXMLElement $xmlDetail, SimpleXMLElement $CdtDbtInd): void
diff --git a/test/data/camt052.v2.json b/test/data/camt052.v2.json
@@ -132,7 +132,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "Company Name"
+                            "getName": "Company Name",
+                            "getOrgId": "455454654"
                         }
                     },
                     {
@@ -162,7 +163,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "NAME NAME"
+                            "getName": "NAME NAME",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt052.v2.other-account.json b/test/data/camt052.v2.other-account.json
@@ -130,7 +130,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "Company Name"
+                            "getName": "Company Name",
+                            "getOrgId": "455454654"
                         }
                     },
                     {
@@ -158,7 +159,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "NAME NAME"
+                            "getName": "NAME NAME",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt052.v4.json b/test/data/camt052.v4.json
@@ -191,7 +191,8 @@
                         "getRelatedPartyType": {
                             "__CLASS__": "Genkgo\\Camt\\DTO\\Creditor",
                             "getAddress": null,
-                            "getName": "UNIFITS GmbH"
+                            "getName": "UNIFITS GmbH",
+                            "getOrgId": ""
                         }
                     },
                     {
@@ -218,7 +219,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": "Example Creditor Town 4 - V1"
                             },
-                            "getName": "Example Creditor 4 - V1"
+                            "getName": "Example Creditor 4 - V1",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt052.v6.json b/test/data/camt052.v6.json
@@ -191,7 +191,8 @@
                         "getRelatedPartyType": {
                             "__CLASS__": "Genkgo\\Camt\\DTO\\Creditor",
                             "getAddress": null,
-                            "getName": "UNIFITS GmbH"
+                            "getName": "UNIFITS GmbH",
+                            "getOrgId": ""
                         }
                     },
                     {
@@ -218,7 +219,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": "Example Creditor Town 6 - V1"
                             },
-                            "getName": "Example Creditor 6 - V1"
+                            "getName": "Example Creditor 6 - V1",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt053.v2.five.decimals.json b/test/data/camt053.v2.five.decimals.json
@@ -153,7 +153,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "Company Name"
+                            "getName": "Company Name",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt053.v2.minimal.json b/test/data/camt053.v2.minimal.json
@@ -197,7 +197,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "Company Name"
+                            "getName": "Company Name",
+                            "getOrgId": "455454654"
                         }
                     },
                     {
@@ -227,7 +228,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "NAME NAME"
+                            "getName": "NAME NAME",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt053.v2.minimal.ultimate.json b/test/data/camt053.v2.minimal.ultimate.json
@@ -193,7 +193,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "CREDITOR NAME NM"
+                            "getName": "CREDITOR NAME NM",
+                            "getOrgId": ""
                         }
                     },
                     {
@@ -216,7 +217,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "DEBTOR NAME NM"
+                            "getName": "DEBTOR NAME NM",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt053.v2.multi.statement.json b/test/data/camt053.v2.multi.statement.json
@@ -153,7 +153,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "Company Name 2"
+                            "getName": "Company Name 2",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt053.v3.json b/test/data/camt053.v3.json
@@ -223,7 +223,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "Company Name"
+                            "getName": "Company Name",
+                            "getOrgId": "455454654"
                         }
                     },
                     {
@@ -253,7 +254,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "NAME NAME"
+                            "getName": "NAME NAME",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt053.v4.json b/test/data/camt053.v4.json
@@ -205,7 +205,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "Company Name"
+                            "getName": "Company Name",
+                            "getOrgId": "455454654"
                         }
                     },
                     {
@@ -235,7 +236,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": null
                             },
-                            "getName": "NAME NAME"
+                            "getName": "NAME NAME",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt054.v2.json b/test/data/camt054.v2.json
@@ -105,7 +105,8 @@
                         "getRelatedPartyType": {
                             "__CLASS__": "Genkgo\\Camt\\DTO\\Debtor",
                             "getAddress": null,
-                            "getName": "MUELLER"
+                            "getName": "MUELLER",
+                            "getOrgId": ""
                         }
                     }
                 ],
@@ -178,7 +179,8 @@
                             "getRelatedPartyType": {
                                 "__CLASS__": "Genkgo\\Camt\\DTO\\Debtor",
                                 "getAddress": null,
-                                "getName": "MUELLER"
+                                "getName": "MUELLER",
+                                "getOrgId": ""
                             }
                         }
                     ],
@@ -244,7 +246,8 @@
                             "getRelatedPartyType": {
                                 "__CLASS__": "Genkgo\\Camt\\DTO\\Debtor",
                                 "getAddress": null,
-                                "getName": "MUELLER"
+                                "getName": "MUELLER",
+                                "getOrgId": ""
                             }
                         }
                     ],
diff --git a/test/data/camt054.v4.json b/test/data/camt054.v4.json
@@ -175,7 +175,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": "Example Town 3 - V1"
                             },
-                            "getName": "Example Creditor 3 - V1"
+                            "getName": "Example Creditor 3 - V1",
+                            "getOrgId": ""
                         }
                     },
                     {
@@ -191,7 +192,8 @@
                         "getRelatedPartyType": {
                             "__CLASS__": "Genkgo\\Camt\\DTO\\Debtor",
                             "getAddress": null,
-                            "getName": "UNIFITS GmbH"
+                            "getName": "UNIFITS GmbH",
+                            "getOrgId": ""
                         }
                     }
                 ],
@@ -325,7 +327,8 @@
                                     "getSubDepartment": null,
                                     "getTownName": "Example Town 3 - V2"
                                 },
-                                "getName": "Example Creditor 3 - V2"
+                                "getName": "Example Creditor 3 - V2",
+                                "getOrgId": ""
                             }
                         },
                         {
@@ -341,7 +344,8 @@
                             "getRelatedPartyType": {
                                 "__CLASS__": "Genkgo\\Camt\\DTO\\Debtor",
                                 "getAddress": null,
-                                "getName": "UNIFITS GmbH"
+                                "getName": "UNIFITS GmbH",
+                                "getOrgId": ""
                             }
                         }
                     ],
@@ -468,7 +472,8 @@
                                     "getSubDepartment": null,
                                     "getTownName": "Example Town 3 - V3"
                                 },
-                                "getName": "Example Creditor 3 - V3"
+                                "getName": "Example Creditor 3 - V3",
+                                "getOrgId": ""
                             }
                         },
                         {
@@ -484,7 +489,8 @@
                             "getRelatedPartyType": {
                                 "__CLASS__": "Genkgo\\Camt\\DTO\\Debtor",
                                 "getAddress": null,
-                                "getName": "UNIFITS GmbH"
+                                "getName": "UNIFITS GmbH",
+                                "getOrgId": ""
                             }
                         }
                     ],
diff --git a/test/data/camt054.v8-with-financial-institution.json b/test/data/camt054.v8-with-financial-institution.json
@@ -84,7 +84,8 @@
                                 "getSubDepartment": null,
                                 "getTownName": "Example Town 3 - V1"
                             },
-                            "getName": "Example Creditor 3 - V1"
+                            "getName": "Example Creditor 3 - V1",
+                            "getOrgId": ""
                         }
                     }
                 ],
diff --git a/test/data/camt054.v8.json b/test/data/camt054.v8.json

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`class Creditor implements RelatedPartyTypeInterface`
`8`	`8`	`{`
`9`	`9`	`private ?Address $address = null;`
	`10`	`+ private ?string $orgId;`
`10`	`11`
`11`	`12`	`public function __construct(private ?string $name)`
`12`	`13`	`{`
`@@ -26,4 +27,14 @@ public function getName(): ?string`
`26`	`27`	`{`
`27`	`28`	`return $this->name;`
`28`	`29`	`}`
	`30`	`+`
	`31`	`+ public function setOrgId(?string $orgId): void`
	`32`	`+ {`
	`33`	`+ $this->orgId = $orgId;`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ public function getOrgId(): ?string`
	`37`	`+ {`
	`38`	`+ return $this->orgId;`
	`39`	`+ }`
`29`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`class Debtor implements RelatedPartyTypeInterface`
`8`	`8`	`{`
`9`	`9`	`private ?Address $address = null;`
	`10`	`+ private ?string $orgId;`
`10`	`11`
`11`	`12`	`public function __construct(private ?string $name)`
`12`	`13`	`{`
`@@ -26,4 +27,14 @@ public function getName(): ?string`
`26`	`27`	`{`
`27`	`28`	`return $this->name;`
`28`	`29`	`}`
	`30`	`+`
	`31`	`+ public function setOrgId(?string $orgId): void`
	`32`	`+ {`
	`33`	`+ $this->orgId = $orgId;`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ public function getOrgId(): ?string`
	`37`	`+ {`
	`38`	`+ return $this->orgId;`
	`39`	`+ }`
`29`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,8 @@`
`132`	`132`	`"getSubDepartment": null,`
`133`	`133`	`"getTownName": null`
`134`	`134`	`},`
`135`		`- "getName": "Company Name"`
	`135`	`+ "getName": "Company Name",`
	`136`	`+ "getOrgId": "455454654"`
`136`	`137`	`}`
`137`	`138`	`},`
`138`	`139`	`{`
`@@ -162,7 +163,8 @@`
`162`	`163`	`"getSubDepartment": null,`
`163`	`164`	`"getTownName": null`
`164`	`165`	`},`
`165`		`- "getName": "NAME NAME"`
	`166`	`+ "getName": "NAME NAME",`
	`167`	`+ "getOrgId": ""`
`166`	`168`	`}`
`167`	`169`	`}`
`168`	`170`	`],`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,8 @@`
`130`	`130`	`"getSubDepartment": null,`
`131`	`131`	`"getTownName": null`
`132`	`132`	`},`
`133`		`- "getName": "Company Name"`
	`133`	`+ "getName": "Company Name",`
	`134`	`+ "getOrgId": "455454654"`
`134`	`135`	`}`
`135`	`136`	`},`
`136`	`137`	`{`
`@@ -158,7 +159,8 @@`
`158`	`159`	`"getSubDepartment": null,`
`159`	`160`	`"getTownName": null`
`160`	`161`	`},`
`161`		`- "getName": "NAME NAME"`
	`162`	`+ "getName": "NAME NAME",`
	`163`	`+ "getOrgId": ""`
`162`	`164`	`}`
`163`	`165`	`}`
`164`	`166`	`],`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,8 @@`
`191`	`191`	`"getRelatedPartyType": {`
`192`	`192`	`"__CLASS__": "Genkgo\\Camt\\DTO\\Creditor",`
`193`	`193`	`"getAddress": null,`
`194`		`- "getName": "UNIFITS GmbH"`
	`194`	`+ "getName": "UNIFITS GmbH",`
	`195`	`+ "getOrgId": ""`
`195`	`196`	`}`
`196`	`197`	`},`
`197`	`198`	`{`
`@@ -218,7 +219,8 @@`
`218`	`219`	`"getSubDepartment": null,`
`219`	`220`	`"getTownName": "Example Creditor Town 4 - V1"`
`220`	`221`	`},`
`221`		`- "getName": "Example Creditor 4 - V1"`
	`222`	`+ "getName": "Example Creditor 4 - V1",`
	`223`	`+ "getOrgId": ""`
`222`	`224`	`}`
`223`	`225`	`}`
`224`	`226`	`],`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,8 @@`
`153`	`153`	`"getSubDepartment": null,`
`154`	`154`	`"getTownName": null`
`155`	`155`	`},`
`156`		`- "getName": "Company Name"`
	`156`	`+ "getName": "Company Name",`
	`157`	`+ "getOrgId": ""`
`157`	`158`	`}`
`158`	`159`	`}`
`159`	`160`	`],`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,8 @@`
`197`	`197`	`"getSubDepartment": null,`
`198`	`198`	`"getTownName": null`
`199`	`199`	`},`
`200`		`- "getName": "Company Name"`
	`200`	`+ "getName": "Company Name",`
	`201`	`+ "getOrgId": "455454654"`
`201`	`202`	`}`
`202`	`203`	`},`
`203`	`204`	`{`
`@@ -227,7 +228,8 @@`
`227`	`228`	`"getSubDepartment": null,`
`228`	`229`	`"getTownName": null`
`229`	`230`	`},`
`230`		`- "getName": "NAME NAME"`
	`231`	`+ "getName": "NAME NAME",`
	`232`	`+ "getOrgId": ""`
`231`	`233`	`}`
`232`	`234`	`}`
`233`	`235`	`],`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,8 @@`
`193`	`193`	`"getSubDepartment": null,`
`194`	`194`	`"getTownName": null`
`195`	`195`	`},`
`196`		`- "getName": "CREDITOR NAME NM"`
	`196`	`+ "getName": "CREDITOR NAME NM",`
	`197`	`+ "getOrgId": ""`
`197`	`198`	`}`
`198`	`199`	`},`
`199`	`200`	`{`
`@@ -216,7 +217,8 @@`
`216`	`217`	`"getSubDepartment": null,`
`217`	`218`	`"getTownName": null`
`218`	`219`	`},`
`219`		`- "getName": "DEBTOR NAME NM"`
	`220`	`+ "getName": "DEBTOR NAME NM",`
	`221`	`+ "getOrgId": ""`
`220`	`222`	`}`
`221`	`223`	`}`
`222`	`224`	`],`