Index: vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml	(revision 35973)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.VKP.impl.KlantDataBewaarder.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="DummyKlantDataFactory">
+<Type>APPS.VKP.impl.KlantDataFactory</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	
+	Set ..DummyKlantDataFactory = ##class(APPS.VKP.impl.KlantDataFactory).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geldige HandelKlantData voor Personalities Destil en Dupont wordt bewaard">
+<Implementation><![CDATA[
+	#dim HandelKlantDataDto As DOM.common.dto.HandelKlantData = ##class(DOM.common.dto.HandelKlantData).%New()
+	
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.DestilPersonality).Instance(), HandelKlantDataDto)
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.DupontPersonality).Instance(), HandelKlantDataDto)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geldige KlantData voor Personalities SFS, HaefeleBE en Hein wordt bewaard">
+<Implementation><![CDATA[
+	#dim KlantDataDto As DOM.common.dto.KlantData = ##class(DOM.common.dto.KlantData).%New()
+	
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.SFSPersonality).Instance(), KlantDataDto)
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.HaefeleBEPersonality).Instance(), KlantDataDto)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geldige KlantData met email voor Personalities VanRaemdonck, Kisch en Daro wordt bewaard">
+<Implementation><![CDATA[
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.VanRaemdonckPersonality).Instance(), ##class(DOM.common.dto.VanRaemdonckKlantData).%New())
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.KischPersonality).Instance(), ##class(DOM.common.dto.KischKlantData).%New())
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.DaroPersonality).Instance(), ##class(DOM.common.dto.DaroKlantData).%New())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Exceptie wordt geraised indien KlantData wordt bewaard voor Personalities VanHoecke en VanHoeckeVoorHalux">
+<Implementation><![CDATA[
+	Do ..AssertExceptie(##class(DOM.common.VanHoeckeVoorHaluxPersonality).Instance(), "Mag niet werken voor personality VanHoeckeVoorHalux")
+	Do ..AssertExceptie(##class(DOM.common.VanHoeckePersonality).Instance(), "Mag niet werken voor personality VanHoecke")
+]]></Implementation>
+</Method>
+
+<Method name="Test: KlantDataFactory wordt opgeroepen indien onbestaande KlantData">
+<Implementation><![CDATA[
+	#dim RandomPersonality As DOM.common.Personality = ##class(DOM.common.DestilPersonality).Instance()
+	#dim RandomKlantData As DOM.VKP.impl.KlantData = ##class(DOM.VKP.impl.DestilKlantData).%New()
+	
+	#dim KlantIdValidatorStub As vhTest.Mock.APPS.CRM.KlantIDValidator = ##class(vhTest.Mock.APPS.CRM.KlantIDValidator).%New()
+	Do KlantIdValidatorStub.IndienMethodCall("Valideer", $$$ElkeWaarde, RandomPersonality)
+	
+	#dim KlantServiceStub As vhTest.Mock.APPS.CRM.KlantService = ##class(vhTest.Mock.APPS.CRM.KlantService).%New()
+	Do KlantServiceStub.IndienMethodCall("GeefKlantIDValidator").DanReturn(KlantIdValidatorStub)
+	
+	#dim KlantDataRepositoryStub As vhTest.Mock.DOM.VKP.impl.KlantDataRepository = ##class(vhTest.Mock.DOM.VKP.impl.KlantDataRepository).%New()
+	Do KlantDataRepositoryStub.IndienMethodCall("BestaatViaID", $$$ElkeWaarde).DanReturn($$$False)
+	Do KlantDataRepositoryStub.IndienMethodCall("Bewaar", RandomKlantData)
+	
+	#dim KlantDataFactoryMock As vhTest.Mock.APPS.VKP.impl.KlantDataFactory = ##class(vhTest.Mock.APPS.VKP.impl.KlantDataFactory).%New()
+	Do KlantDataFactoryMock.VerwachtMethodCall("MaakKlantData", RandomPersonality).DanReturn(RandomKlantData)
+	
+	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(KlantServiceStub, KlantDataRepositoryStub, KlantDataFactoryMock)
+	Do KlantDataBewaarder.Bewaar(RandomPersonality, ##class(DOM.common.dto.HandelKlantData).%New())
+	
+	Do KlantDataFactoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="AssertBewaarOpgeroepen">
+<FormalSpec>Personality:DOM.common.Personality,KlantDataDto:DOM.common.dto.KlantData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim DummyKlantData As DOM.VKP.impl.KlantData = ..DummyKlantDataFactory.MaakKlantData(Personality)
+	
+	#dim KlantIdValidatorMock As vhTest.Mock.APPS.CRM.KlantIDValidator = ##class(vhTest.Mock.APPS.CRM.KlantIDValidator).%New()
+	Do KlantIdValidatorMock.VerwachtMethodCall("Valideer", $$$ElkeWaarde, Personality)
+	
+	#dim KlantDataRepositoryMock As vhTest.Mock.DOM.VKP.impl.KlantDataRepository = ##class(vhTest.Mock.DOM.VKP.impl.KlantDataRepository).%New()
+	Do KlantDataRepositoryMock.VerwachtMethodCall("BestaatViaID", KlantDataDto.ID).DanReturn($$$True)
+	Do KlantDataRepositoryMock.VerwachtMethodCall("GeefViaID", KlantDataDto.ID).DanReturn(DummyKlantData)
+	Do KlantDataRepositoryMock.VerwachtMethodCall("Bewaar", DummyKlantData)
+	
+	#dim KlantServiceMock As vhTest.Mock.APPS.CRM.KlantService = ##class(vhTest.Mock.APPS.CRM.KlantService).%New()
+	Do KlantServiceMock.VerwachtMethodCall("GeefKlantIDValidator").DanReturn(KlantIdValidatorMock)
+	
+	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(KlantServiceMock, KlantDataRepositoryMock)
+	Do KlantDataBewaarder.Bewaar(Personality, KlantDataDto)
+	
+	Do KlantServiceMock.Verifieer()
+	Do KlantDataRepositoryMock.Verifieer()
+	Do KlantIdValidatorMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="AssertExceptie">
+<FormalSpec>Personality:DOM.common.Personality,Omschrijving:TECH.String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes(Omschrijving)
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.GeneralErrorException).%ClassName(1), Substrings))
+	
+	#dim KlantDataDto As DOM.common.dto.VanHoeckeKlantData = ##class(DOM.common.dto.KlantData).%New()
+	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New()
+	
+	Do KlantDataBewaarder.Bewaar(Personality, KlantDataDto)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r32194 -r35973
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 32194)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 35973)
@@ -3,10 +3,6 @@
 <Class name="APPS.VKP.impl.KlantDataBewaarder">
 <Super>APPS.VKP.KlantDataBewaarder,DOM.common.PersonalityVisitor</Super>
 
