Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml =================================================================== diff -u -r73623 -r73624 --- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml (.../Test.cls.xml) (revision 73623) +++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml (.../Test.cls.xml) (revision 73624) @@ -61,7 +61,7 @@ { "CID": "abc-123", "CPConfig": { - "CustomBuildDetails": null, + "ConfiguredProductDetails": null, "Characteristics": null, "Model": null, "CalculatedCharacteristics": null @@ -90,7 +90,7 @@ Do $$$AssertEquals(VhConfig.Line.Count(), 0) } - Do $$$AssertTrue($IsObject(VhConfig.CustomBuildDetails)) + Do $$$AssertTrue($IsObject(VhConfig.ConfiguredProductDetails)) Do $$$AssertTrue($IsObject(VhConfig.CalculatedCharacteristics)) } } @@ -105,7 +105,7 @@ { "CID": "abc-123", "CPConfig": { - "CustomBuildDetails": { + "ConfiguredProductDetails": { "SemiFinishedProducts": {}, "Costs": [], "RemovedSemiFinishedProducts": [] @@ -137,10 +137,10 @@ If $$$AssertTrue($IsObject(VhConfig.Line)) { Do $$$AssertEquals(VhConfig.Line.Count(), 0) } - If $$$AssertTrue($IsObject(VhConfig.CustomBuildDetails)) { - Do $$$AssertTrue($IsObject(VhConfig.CustomBuildDetails)) - Do $$$AssertEquals(VhConfig.CustomBuildDetails.Costs.Count(), 0) - Do $$$AssertEquals(VhConfig.CustomBuildDetails.RemovedSemiFinishedProducts.Count(), 0) + If $$$AssertTrue($IsObject(VhConfig.ConfiguredProductDetails)) { + Do $$$AssertTrue($IsObject(VhConfig.ConfiguredProductDetails)) + Do $$$AssertEquals(VhConfig.ConfiguredProductDetails.Costs.Count(), 0) + Do $$$AssertEquals(VhConfig.ConfiguredProductDetails.RemovedSemiFinishedProducts.Count(), 0) } Do $$$AssertTrue($IsObject(VhConfig.CalculatedCharacteristics)) } @@ -156,7 +156,7 @@ { "CID": "abc-123", "CPConfig": { - "CustomBuildDetails": { + "ConfiguredProductDetails": { "SemiFinishedProducts": { "Verpakking.V1DoosMetDeksel": { "Quantity": 1.139346, @@ -220,10 +220,10 @@ #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.CPConfig Do $$$AssertEquals(VhConfig.Model,"M_LBX") - If $$$AssertTrue($IsObject(VhConfig.CustomBuildDetails)) { - Do $$$AssertEquals(VhConfig.CustomBuildDetails.SemiFinishedProducts.Count(), 2) + If $$$AssertTrue($IsObject(VhConfig.ConfiguredProductDetails)) { + Do $$$AssertEquals(VhConfig.ConfiguredProductDetails.SemiFinishedProducts.Count(), 2) - #dim SemiFinishedProducts As %Collection.ArrayOfObj = VhConfig.CustomBuildDetails.SemiFinishedProducts + #dim SemiFinishedProducts As %Collection.ArrayOfObj = VhConfig.ConfiguredProductDetails.SemiFinishedProducts #dim SemiFinishedProductsKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(SemiFinishedProducts) #dim FrontBevestigingKeyValuePair As TECH.KeyValuePair = SemiFinishedProductsKeyValueList.GetAt(1) @@ -259,7 +259,7 @@ { "CID": "abc-123", "CPConfig": { - "CustomBuildDetails": { + "ConfiguredProductDetails": { "SemiFinishedProducts": {}, "Costs": [ { @@ -314,10 +314,10 @@ If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.CPConfig))) { #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.CPConfig Do $$$AssertEquals(VhConfig.Model,"M_LBX") - If $$$AssertTrue($IsObject(VhConfig.CustomBuildDetails)) { - Do $$$AssertEquals(VhConfig.CustomBuildDetails.Costs.Count(), 2) + If $$$AssertTrue($IsObject(VhConfig.ConfiguredProductDetails)) { + Do $$$AssertEquals(VhConfig.ConfiguredProductDetails.Costs.Count(), 2) - #dim Costs As %Collection.ListOfObj = VhConfig.CustomBuildDetails.Costs + #dim Costs As %Collection.ListOfObj = VhConfig.ConfiguredProductDetails.Costs #dim KostGroepHoofdlijn As APPS.PM.Maatwerk.dto.VhConfig.Kost = Costs.GetAt(1) #dim KostGroepProcentueel As APPS.PM.Maatwerk.dto.VhConfig.Kost = Costs.GetAt(2) @@ -347,7 +347,7 @@ { "CID": "abc-123", "CPConfig": { - "CustomBuildDetails": { + "ConfiguredProductDetails": { "SemiFinishedProducts": {}, "Costs": [], "RemovedSemiFinishedProducts": [] @@ -403,7 +403,7 @@ { "CID": "abc-123", "CPConfig": { - "CustomBuildDetails": { + "ConfiguredProductDetails": { "SemiFinishedProducts": {}, "Costs": [], "RemovedSemiFinishedProducts": [] Index: APPS/PM/Maatwerk/dto/VhConfig.cls.xml =================================================================== diff -u -r73581 -r73624 --- APPS/PM/Maatwerk/dto/VhConfig.cls.xml (.../VhConfig.cls.xml) (revision 73581) +++ APPS/PM/Maatwerk/dto/VhConfig.cls.xml (.../VhConfig.cls.xml) (revision 73624) @@ -22,7 +22,7 @@ array - + APPS.PM.Maatwerk.dto.VhConfig.MaatwerkDetails @@ -68,6 +68,9 @@ Line + +ConfiguredProductDetails + Index: APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml =================================================================== diff -u -r73587 -r73624 --- APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml (.../VhConfigHelper.cls.xml) (revision 73587) +++ APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml (.../VhConfigHelper.cls.xml) (revision 73624) @@ -39,17 +39,17 @@ TECH.ListIterator %ListOfDataTypes -