Index: vhUnitTest/DOM/VKP/impl/KlantDataBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/VKP/impl/KlantDataBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/DOM/VKP/impl/KlantDataBepaler/Test.cls.xml	(revision 35974)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.VKP.impl.KlantDataBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="KlantDataBepaler">
+<Type>DOM.VKP.impl.KlantDataBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[	Do ##super(aTestName)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Error wordt geraised indien KlantId onbestaand">
+<Implementation><![CDATA[
+	Set ..KlantDataBepaler = ##class(DOM.VKP.impl.KlantDataBepaler).%New()
+	
+	#dim RandomPersonality As DOM.common.Personality = ##class(DOM.common.DestilPersonality).Instance()
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Klant", "bestaat niet in de database")
+	
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.GeneralErrorException).%ClassName(1), Substrings))
+	
+	Do ..KlantDataBepaler.GeefKlantData(RandomPersonality, "OnbestaandeKlantId")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bestaande Klant">
+<Implementation><![CDATA[
+	#dim RandomPersonality As DOM.common.Personality = ##class(DOM.common.HeinPersonality).Instance()
+	#dim RandomKlantId As TECH.String = "RandomKlantId"
+	#dim DummyKlantData As DOM.VKP.impl.KlantData = ..GeefDummyKlantData("hein_123", "Taal", "Naam")	
+	#dim RepositoryStub As vhTest.Mock.DOM.VKP.impl.KlantDataRepository = ##class(vhTest.Mock.DOM.VKP.impl.KlantDataRepository).%New()
+	
+	Do RepositoryStub.IndienMethodCall("BestaatViaID", RandomKlantId).DanReturn($$$True)
+	Do RepositoryStub.IndienMethodCall("GeefViaID", RandomKlantId).DanReturn(DummyKlantData)
+	
+	Set ..KlantDataBepaler = ##class(DOM.VKP.impl.KlantDataBepaler).%New(RepositoryStub)
+		
+	#dim KlantDataDto As DOM.common.dto.KlantData = ..KlantDataBepaler.GeefKlantData(RandomPersonality, RandomKlantId)
+	
+	Do $$$AssertEquals(KlantDataDto.ID, DummyKlantData.ID)
+	Do $$$AssertEquals(KlantDataDto.Taal, DummyKlantData.Taal)
+	Do $$$AssertEquals(KlantDataDto.Naam, DummyKlantData.Naam)
+	Do $$$AssertEquals(KlantDataDto.Code, "123")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Anonieme Klant">
+<Implementation><![CDATA[
+	#dim RandomPersonality As DOM.common.Personality = ##class(DOM.common.DestilPersonality).Instance()
+	#dim RandomKlantId As TECH.String = "RandomKlantId"
+	#dim DummyKlantData As DOM.VKP.impl.DestilKlantData = ..GeefDummyAnoniemeKlantData("destil_123", "Taal", "Naam", "Email", "Straat", "Postcode", "Gemeente", "Telefoon", "Fax")
+	#dim RepositoryStub As vhTest.Mock.DOM.VKP.impl.KlantDataRepository = ##class(vhTest.Mock.DOM.VKP.impl.KlantDataRepository).%New()
+	
+	Do RepositoryStub.IndienMethodCall("BestaatViaID", RandomKlantId).DanReturn($$$True)
+	Do RepositoryStub.IndienMethodCall("GeefViaID", RandomKlantId).DanReturn(DummyKlantData)
+	
+	Set ..KlantDataBepaler = ##class(DOM.VKP.impl.KlantDataBepaler).%New(RepositoryStub)
+		
+	#dim KlantDataDto As DOM.common.dto.HandelKlantData = ..KlantDataBepaler.GeefKlantData(RandomPersonality, RandomKlantId)
+	
+	Do $$$AssertEquals(KlantDataDto.ID, DummyKlantData.ID)
+	Do $$$AssertEquals(KlantDataDto.Taal, DummyKlantData.Taal)
+	Do $$$AssertEquals(KlantDataDto.Naam, DummyKlantData.Naam)
+	Do $$$AssertEquals(KlantDataDto.EmailAdres, DummyKlantData.EmailAdres)
+	Do $$$AssertEquals(KlantDataDto.StraatEnNr, DummyKlantData.StraatEnNr)
+	Do $$$AssertEquals(KlantDataDto.Postcode, DummyKlantData.Postcode)
+	Do $$$AssertEquals(KlantDataDto.Gemeente, DummyKlantData.Gemeente)
+	Do $$$AssertEquals(KlantDataDto.TelefoonNummer, DummyKlantData.TelefoonNummer)
+	Do $$$AssertEquals(KlantDataDto.FaxNummer, DummyKlantData.FaxNummer)
+	Do $$$AssertEquals(KlantDataDto.Code, "123")
+]]></Implementation>
+</Method>
+
+<Method name="GeefDummyKlantData">
+<FormalSpec>Id:TECH.String,Taal:TECH.String,Naam:TECH.String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.impl.KlantData</ReturnType>
+<Implementation><![CDATA[
+	#dim DummyKlantData As DOM.VKP.impl.KlantData = ##class(DOM.VKP.impl.HeinKlantData).%New()
+		
+	Set DummyKlantData.ID = Id
+	Set DummyKlantData.Taal = Taal
+	Set DummyKlantData.Naam = Naam
+	
+	Quit DummyKlantData
+]]></Implementation>
+</Method>
+
+<Method name="GeefDummyAnoniemeKlantData">
+<FormalSpec>Id:TECH.String,Taal:TECH.String,Naam:TECH.String,Email:TECH.String,Straat:TECH.String,Postcode:TECH.String,Gemeente:TECH.String,Telefoon:TECH.String,Fax:TECH.String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.impl.HandelKlantData</ReturnType>
+<Implementation><![CDATA[
+	#dim DummyKlantData As DOM.VKP.impl.HandelKlantData = ##class(DOM.VKP.impl.DestilKlantData).%New()
+		
+	Set DummyKlantData.ID = Id
+	Set DummyKlantData.Taal = Taal
+	Set DummyKlantData.Naam = Naam
+	Set DummyKlantData.EmailAdres = Email
+	Set DummyKlantData.StraatEnNr = Straat
+	Set DummyKlantData.Postcode = Postcode
+	Set DummyKlantData.Gemeente = Gemeente
+	Set DummyKlantData.TelefoonNummer = Telefoon
+	Set DummyKlantData.FaxNummer = Fax
+	
+	Quit DummyKlantData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r32195 -r35974
--- DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 32195)
+++ DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 35974)
@@ -13,12 +13,32 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KlantDataRepository">
+<Type>DOM.VKP.impl.KlantDataRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>KlantDataRepository:DOM.VKP.impl.KlantDataRepository=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..KlantDataRepository = $$$Inject(KlantDataRepository, ##class(DOM.VKP.impl.KlantDataRepository).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefKlantData">
 <FormalSpec>Personality:DOM.common.Personality,KlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
 <ReturnType>DOM.common.dto.KlantData</ReturnType>
 <Implementation><![CDATA[
 	Set ..KlantID = KlantID
+	
 	Do Personality.Accept($this)
+	
 	Quit ..KlantDataDto
 ]]></Implementation>
 </Method>
@@ -27,61 +47,55 @@
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
-	If '##class(DOM.VKP.impl.SFSKlantData).%ExistsId(..KlantID) {
-		Set Exceptie = ##class(TECH.Exceptions.GeneralErrorException).%New("De SFS Klant '"_..KlantID_"' bestaat niet in de database")
-		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
-	}
-	Do ..StelInKlantDataDtoVoorHandel(##class(DOM.VKP.impl.SFSKlantData).OpenId(..KlantID),SFSPersonality.GeefPrefix())
+	
+	#dim KlantData As DOM.VKP.impl.SFSKlantData = ..OpenKlantData(..KlantID, SFSPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, SFSPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
-	If '##class(DOM.VKP.impl.HaefeleBEKlantData).%ExistsId(..KlantID) {
-		Set Exceptie = ##class(TECH.Exceptions.GeneralErrorException).%New("De Haefele Klant '"_..KlantID_"' bestaat niet in de database")
-		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
-	}
-	Do ..StelInKlantDataDtoVoorHandel(##class(DOM.VKP.impl.HaefeleBEKlantData).OpenId(..KlantID),HaefeleBEPersonality.GeefPrefix())
+	
+	#dim KlantData As DOM.VKP.impl.HaefeleBEKlantData = ..OpenKlantData(..KlantID, HaefeleBEPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, HaefeleBEPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
-	If '##class(DOM.VKP.impl.DestilKlantData).%ExistsId(..KlantID) {
-		Set Exceptie = ##class(TECH.Exceptions.GeneralErrorException).%New("De Destil Klant '"_..KlantID_"' bestaat niet in de database")
-		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
-	}
-	Do ..StelInKlantDataDtoVoorHandelAnoniem(##class(DOM.VKP.impl.DestilKlantData).OpenId(..KlantID),DestilPersonality.GeefPrefix())
+	
+	#dim KlantData As DOM.VKP.impl.DestilKlantData = ..OpenKlantData(..KlantID, DestilPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, DestilPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkDupont">
 <FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
-	If '##class(DOM.VKP.impl.DupontKlantData).%ExistsId(..KlantID) {
-		Set Exceptie = ##class(TECH.Exceptions.GeneralErrorException).%New("De Dupont Klant '"_..KlantID_"' bestaat niet in de database")
-		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
-	}
-	Do ..StelInKlantDataDtoVoorHandelAnoniem(##class(DOM.VKP.impl.DupontKlantData).OpenId(..KlantID),DupontPersonality.GeefPrefix())
+	
+	#dim KlantData As DOM.VKP.impl.DupontKlantData = ..OpenKlantData(..KlantID, DupontPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, DupontPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.KischKlantData).%New()
-	If '##class(DOM.VKP.impl.KischKlantData).%ExistsId(..KlantID) {
-		Set Exceptie = ##class(TECH.Exceptions.GeneralErrorException).%New("De Kisch Klant '"_..KlantID_"' bestaat niet in de database")
-		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
-	}
-	#dim KlantData As DOM.VKP.impl.KischKlantData = ##class(DOM.VKP.impl.KischKlantData).OpenId(..KlantID)
-	Do ..StelInKlantDataDtoVoorHandel(KlantData,KischPersonality.GeefPrefix())
 	
+	#dim KlantData As DOM.VKP.impl.KischKlantData = ..OpenKlantData(..KlantID, KischPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, KischPersonality.GeefPrefix())
+	
 	Set ..KlantDataDto.EmailAdres = KlantData.EmailAdres
 ]]></Implementation>
 </Method>