-<Property name="KlantID">
-<Type>%String</Type>
-</Property>
-
 <Property name="KlantData">
 <Type>DOM.VKP.impl.KlantData</Type>
 <Private>1</Private>
@@ -17,188 +13,198 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KlantService">
+<Type>APPS.CRM.KlantService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantDataRepository">
+<Type>DOM.VKP.impl.KlantDataRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantDataFactory">
+<Type>APPS.VKP.impl.KlantDataFactory</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>KlantService:APPS.CRM.KlantService,KlantDataRepository:DOM.VKP.impl.KlantDataRepository="",KlantDataFactory:APPS.VKP.impl.KlantDataFactory=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..KlantService = $$$Inject(KlantService, ##class(APPS.CRM.KlantService).%New())
+	Set ..KlantDataRepository = $$$Inject(KlantDataRepository, ##class(DOM.VKP.impl.KlantDataRepository).%New())
+	Set ..KlantDataFactory = $$$Inject(KlantDataFactory, ##class(APPS.VKP.impl.KlantDataFactory).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Bewaar">
 <FormalSpec>Personality:DOM.common.Personality,KlantDataDto:DOM.common.dto.KlantData</FormalSpec>
 <Implementation><![CDATA[
 	Set ..KlantDataDto = KlantDataDto
 	
-	Set ..KlantID = KlantDataDto.ID
 	Do Personality.Accept($this)
-	Set ..KlantData.Personality = Personality.GeefID()
-		
-	Do ..BewaarKlantData()
 
-	Do ..KlantData.Save()
+	Do ..KlantDataRepository.Bewaar(..KlantData)
 ]]></Implementation>
 </Method>
 
-<Method name="BewaarKlantData">
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set ..KlantData.Naam = ..KlantDataDto.Naam
-	Set ..KlantData.ID = ..KlantDataDto.ID
-	Set ..KlantData.Taal = ..KlantDataDto.Taal
+<Method name="VerwerkVanHoecke">
+<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
+<Implementation><![CDATA[	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Mag niet werken voor personality VanHoecke"))
 ]]></Implementation>
 </Method>
 
-<Method name="BewaarHandelKlantData">
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim HandelKlantDataDto As DOM.common.dto.HandelKlantData = ..KlantDataDto
-	#dim KlantData As DOM.VKP.impl.HandelKlantData = ..KlantData
-	Set KlantData.EmailAdres = HandelKlantDataDto.EmailAdres
-	Set KlantData.FaxNummer = HandelKlantDataDto.FaxNummer
-	Set KlantData.Gemeente = HandelKlantDataDto.Gemeente
-	Set KlantData.Naam = HandelKlantDataDto.Naam
-	Set KlantData.Postcode = HandelKlantDataDto.Postcode
-	Set KlantData.StraatEnNr = HandelKlantDataDto.StraatEnNr
-	Set KlantData.TelefoonNummer = HandelKlantDataDto.TelefoonNummer
+<Method name="VerwerkVanHoeckeVoorHalux">
+<FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Mag niet werken voor personality VanHoeckeVoorHalux"))
 ]]></Implementation>
 </Method>
 
-<Method name="BewaarKischKlantData">
-<Private>1</Private>
+<Method name="VerwerkSFS">
+<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[
-	#dim HandelKlantDataDto As DOM.common.dto.KischKlantData = ..KlantDataDto
-	#dim KlantData As DOM.VKP.impl.KischKlantData = ..KlantData
-	Set KlantData.EmailAdres = HandelKlantDataDto.EmailAdres
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, SFSPersonality)
+	
+	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, SFSPersonality)
+	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
 
