Index: vhUnitTest/WSimpl/Halux/LaserGraveerMachine/LaserDataService/GeefLogoDataViaVerwerkingId/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Halux/LaserGraveerMachine/LaserDataService/GeefLogoDataViaVerwerkingId/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Halux/LaserGraveerMachine/LaserDataService/GeefLogoDataViaVerwerkingId/Test.cls.xml	(revision 74020)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Halux.LaserGraveerMachine.LaserDataService.GeefLogoDataViaVerwerkingId.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Lege verwerkingId =&gt; Geeft InvalidInputException">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.LaserGraveerMachine.GeefLaserDataRequest).%New()
+	
+	Set LaserDataService = ##class(WSimpl.Halux.LaserGraveerMachine.LaserDataService).%New()
+	#dim Response As WS.Halux.LaserGraveerMachine.GeefLaserDataResponse = LaserDataService.GeefLogoDataViaVerwerkingId(Request)
+	
+	Do $$$AssertEquals(Response.Header.Status,##class(TECH.enu.ExceptionCode).InvalidInput())
+	Do $$$AssertEquals(Response.Header.Omschrijving,"Property 'VerwerkingId' cannot be empty.")
+]]></Implementation>
+</Method>
+
+<Method name="Test: VerwerkingId zonder achterliggende data =&gt; Geeft DataNotFoundException">
+<Implementation><![CDATA[
+	#dim VerwerkingId As %String = "XXX"
+	
+	Set Request = ##class(WS.Halux.LaserGraveerMachine.GeefLaserDataRequest).%New()
+	Set Request.VerwerkingId = VerwerkingId
+	
+	Set LaserDataRepositoryMock = ##class(vhTest.Mock.DOM.Halux.LaserGraveerMachine.LaserDataRepository).%New()
+	Do LaserDataRepositoryMock.VerwachtMethodCall("ZoekViaVerwerkingId", VerwerkingId).DanReturn("")
+	
+	Set LaserDataService = ##class(WSimpl.Halux.LaserGraveerMachine.LaserDataService).%New(LaserDataRepositoryMock)
+	#dim Response As WS.Halux.LaserGraveerMachine.GeefLaserDataResponse = LaserDataService.GeefLogoDataViaVerwerkingId(Request)
+	
+	Do $$$AssertEquals(Response.Header.Status,##class(TECH.enu.ExceptionCode).DataNotFound())
+	Do $$$AssertEquals(Response.Header.Omschrijving,"Data not found for Id '"_VerwerkingId_"'.")
+	
+	Do LaserDataRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: standaardgedrag =&gt; data gevonden">
+<Implementation><![CDATA[
+	#dim VerwerkingId As %String = "XYZ"
+	
+	Set Request = ##class(WS.Halux.LaserGraveerMachine.GeefLaserDataRequest).%New()
+	Set Request.VerwerkingId = VerwerkingId
+	
+	Set LaserDataRepositoryMock = ##class(vhTest.Mock.DOM.Halux.LaserGraveerMachine.LaserDataRepository).%New()
+	Do LaserDataRepositoryMock.VerwachtMethodCall("ZoekViaVerwerkingId", VerwerkingId).DanReturn(..GeefLaserDataDto(VerwerkingId))
+	
+	Set LaserDataService = ##class(WSimpl.Halux.LaserGraveerMachine.LaserDataService).%New(LaserDataRepositoryMock)
+	#dim Response As WS.Halux.LaserGraveerMachine.GeefLaserDataResponse = LaserDataService.GeefLogoDataViaVerwerkingId(Request)
+	
+	Do $$$AssertEquals(Response.KortTekst, "DummyKortTekst")
+	Do $$$AssertEquals(Response.VerwerkingId, VerwerkingId)
+	
+	Do LaserDataRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefLaserDataDto">
+<FormalSpec>VerwerkingId:%String</FormalSpec>
+<ReturnType>DOM.Halux.LaserGraveerMachine.dto.LaserData</ReturnType>
+<Implementation><![CDATA[
+	Set LaserDataDto = ##class(DOM.Halux.LaserGraveerMachine.dto.LaserData).%New()
+	
+	Set LaserDataDto.KortTekst = "DummyKortTekst"
+	Set LaserDataDto.VerwerkingId = VerwerkingId
+	
+	Quit LaserDataDto
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Halux/LaserGraveerMachine/LaserDataService.cls.xml
===================================================================
diff -u -r74018 -r74020
--- WSimpl/Halux/LaserGraveerMachine/LaserDataService.cls.xml	(.../LaserDataService.cls.xml)	(revision 74018)
+++ WSimpl/Halux/LaserGraveerMachine/LaserDataService.cls.xml	(.../LaserDataService.cls.xml)	(revision 74020)
@@ -3,27 +3,58 @@
 <Class name="WSimpl.Halux.LaserGraveerMachine.LaserDataService">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="LaserDataRepository">
+<Type>DOM.Halux.LaserGraveerMachine.LaserDataRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
+<FormalSpec>LaserDataRepository:DOM.Halux.LaserGraveerMachine.LaserDataRepository=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[	Quit $$$OK
+<Implementation><![CDATA[
+	Set ..LaserDataRepository = $$$Inject(LaserDataRepository, ##class(DOM.Halux.LaserGraveerMachine.LaserDataRepository).%New())
+	
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLogoDataViaVerwerkingId">
 <FormalSpec>GeefLogoDataRequest:WS.Halux.LaserGraveerMachine.GeefLaserDataRequest</FormalSpec>
 <ReturnType>WS.Halux.LaserGraveerMachine.GeefLaserDataResponse</ReturnType>
 <Implementation><![CDATA[
+	Do ##class(Tools.Wlip).%New(26).String("DD")
 	Set Response = ##class(WS.Halux.LaserGraveerMachine.GeefLaserDataResponse).%New()
+	Do ##class(Tools.Wlip).%New(26).String("N")
+	Try {
+		Do ##class(Tools.Wlip).%New(26).String("VerwerkingId: " _ GeefLogoDataRequest.VerwerkingId)
+		#dim VerwerkingId As %String = GeefLogoDataRequest.VerwerkingId
+		Do ##class(Tools.Wlip).%New(26).String("DDD")
+		If (VerwerkingId = "") {
+			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Property 'VerwerkingId' cannot be empty.")
+		}
+		Do ##class(Tools.Wlip).%New(26).String("Hup")
+		#dim LogoData As DOM.Halux.LaserGraveerMachine.dto.LaserData = ..LaserDataRepository.ZoekViaVerwerkingId(VerwerkingId)
+		Do ##class(Tools.Wlip).%New(26).ObjToText(..LaserDataRepository)
+		Do ##class(Tools.Wlip).%New(26).String(LogoData)
+		If $$$Not($IsObject(LogoData)) {
+			Do ##class(TECH.Exceptions.DataNotFoundException).Throw("Data not found for Id '"_ VerwerkingId _"'.")
+		}
+		
+		Set Response.KortTekst = LogoData.KortTekst
+		Set Response.LadeKleur = LogoData.LadeKleur
+		Set Response.LogoId = LogoData.LogoId
+		Set Response.ProductId = LogoData.ProductId
+		Set Response.Referentie = LogoData.Referentie
+		Set Response.VerwerkingId = LogoData.VerwerkingId
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Set Response.Header.Status = Exception.GeefExceptionCode()
+		Set Response.Header.Omschrijving = Exception.GeefOmschrijving()
+	}
 	
-	Set Response.KortTekst = "123"
-	Set Response.LogoId = "123"
-	Set Response.LadeKleur = "456"
-	Set Response.ProductId = "123"
-	Set Response.VerwerkingId = GeefLogoDataRequest.VerwerkingId
-	
 	Quit Response
 ]]></Implementation>
 </Method>