Index: WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml =================================================================== diff -u -r72789 -r72853 --- WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml (.../Encoway.cls.xml) (revision 72789) +++ WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml (.../Encoway.cls.xml) (revision 72853) @@ -34,12 +34,14 @@ If (CID = "") { Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ophalen VHConfig is mislukt aangezien de CID leeg is.")) } + #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = "" #dim GeefMaatwerkDetailsRequestJsonStream As %Stream.GlobalBinary = ..EncowayJsonConverter.Stringify(..GeefMaatwerkDetailsRequest(CID)) #dim VhConfigJsonString As %Stream.GlobalBinary = ..EncowayHttpClient.HaalOpVhConfig(GeefMaatwerkDetailsRequestJsonStream) - Set VhConfig = ..EncowayJsonConverter.Parse(VhConfigJsonString) - + #dim MaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = ..EncowayJsonConverter.Parse(VhConfigJsonString) + Set VhConfig = MaatwerkDetailsResponse.VhConfig + Quit VhConfig ]]> Index: WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetailsResponse.cls.xml =================================================================== diff -u --- WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetailsResponse.cls.xml (revision 0) +++ WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetailsResponse.cls.xml (revision 72853) @@ -0,0 +1,16 @@ + + + +TECH.JSON.RegisteredObject + + +%String + + + +APPS.PM.Maatwerk.dto.VhConfig + + + + + Index: WSimpl/PM/Maatwerk/MaatwerkService/EncowayHttpClient.cls.xml =================================================================== diff -u -r72788 -r72853 --- WSimpl/PM/Maatwerk/MaatwerkService/EncowayHttpClient.cls.xml (.../EncowayHttpClient.cls.xml) (revision 72788) +++ WSimpl/PM/Maatwerk/MaatwerkService/EncowayHttpClient.cls.xml (.../EncowayHttpClient.cls.xml) (revision 72853) @@ -42,18 +42,18 @@ JsonStream:%Stream.GlobalBinary %CacheString Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml =================================================================== diff -u -r72789 -r72853 --- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml (.../Test.cls.xml) (revision 72789) +++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml (.../Test.cls.xml) (revision 72853) @@ -7,13 +7,12 @@ JsonStream:%Stream APPS.PM.Maatwerk.dto.VhConfig Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/Parse/Test.cls.xml =================================================================== diff -u -r72776 -r72853 --- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/Parse/Test.cls.xml (.../Test.cls.xml) (revision 72776) +++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/Parse/Test.cls.xml (.../Test.cls.xml) (revision 72853) @@ -18,21 +18,11 @@ #dim JsonStream As %Stream = ..GeefStream("LegeJsonStream") Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New() - #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream) + #dim GeefMaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = EncowayJsonConverter.Parse(JsonStream) - If ($$$AssertTrue($IsObject(VhConfig))) { - Do $$$AssertEquals(VhConfig.%ClassName($$$True),"APPS.PM.Maatwerk.dto.VhConfig") - Do $$$AssertEquals(VhConfig.CID, "") - Do $$$AssertEquals(VhConfig.Model,"") - If $$$AssertTrue($IsObject(VhConfig.Context)) { - Do $$$AssertEquals(VhConfig.Context.Count(), 0) - } - If $$$AssertTrue($IsObject(VhConfig.Lijn)) { - Do $$$AssertEquals(VhConfig.Lijn.Count(), 0) - } - Do $$$AssertEquals(VhConfig.MaatwerkDetails,"") - Do $$$AssertEquals(VhConfig.BerekendeKenmerken,"") - Do $$$AssertEquals(VhConfig.isValid,"") + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) { + Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"") + Do $$$AssertEquals(GeefMaatwerkDetailsResponse.VhConfig,"") } ]]> @@ -69,12 +59,14 @@ @@ -85,21 +77,27 @@ #dim JsonStream As %Stream = ..GeefStream("NullableKenmerkenJsonStream") Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New() - #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream) + #dim GeefMaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = EncowayJsonConverter.Parse(JsonStream) - If ($$$AssertTrue($IsObject(VhConfig))) { - Do $$$AssertEquals(VhConfig.%ClassName($$$True),"APPS.PM.Maatwerk.dto.VhConfig") - Do $$$AssertEquals(VhConfig.CID, "") - Do $$$AssertEquals(VhConfig.Model,"") - If $$$AssertTrue($IsObject(VhConfig.Context)) { - Do $$$AssertEquals(VhConfig.Context.Count(), 0) + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) { + Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123") + + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) { + #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig + + Do $$$AssertEquals(VhConfig.%ClassName($$$True),"APPS.PM.Maatwerk.dto.VhConfig") + Do $$$AssertEquals(VhConfig.Model,"") + If $$$AssertTrue($IsObject(VhConfig.Context)) { + Do $$$AssertEquals(VhConfig.Context.Count(), 0) + } + If $$$AssertTrue($IsObject(VhConfig.Lijn)) { + Do $$$AssertEquals(VhConfig.Lijn.Count(), 0) + } + Do $$$AssertEquals(VhConfig.MaatwerkDetails,"") + Do $$$AssertEquals(VhConfig.BerekendeKenmerken,"") + Do $$$AssertEquals(VhConfig.isValid,"") + Do $$$AssertEquals(VhConfig.isCalculated,"") } - If $$$AssertTrue($IsObject(VhConfig.Lijn)) { - Do $$$AssertEquals(VhConfig.Lijn.Count(), 0) - } - Do $$$AssertEquals(VhConfig.MaatwerkDetails,"") - Do $$$AssertEquals(VhConfig.BerekendeKenmerken,"") - Do $$$AssertEquals(VhConfig.isValid,"") } ]]> @@ -110,16 +108,18 @@ @@ -130,25 +130,30 @@ #dim JsonStream As %Stream = ..GeefStream("LegeKenmerkenJsonStream") Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New() - #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream) + #dim GeefMaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = EncowayJsonConverter.Parse(JsonStream) - If ($$$AssertTrue($IsObject(VhConfig))) { - Do $$$AssertEquals(VhConfig.%ClassName($$$True),"APPS.PM.Maatwerk.dto.VhConfig") - Do $$$AssertEquals(VhConfig.CID, "") - Do $$$AssertEquals(VhConfig.Model,"") - If $$$AssertTrue($IsObject(VhConfig.Context)) { - Do $$$AssertEquals(VhConfig.Context.Count(), 0) + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) { + Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123") + + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) { + #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig + + Do $$$AssertEquals(VhConfig.%ClassName($$$True),"APPS.PM.Maatwerk.dto.VhConfig") + Do $$$AssertEquals(VhConfig.Model,"") + If $$$AssertTrue($IsObject(VhConfig.Context)) { + Do $$$AssertEquals(VhConfig.Context.Count(), 0) + } + If $$$AssertTrue($IsObject(VhConfig.Lijn)) { + Do $$$AssertEquals(VhConfig.Lijn.Count(), 0) + } + If $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) { + Do $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) + Do $$$AssertEquals(VhConfig.MaatwerkDetails.Kosten.Count(), 0) + Do $$$AssertEquals(VhConfig.MaatwerkDetails.VerwijderdeHalffabItems.Count(), 0) + } + Do $$$AssertTrue($IsObject(VhConfig.BerekendeKenmerken)) + Do $$$AssertEquals(VhConfig.isValid,"") } - If $$$AssertTrue($IsObject(VhConfig.Lijn)) { - Do $$$AssertEquals(VhConfig.Lijn.Count(), 0) - } - If $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) { - Do $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) - Do $$$AssertEquals(VhConfig.MaatwerkDetails.Kosten.Count(), 0) - Do $$$AssertEquals(VhConfig.MaatwerkDetails.VerwijderdeHalffabItems.Count(), 0) - } - Do $$$AssertTrue($IsObject(VhConfig.BerekendeKenmerken)) - Do $$$AssertEquals(VhConfig.isValid,"") } ]]> @@ -159,52 +164,54 @@ @@ -215,38 +222,43 @@ #dim JsonStream As %Stream = ..GeefStream("IngevuldeHalffabrikatenJsonStream") Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New() - #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream) + #dim GeefMaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = EncowayJsonConverter.Parse(JsonStream) - If ($$$AssertTrue($IsObject(VhConfig))) { - Do $$$AssertEquals(VhConfig.CID, "123abc") - Do $$$AssertEquals(VhConfig.Model,"M_LBX") - If $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) { - Do $$$AssertEquals(VhConfig.MaatwerkDetails.Halffabrikaten.Count(), 2) + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) { + Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123") + + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) { + #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig - #dim Halffabrikaten As %Collection.ArrayOfObj = VhConfig.MaatwerkDetails.Halffabrikaten - #dim HalffabrikatenKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(Halffabrikaten) - - #dim FrontBevestigingKeyValuePair As TECH.KeyValuePair = HalffabrikatenKeyValueList.GetAt(1) - Do ..AssertHalffabrikaat(FrontBevestigingKeyValuePair, "FrontBevestiging", "Standaard", 2, "0.705.488.1", "ZF7M70E2 FROB V500 ZN", $$$True, $$$False) - - #dim FrontBevestigingKenmerkenKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(FrontBevestigingKeyValuePair.Value.Kenmerken) - Do $$$AssertEquals(FrontBevestigingKenmerkenKeyValuePair.Count(), 2) - Do ..AssertKeyValuePair(FrontBevestigingKenmerkenKeyValuePair.GetAt(1), "Frontbevestiging", "E") - Do ..AssertKeyValuePair(FrontBevestigingKenmerkenKeyValuePair.GetAt(2), "LadeHoogte", "M") - - #dim V1DoosMetDekselKeyValuePair As TECH.KeyValuePair = HalffabrikatenKeyValueList.GetAt(2) - Do ..AssertHalffabrikaat(V1DoosMetDekselKeyValuePair, "Verpakking.V1DoosMetDeksel", "Bewerkt", 1.139346, "9.537.438.3", "VFF.TB143EB ZZCARTON BR", $$$True, $$$False, 1, 1244.6, 1150, 1147, 1244.6, 1306.83, "V1 ladedoos", "Verpakking") - - #dim V1DoosMetDekselKenmerkenKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(V1DoosMetDekselKeyValuePair.Value.Kenmerken) - Do $$$AssertEquals(V1DoosMetDekselKenmerkenKeyValuePair.Count(), 2) - Do ..AssertKeyValuePair(V1DoosMetDekselKenmerkenKeyValuePair.GetAt(1), "Kartonbreedte", "1430,00") - Do ..AssertKeyValuePair(V1DoosMetDekselKenmerkenKeyValuePair.GetAt(2), "Samenstelling", "EB") - - #dim V1DoosMetDekselBewerkingDimensiesKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(V1DoosMetDekselKeyValuePair.Value.BewerkingDimensies) - Do $$$AssertEquals(V1DoosMetDekselBewerkingDimensiesKeyValuePair.Count(), 1) - Do ..AssertKeyValuePair(V1DoosMetDekselBewerkingDimensiesKeyValuePair.GetAt(1), "Lengte", 1244.6) + Do $$$AssertEquals(VhConfig.Model,"M_LBX") + If $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) { + Do $$$AssertEquals(VhConfig.MaatwerkDetails.Halffabrikaten.Count(), 2) + + #dim Halffabrikaten As %Collection.ArrayOfObj = VhConfig.MaatwerkDetails.Halffabrikaten + #dim HalffabrikatenKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(Halffabrikaten) + + #dim FrontBevestigingKeyValuePair As TECH.KeyValuePair = HalffabrikatenKeyValueList.GetAt(1) + Do ..AssertHalffabrikaat(FrontBevestigingKeyValuePair, "FrontBevestiging", "Standaard", 2, "0.705.488.1", "ZF7M70E2 FROB V500 ZN", $$$True, $$$False) + + #dim FrontBevestigingKenmerkenKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(FrontBevestigingKeyValuePair.Value.Kenmerken) + Do $$$AssertEquals(FrontBevestigingKenmerkenKeyValuePair.Count(), 2) + Do ..AssertKeyValuePair(FrontBevestigingKenmerkenKeyValuePair.GetAt(1), "Frontbevestiging", "E") + Do ..AssertKeyValuePair(FrontBevestigingKenmerkenKeyValuePair.GetAt(2), "LadeHoogte", "M") + + #dim V1DoosMetDekselKeyValuePair As TECH.KeyValuePair = HalffabrikatenKeyValueList.GetAt(2) + Do ..AssertHalffabrikaat(V1DoosMetDekselKeyValuePair, "Verpakking.V1DoosMetDeksel", "Bewerkt", 1.139346, "9.537.438.3", "VFF.TB143EB ZZCARTON BR", $$$True, $$$False, 1, 1244.6, 1150, 1147, 1244.6, 1306.83, "V1 ladedoos", "Verpakking") + + #dim V1DoosMetDekselKenmerkenKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(V1DoosMetDekselKeyValuePair.Value.Kenmerken) + Do $$$AssertEquals(V1DoosMetDekselKenmerkenKeyValuePair.Count(), 2) + Do ..AssertKeyValuePair(V1DoosMetDekselKenmerkenKeyValuePair.GetAt(1), "Kartonbreedte", "1430,00") + Do ..AssertKeyValuePair(V1DoosMetDekselKenmerkenKeyValuePair.GetAt(2), "Samenstelling", "EB") + + #dim V1DoosMetDekselBewerkingDimensiesKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(V1DoosMetDekselKeyValuePair.Value.BewerkingDimensies) + Do $$$AssertEquals(V1DoosMetDekselBewerkingDimensiesKeyValuePair.Count(), 1) + Do ..AssertKeyValuePair(V1DoosMetDekselBewerkingDimensiesKeyValuePair.GetAt(1), "Lengte", 1244.6) + } + Do $$$AssertEquals(VhConfig.isValid, $$$True) } - Do $$$AssertEquals(VhConfig.isValid, $$$True) } ]]> @@ -257,44 +269,46 @@ @@ -305,30 +319,34 @@ #dim JsonStream As %Stream = ..GeefStream("IngevuldeKostenJsonStream") Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New() - #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream) + #dim GeefMaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = EncowayJsonConverter.Parse(JsonStream) - If ($$$AssertTrue($IsObject(VhConfig))) { - Do $$$AssertEquals(VhConfig.CID, "123abc") - Do $$$AssertEquals(VhConfig.Model,"M_LBX") - If $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) { - Do $$$AssertEquals(VhConfig.MaatwerkDetails.Kosten.Count(), 2) - - #dim Kosten As %Collection.ListOfObj = VhConfig.MaatwerkDetails.Kosten - #dim KostGroepHoofdlijn As APPS.PM.Maatwerk.dto.VhConfig.Kost = Kosten.GetAt(1) - #dim KostGroepProcentueel As APPS.PM.Maatwerk.dto.VhConfig.Kost = Kosten.GetAt(2) - - Do $$$AssertEquals(KostGroepHoofdlijn.Groep, "KostHoofdlijn") - #dim KostHoofdlijnItems As %Collection.ListOfObj = KostGroepHoofdlijn.Items - - Do $$$AssertEquals(KostHoofdlijnItems.Count(), 2) - Do ..AssertKostItem(KostHoofdlijnItems.GetAt(1), "CB_KostItem_LinefeedingPlaatMateriaal", "8.0", "7.013.706.0", "LINEFEED") - Do ..AssertKostItem(KostHoofdlijnItems.GetAt(2), "CB_KostItem_LinefeedingRugwandHouder", "1.0", "7.013.707.0", "LINEFEED") - - Do $$$AssertEquals(KostGroepProcentueel.Groep, "CB_KostGroep_Procentueel") - #dim KostProcentueelItems As %Collection.ListOfObj = KostGroepProcentueel.Items - - Do $$$AssertEquals(KostProcentueelItems.Count(), 1) - Do ..AssertKostItem(KostProcentueelItems.GetAt(1), "CB_KostItem_RechtzettingKostprijsBJ2018", "", "", "", "2.65", "ALL") + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) { + Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123") + + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) { + #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig + Do $$$AssertEquals(VhConfig.Model,"M_LBX") + If $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) { + Do $$$AssertEquals(VhConfig.MaatwerkDetails.Kosten.Count(), 2) + + #dim Kosten As %Collection.ListOfObj = VhConfig.MaatwerkDetails.Kosten + #dim KostGroepHoofdlijn As APPS.PM.Maatwerk.dto.VhConfig.Kost = Kosten.GetAt(1) + #dim KostGroepProcentueel As APPS.PM.Maatwerk.dto.VhConfig.Kost = Kosten.GetAt(2) + + Do $$$AssertEquals(KostGroepHoofdlijn.Groep, "KostHoofdlijn") + #dim KostHoofdlijnItems As %Collection.ListOfObj = KostGroepHoofdlijn.Items + + Do $$$AssertEquals(KostHoofdlijnItems.Count(), 2) + Do ..AssertKostItem(KostHoofdlijnItems.GetAt(1), "CB_KostItem_LinefeedingPlaatMateriaal", "8.0", "7.013.706.0", "LINEFEED") + Do ..AssertKostItem(KostHoofdlijnItems.GetAt(2), "CB_KostItem_LinefeedingRugwandHouder", "1.0", "7.013.707.0", "LINEFEED") + + Do $$$AssertEquals(KostGroepProcentueel.Groep, "CB_KostGroep_Procentueel") + #dim KostProcentueelItems As %Collection.ListOfObj = KostGroepProcentueel.Items + + Do $$$AssertEquals(KostProcentueelItems.Count(), 1) + Do ..AssertKostItem(KostProcentueelItems.GetAt(1), "CB_KostItem_RechtzettingKostprijsBJ2018", "", "", "", "2.65", "ALL") + } } } ]]> @@ -340,22 +358,24 @@ @@ -365,20 +385,26 @@ #dim JsonStream As %Stream = ..GeefStream("IngevuldeKenmerkenJsonStream") Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New() - #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream) + #dim GeefMaatwerkdetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = EncowayJsonConverter.Parse(JsonStream) + #dim GeefMaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = EncowayJsonConverter.Parse(JsonStream) - If ($$$AssertTrue($IsObject(VhConfig))) { - Do $$$AssertEquals(VhConfig.CID, "123abc") - Do $$$AssertEquals(VhConfig.Model,"M_LBX") - If $$$AssertTrue($IsObject(VhConfig.Kenmerken)) { - Do $$$AssertEquals(VhConfig.Kenmerken.Count(), 4) - #dim Kenmerken As %Collection.ArrayOfDT = VhConfig.Kenmerken + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) { + Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123") + + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) { + #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig - #dim KenmerkenKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(Kenmerken) - Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(1), "InterneBreedte", 785) - Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(2), "NietMeeleveren.AfdekkapBinnen", "false") - Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(3), "NietMeeleveren.AfdekkapBuiten", "true") - Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(4), "ZijwandType", "Pure") + Do $$$AssertEquals(VhConfig.Model,"M_LBX") + If $$$AssertTrue($IsObject(VhConfig.Kenmerken)) { + Do $$$AssertEquals(VhConfig.Kenmerken.Count(), 4) + #dim Kenmerken As %Collection.ArrayOfDT = VhConfig.Kenmerken + + #dim KenmerkenKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(Kenmerken) + Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(1), "InterneBreedte", 785) + Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(2), "NietMeeleveren.AfdekkapBinnen", "false") + Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(3), "NietMeeleveren.AfdekkapBuiten", "true") + Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(4), "ZijwandType", "Pure") + } } } ]]> @@ -390,26 +416,28 @@ @@ -420,23 +448,28 @@ #dim JsonStream As %Stream = ..GeefStream("IngevuldeBerekendeKenmerkenJsonStream") Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New() - #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream) + #dim GeefMaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = EncowayJsonConverter.Parse(JsonStream) - If ($$$AssertTrue($IsObject(VhConfig))) { - Do $$$AssertEquals(VhConfig.CID, "123abc") - Do $$$AssertEquals(VhConfig.Model,"M_LBX") - If $$$AssertTrue($IsObject(VhConfig.BerekendeKenmerken)) { - Do $$$AssertEquals(VhConfig.BerekendeKenmerken.AfbeeldingCode, "M_Legra.jpg") - Do $$$AssertEquals(VhConfig.BerekendeKenmerken.ItemId, "9.657.336.8") - Do $$$AssertEquals(VhConfig.BerekendeKenmerken.Korttekst, "LB4M/E%1 300x785 SWDG") - Do $$$AssertEquals(VhConfig.BerekendeKenmerken.AfbeeldingCode, "M_Legra.jpg") - Do $$$AssertEquals(VhConfig.BerekendeKenmerken.Langtekst.Count(), 4) + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) { + Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"abc-123") + + If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))) { + #dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = GeefMaatwerkDetailsResponse.VhConfig - #dim LangtekstKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(VhConfig.BerekendeKenmerken.Langtekst) - Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(1), "de-DE", "LEGRABOX Schubkasten M\r\nT:300xB:785; Boden:Dunkelgrau; \r\nZarge:Seidenweiss; \r\nbeinhaltet: fertigschubkasten; \r\nKorpusschienen 40kg; BLUMOTION; \r\nfrontbefest EXPANDO; \r\nverpackt: karton") - Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(2), "en-US", "LEGRABOX drawer M\r\nD:300xW:785; base:Dark grey; \r\ndrawer side:Silk white; \r\ncontains: premounted drawer; \r\ncabinet profiles 40kg; BLUMOTION; \r\nfixation expando; \r\npacked: box") - Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(3), "fr-FR", "LEGRABOX tiroir M\r\nP:300xL:785; fond:Gris foncé; \r\ncôté de tiroir:Blanc soie; \r\ncontient: tiroir monté; \r\ncoulisses corps de meuble 40kg; BLUMOTION; \r\nattache façade EXPANDO; \r\nemballé: carton") - Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(4), "nl-BE", "LEGRABOX lade M\r\nD:300xB:785; bodem:Donkergrijs; \r\nladezijkant:Zijdewit; bevat: gemont. lade; \r\ncorpusprofiel 40kg; BLUMOTION; \r\nfrontbevest. EXPANDO; \r\nverpakt: karton") + Do $$$AssertEquals(VhConfig.Model,"M_LBX") + If $$$AssertTrue($IsObject(VhConfig.BerekendeKenmerken)) { + Do $$$AssertEquals(VhConfig.BerekendeKenmerken.AfbeeldingCode, "M_Legra.jpg") + Do $$$AssertEquals(VhConfig.BerekendeKenmerken.ItemId, "9.657.336.8") + Do $$$AssertEquals(VhConfig.BerekendeKenmerken.Korttekst, "LB4M/E%1 300x785 SWDG") + Do $$$AssertEquals(VhConfig.BerekendeKenmerken.AfbeeldingCode, "M_Legra.jpg") + Do $$$AssertEquals(VhConfig.BerekendeKenmerken.Langtekst.Count(), 4) + + #dim LangtekstKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(VhConfig.BerekendeKenmerken.Langtekst) + Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(1), "de-DE", "LEGRABOX Schubkasten M\r\nT:300xB:785; Boden:Dunkelgrau; \r\nZarge:Seidenweiss; \r\nbeinhaltet: fertigschubkasten; \r\nKorpusschienen 40kg; BLUMOTION; \r\nfrontbefest EXPANDO; \r\nverpackt: karton") + Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(2), "en-US", "LEGRABOX drawer M\r\nD:300xW:785; base:Dark grey; \r\ndrawer side:Silk white; \r\ncontains: premounted drawer; \r\ncabinet profiles 40kg; BLUMOTION; \r\nfixation expando; \r\npacked: box") + Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(3), "fr-FR", "LEGRABOX tiroir M\r\nP:300xL:785; fond:Gris foncé; \r\ncôté de tiroir:Blanc soie; \r\ncontient: tiroir monté; \r\ncoulisses corps de meuble 40kg; BLUMOTION; \r\nattache façade EXPANDO; \r\nemballé: carton") + Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(4), "nl-BE", "LEGRABOX lade M\r\nD:300xB:785; bodem:Donkergrijs; \r\nladezijkant:Zijdewit; bevat: gemont. lade; \r\ncorpusprofiel 40kg; BLUMOTION; \r\nfrontbevest. EXPANDO; \r\nverpakt: karton") + } } } ]]> Index: vhUnitTest/APPS/PM/Maatwerk/impl/VhConfig/Converter/LbxKenmerken/Converteer/Test.cls.xml =================================================================== diff -u -r72848 -r72853 --- vhUnitTest/APPS/PM/Maatwerk/impl/VhConfig/Converter/LbxKenmerken/Converteer/Test.cls.xml (.../Test.cls.xml) (revision 72848) +++ vhUnitTest/APPS/PM/Maatwerk/impl/VhConfig/Converter/LbxKenmerken/Converteer/Test.cls.xml (.../Test.cls.xml) (revision 72853) @@ -193,6 +193,9 @@ ]]> + + + DtoKenmerkNaam:%String,DtoKenmerkWaarde:%String,VerwachteDomKenmerkNaam:%String,VerwachteDomKenmerkWaarde:%String 1