-<Method name="BewaarVanRaemdonckKlantData">
-<Private>1</Private>
+<Method name="VerwerkHaefeleBE">
+<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
 <Implementation><![CDATA[
-	#dim HandelKlantDataDto As DOM.common.dto.VanRaemdonckKlantData = ..KlantDataDto
-	#dim KlantData As DOM.VKP.impl.VanRaemdonckKlantData = ..KlantData
-	Set KlantData.EmailAdres = HandelKlantDataDto.EmailAdres
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HaefeleBEPersonality)
+	
+	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, HaefeleBEPersonality)
+	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
 
-<Method name="BewaarDaroKlantData">
-<Private>1</Private>
+<Method name="VerwerkDestil">
+<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[
-	#dim HandelKlantDataDto As DOM.common.dto.DaroKlantData = ..KlantDataDto
-	#dim KlantData As DOM.VKP.impl.DaroKlantData = ..KlantData
-	Set KlantData.EmailAdres = HandelKlantDataDto.EmailAdres
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, DestilPersonality)
+	
+	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, DestilPersonality)
+	Do ..ConverteerHandelKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkSFS">
-<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
+<Method name="VerwerkDupont">
+<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
 <Implementation><![CDATA[
-	#dim CRMService As APPS.CRM.KlantService = ##class(APPS.CRM.KlantService).%New()
-	do CRMService.GeefKlantIDValidator().Valideer(..KlantID , SFSPersonality)
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, DupontPersonality)
 	
-	If ##class(DOM.VKP.impl.SFSKlantData).%ExistsId(..KlantID) {
-		Set ..KlantData = ##class(DOM.VKP.impl.SFSKlantData).OpenId(..KlantID)
-	} Else {
-		Set ..KlantData = ##class(DOM.VKP.impl.SFSKlantData).%New()
-	}
+	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, DupontPersonality)
+	Do ..ConverteerHandelKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkVanHoecke">
-<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
-<Implementation><![CDATA[	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralException).%New("Mag niet werken voor Van Hoecke"))
+<Method name="VerwerkVanRaemdonck">
+<FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, VanRaemdonckPersonality)
+	
+	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, VanRaemdonckPersonality)
+	Do ..ConverteerVanRaemdonckKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkVanHoeckeVoorHalux">
-<FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralException).%New("Mag niet werken voor Van Hoecke Voor Halux"))
+<Method name="VerwerkKisch">
+<FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, KischPersonality)
+	
+	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, KischPersonality)
+	Do ..ConverteerKischKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkHaefeleBE">
-<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
+<Method name="VerwerkDaro">
+<FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
 <Implementation><![CDATA[
-	#dim CRMService As APPS.CRM.KlantService = ##class(APPS.CRM.KlantService).%New()
-	do CRMService.GeefKlantIDValidator().Valideer(..KlantID , HaefeleBEPersonality)
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, DaroPersonality)
 	
-	If ##class(DOM.VKP.impl.HaefeleBEKlantData).%ExistsId(..KlantID) {
-		Set ..KlantData = ##class(DOM.VKP.impl.HaefeleBEKlantData).OpenId(..KlantID)
-	} Else {
-		Set ..KlantData = ##class(DOM.VKP.impl.HaefeleBEKlantData).%New()
-	}
+	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, DaroPersonality)
+	Do ..ConverteerDaroKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkVanRaemdonck">
-<FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
+<Method name="GeefKlantData">
+<FormalSpec>KlantId:TECH.String,Personality:DOM.common.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.impl.KlantData</ReturnType>
 <Implementation><![CDATA[
-	#dim CRMService As APPS.CRM.KlantService = ##class(APPS.CRM.KlantService).%New()
-	do CRMService.GeefKlantIDValidator().Valideer(..KlantID , VanRaemdonckPersonality)
+	#dim KlantData As DOM.VKP.impl.KlantData
 	
-	If ##class(DOM.VKP.impl.VanRaemdonckKlantData).%ExistsId(..KlantID) {
-		Set ..KlantData = ##class(DOM.VKP.impl.VanRaemdonckKlantData).OpenId(..KlantID)
+	If (..KlantDataRepository.BestaatViaID(KlantId)) {
+		Set KlantData = ..KlantDataRepository.GeefViaID(KlantId)	
 	} Else {
-		Set ..KlantData = ##class(DOM.VKP.impl.VanRaemdonckKlantData).%New()
+		Set KlantData = ..KlantDataFactory.MaakKlantData(Personality)
 	}
+	
+	Quit KlantData
+]]></Implementation>
+</Method>
 