@@ -90,13 +104,11 @@
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.VanRaemdonckKlantData).%New()
-	If '##class(DOM.VKP.impl.VanRaemdonckKlantData).%ExistsId(..KlantID) {
-		Set Exceptie = ##class(TECH.Exceptions.GeneralErrorException).%New("De Klant '"_..KlantID_"', van handel Van Raemdonck, bestaat niet in de database")
-		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
-	}
-	#dim KlantData As DOM.VKP.impl.VanRaemdonckKlantData = ##class(DOM.VKP.impl.VanRaemdonckKlantData).OpenId(..KlantID)
-	Do ..StelInKlantDataDtoVoorHandel(KlantData,VanRaemdonckPersonality.GeefPrefix())
-
+	
+	#dim KlantData As DOM.VKP.impl.VanRaemdonckKlantData = ..OpenKlantData(..KlantID, VanRaemdonckPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, VanRaemdonckPersonality.GeefPrefix())
+	
 	Set ..KlantDataDto.EmailAdres = KlantData.EmailAdres
 ]]></Implementation>
 </Method>
@@ -105,18 +117,26 @@
 <FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.DaroKlantData).%New()
-	If '##class(DOM.VKP.impl.DaroKlantData).%ExistsId(..KlantID) {
-		Set Exceptie = ##class(TECH.Exceptions.GeneralErrorException).%New("De Daro Klant '"_..KlantID_"' bestaat niet in de database")
-		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
-	}
-
-	#dim KlantData As DOM.VKP.impl.DaroKlantData = ##class(DOM.VKP.impl.DaroKlantData).OpenId(..KlantID)
-	Do ..StelInKlantDataDtoVoorHandel(KlantData,DaroPersonality.GeefPrefix())
-
+	
+	#dim KlantData As DOM.VKP.impl.DaroKlantData = ..OpenKlantData(..KlantID, DaroPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, DaroPersonality.GeefPrefix())
+	
 	Set ..KlantDataDto.EmailAdres = KlantData.EmailAdres
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHein">
+<FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
+	
+	#dim KlantData As DOM.VKP.impl.HeinKlantData = ..OpenKlantData(..KlantID, HeinPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, HeinPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
 <Method name="StelInKlantDataDtoVoorHandel">
 <FormalSpec>KlantData:DOM.VKP.impl.KlantData,HandelPrefix:%String</FormalSpec>
 <Private>1</Private>
@@ -128,6 +148,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="OpenKlantData">
+<FormalSpec>KlantId:TECH.String,Personality:DOM.common.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.impl.KlantData</ReturnType>
+<Implementation><![CDATA[
+	If $$$Not(..KlantDataRepository.BestaatViaID(KlantId)) {
+		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("De " _ Personality.GeefNaam() _ " Klant '" _ KlantId _ "' bestaat niet in de database")
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+	
+	Quit ..KlantDataRepository.GeefViaID(KlantId)
+]]></Implementation>
+</Method>
+
 <Method name="StelInKlantDataDtoVoorHandelAnoniem">
 <FormalSpec>KlantData:DOM.VKP.impl.HandelKlantData,HandelPrefix:%String</FormalSpec>
 <Private>1</Private>