Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r46643 -r46721
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 46643)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 46721)
@@ -13,8 +13,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="KlantIdValidator">
-<Type>APPS.CRM.impl.KlantIDValidator</Type>
+<Property name="PersonalityService">
+<Type>DOM.common.PersonalityService</Type>
 <Private>1</Private>
 </Property>
 
@@ -29,13 +29,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>KlantIdValidator:APPS.CRM.impl.KlantIDValidator="",KlantDataRepository:DOM.VKP.impl.KlantDataRepository="",KlantDataFactory:DOM.VKP.impl.KlantDataFactory=""</FormalSpec>
+<FormalSpec>PersonalityService:DOM.common.PersonalityService="",KlantDataRepository:DOM.VKP.impl.KlantDataRepository="",KlantDataFactory:DOM.VKP.impl.KlantDataFactory=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..KlantIdValidator = $$$Inject(KlantIdValidator, ##class(APPS.CRM.impl.KlantIDValidator).%New())
+	Set ..PersonalityService = $$$Inject(PersonalityService, ##class(DOM.common.impl.PersonalityService).%New())
 	Set ..KlantDataRepository = $$$Inject(KlantDataRepository, ##class(DOM.VKP.impl.KlantDataRepository).%New())
 	Set ..KlantDataFactory = $$$Inject(KlantDataFactory, ##class(DOM.VKP.impl.KlantDataFactory).%New())
 	
@@ -71,7 +71,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, SFSPersonality)
 	
-	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, SFSPersonality)
+	Do ..ValideerKlantId(..KlantDataDto.ID, SFSPersonality)
 	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -81,7 +81,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HaefeleBEPersonality)
 	
-	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, HaefeleBEPersonality)
+	Do ..ValideerKlantId(..KlantDataDto.ID, HaefeleBEPersonality)
 	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -91,7 +91,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HaefeleNLPersonality)
 	
-	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, HaefeleNLPersonality)
+	Do ..ValideerKlantId(..KlantDataDto.ID, HaefeleNLPersonality)
 	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -101,8 +101,8 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HeinPersonality)
 	
-	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, HeinPersonality)
-	Do ..ConverteerHandelKlantData(..KlantData, ..KlantDataDto)
+	Do ..ValideerKlantId(..KlantDataDto.ID, HeinPersonality)
+	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
 
@@ -111,8 +111,8 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, SeefelderPersonality)
 	
-	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, SeefelderPersonality)
-	Do ..ConverteerHandelKlantData(..KlantData, ..KlantDataDto)
+	Do ..ValideerKlantId(..KlantDataDto.ID, SeefelderPersonality)
+	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
 
@@ -121,7 +121,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, DestilPersonality)
 	
-	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, DestilPersonality)
+	Do ..ValideerKlantId(..KlantDataDto.ID, DestilPersonality)
 	Do ..ConverteerHandelKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -131,7 +131,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, DupontPersonality)
 	
-	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, DupontPersonality)
+	Do ..ValideerKlantId(..KlantDataDto.ID, DupontPersonality)
 	Do ..ConverteerHandelKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -141,7 +141,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, VanRaemdonckPersonality)
 	
-	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, VanRaemdonckPersonality)
+	Do ..ValideerKlantId(..KlantDataDto.ID, VanRaemdonckPersonality)
 	Do ..ConverteerVanRaemdonckKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -151,7 +151,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, KischPersonality)
 	
-	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, KischPersonality)
+	Do ..ValideerKlantId(..KlantDataDto.ID, KischPersonality)
 	Do ..ConverteerKischKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -161,7 +161,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, DaroPersonality)
 	
-	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, DaroPersonality)
+	Do ..ValideerKlantId(..KlantDataDto.ID, DaroPersonality)
 	Do ..ConverteerDaroKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -237,6 +237,13 @@
 	Set KlantData.EmailAdres = KlantDataDto.EmailAdres
 ]]></Implementation>
 </Method>
+
+<Method name="ValideerKlantId">
+<FormalSpec>KlantId:%String,Personality:DOM.common.Personality</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	do:$$$Not(..PersonalityService.IsGeldigKlantId(Personality,KlantId)) ##class(TECH.Exceptions.InvalidInputException).Throw("De klant '"_KlantId_"' is niet geldig voor personality '"_##class(DOM.common.enu.Personality).LogicalToDisplay(Personality.GeefID())_"'.")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml
===================================================================
diff -u -r36001 -r46721
--- vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml	(.../Test.cls.xml)	(revision 36001)
+++ vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml	(.../Test.cls.xml)	(revision 46721)
@@ -56,17 +56,17 @@
 	#dim Personality As DOM.common.Personality = ##class(DOM.common.impl.Personality).OpenId(RandomPersonalityEnum)
 	#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, Personality)
-
+	#dim PersonalityServiceStub As vhTest.Mock.DOM.common.PersonalityService = ##class(vhTest.Mock.DOM.common.PersonalityService).%New()
+	do PersonalityServiceStub.IndienMethodCall("IsGeldigKlantId",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$True)
+	
 	#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.DOM.VKP.impl.KlantDataFactory = ##class(vhTest.Mock.DOM.VKP.impl.KlantDataFactory).%New()
 	Do KlantDataFactoryMock.VerwachtMethodCall("Maak", RandomPersonalityEnum).DanReturn(RandomKlantData)
 	
-	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(KlantIdValidatorStub, KlantDataRepositoryStub, KlantDataFactoryMock)
+	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(PersonalityServiceStub, KlantDataRepositoryStub, KlantDataFactoryMock)
 	Do KlantDataBewaarder.Bewaar(Personality, ##class(DOM.common.dto.HandelKlantData).%New())
 	
 	Do KlantDataFactoryMock.Verifieer()
@@ -80,19 +80,19 @@
 	#dim DummyKlantData As DOM.VKP.impl.KlantData = ..DummyKlantDataFactory.Maak(PersonalityEnum)
 	#dim Personality As DOM.common.Personality = ##class(DOM.common.impl.Personality).OpenId(PersonalityEnum)
 	
-	#dim KlantIdValidatorMock As vhTest.Mock.APPS.CRM.KlantIDValidator = ##class(vhTest.Mock.APPS.CRM.KlantIDValidator).%New()
-	Do KlantIdValidatorMock.VerwachtMethodCall("Valideer", $$$ElkeWaarde, Personality)
+	#dim PersonalityServiceMock As vhTest.Mock.DOM.common.PersonalityService = ##class(vhTest.Mock.DOM.common.PersonalityService).%New()
+	do PersonalityServiceMock.VerwachtMethodCall("IsGeldigKlantId",Personality,KlantDataDto.ID).DanReturn($$$True)
 	
 	#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 KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(KlantIdValidatorMock, KlantDataRepositoryMock)
+	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(PersonalityServiceMock, KlantDataRepositoryMock)
 	Do KlantDataBewaarder.Bewaar(Personality, KlantDataDto)
 	
 	Do KlantDataRepositoryMock.Verifieer()
-	Do KlantIdValidatorMock.Verifieer()
+	Do PersonalityServiceMock.Verifieer()
 ]]></Implementation>
 </Method>