-	Do ..BewaarVanRaemdonckKlantData()
+<Method name="ConverteerKlantData">
+<FormalSpec><![CDATA[&KlantData:DOM.VKP.impl.KlantData,KlantDataDto:DOM.common.dto.KlantData]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set KlantData.ID = KlantDataDto.ID
+	Set KlantData.Naam = KlantDataDto.Naam
+	Set KlantData.Taal = KlantDataDto.Taal
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkDestil">
-<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
+<Method name="ConverteerHandelKlantData">
+<FormalSpec><![CDATA[&KlantData:DOM.VKP.impl.HandelKlantData,KlantDataDto:DOM.common.dto.HandelKlantData]]></FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim CRMService As APPS.CRM.KlantService = ##class(APPS.CRM.KlantService).%New()
-	do CRMService.GeefKlantIDValidator().Valideer(..KlantID , DestilPersonality)
+	Do ..ConverteerKlantData(.KlantData, KlantDataDto)
 	
-	If ##class(DOM.VKP.impl.DestilKlantData).%ExistsId(..KlantID) {
-		Set ..KlantData = ##class(DOM.VKP.impl.DestilKlantData).OpenId(..KlantID)
-	} Else {
-		Set ..KlantData = ##class(DOM.VKP.impl.DestilKlantData).%New()
-	}
-	
-	Do ..BewaarHandelKlantData()
+	Set KlantData.EmailAdres = KlantDataDto.EmailAdres
+	Set KlantData.FaxNummer = KlantDataDto.FaxNummer
+	Set KlantData.Gemeente = KlantDataDto.Gemeente
+	Set KlantData.Postcode = KlantDataDto.Postcode
+	Set KlantData.StraatEnNr = KlantDataDto.StraatEnNr
+	Set KlantData.TelefoonNummer = KlantDataDto.TelefoonNummer
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkDupont">
-<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
+<Method name="ConverteerVanRaemdonckKlantData">
+<FormalSpec><![CDATA[&KlantData:DOM.VKP.impl.VanRaemdonckKlantData,KlantDataDto:DOM.common.dto.VanRaemdonckKlantData]]></FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim CRMService As APPS.CRM.KlantService = ##class(APPS.CRM.KlantService).%New()
-	do CRMService.GeefKlantIDValidator().Valideer(..KlantID , DupontPersonality)
+	Do ..ConverteerKlantData(.KlantData, KlantDataDto)
 	
-	If ##class(DOM.VKP.impl.DupontKlantData).%ExistsId(..KlantID) {
-		Set ..KlantData = ##class(DOM.VKP.impl.DupontKlantData).OpenId(..KlantID)
-	} Else {
-		Set ..KlantData = ##class(DOM.VKP.impl.DupontKlantData).%New()
-	}
-	
-	Do ..BewaarHandelKlantData()
+	Set KlantData.EmailAdres = KlantDataDto.EmailAdres
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkKisch">
-<FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
+<Method name="ConverteerKischKlantData">
+<FormalSpec><![CDATA[&KlantData:DOM.VKP.impl.KischKlantData,KlantDataDto:DOM.common.dto.KischKlantData]]></FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim CRMService As APPS.CRM.KlantService = ##class(APPS.CRM.KlantService).%New()
-	do CRMService.GeefKlantIDValidator().Valideer(..KlantID , KischPersonality)
+	Do ..ConverteerKlantData(.KlantData, KlantDataDto)
 	
-	If ##class(DOM.VKP.impl.KischKlantData).%ExistsId(..KlantID) {
-		Set ..KlantData = ##class(DOM.VKP.impl.KischKlantData).OpenId(..KlantID)
-	} Else {
-		Set ..KlantData = ##class(DOM.VKP.impl.KischKlantData).%New()
-	}
-	Do ..BewaarKischKlantData()
+	Set KlantData.EmailAdres = KlantDataDto.EmailAdres
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkDaro">
-<FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
+<Method name="ConverteerDaroKlantData">
+<FormalSpec><![CDATA[&KlantData:DOM.VKP.impl.DaroKlantData,KlantDataDto:DOM.common.dto.DaroKlantData]]></FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim CRMService As APPS.CRM.KlantService = ##class(APPS.CRM.KlantService).%New()
-	do CRMService.GeefKlantIDValidator().Valideer(..KlantID , DaroPersonality)
+	Do ..ConverteerKlantData(.KlantData, KlantDataDto)
 	
-	If ##class(DOM.VKP.impl.DaroKlantData).%ExistsId(..KlantID) {
-		Set ..KlantData = ##class(DOM.VKP.impl.DaroKlantData).OpenId(..KlantID)
-	} Else {
-		Set ..KlantData = ##class(DOM.VKP.impl.DaroKlantData).%New()
-	}
-	
-	Do ..BewaarDaroKlantData()
+	Set KlantData.EmailAdres = KlantDataDto.EmailAdres
 ]]></Implementation>
 </Method>
 </Class>