Merge pull request #24 from DatepollSystems/WR-342-virtualPrinter-id

WR-342: Use backend printer id for virtual printer path

Author: dev-Fabi

src/main/kotlin/org/datepollsystems/waiterrobot/mediator/printer/AbstractLocalPrinter.kt

@@ -2,6 +2,7 @@ package org.datepollsystems.waiterrobot.mediator.printer
 
 import org.apache.pdfbox.Loader
 import org.apache.pdfbox.pdmodel.PDDocument
+import org.datepollsystems.waiterrobot.mediator.core.ID
 import org.koin.core.component.KoinComponent
 import java.util.*
 
@@ -14,12 +15,12 @@ import java.util.*
  * @see org.datepollsystems.waiterrobot.mediator.printer.LocalPrinterTest.testPrint
  */
 abstract class AbstractLocalPrinter : LocalPrinterInfo, KoinComponent {
-    fun printPdf(pdfId: String, base64data: String) {
+    fun printPdf(pdfId: String, bePrinterId: ID, base64data: String) {
         val decoded = Base64.getDecoder().decode(base64data)
-        printPdf(pdfId, Loader.loadPDF(decoded))
+        printPdf(pdfId, bePrinterId, Loader.loadPDF(decoded))
     }
 
-    protected abstract fun printPdf(pdfId: String, document: PDDocument)
+    protected abstract fun printPdf(pdfId: String, bePrinterId: ID, document: PDDocument)
 
     override fun equals(other: Any?): Boolean {
         if (other !is AbstractLocalPrinter) return false

src/main/kotlin/org/datepollsystems/waiterrobot/mediator/printer/LocalPrinter.kt

@@ -2,18 +2,16 @@ package org.datepollsystems.waiterrobot.mediator.printer
 
 import org.apache.pdfbox.pdmodel.PDDocument
 import org.apache.pdfbox.printing.PDFPageable
+import org.datepollsystems.waiterrobot.mediator.core.ID
 import org.datepollsystems.waiterrobot.mediator.utils.sha256
 import java.awt.print.PrinterJob
 import javax.print.PrintService
 
 class LocalPrinter(private val service: PrintService) : AbstractLocalPrinter() {
     override val localId = service.name.sha256() // Name should be unique (on a system level)
-    override val name get() = service.name
+    override val name: String get() = service.name
 
-    override fun printPdf(
-        pdfId: String,
-        document: PDDocument,
-    ) {
+    override fun printPdf(pdfId: String, bePrinterId: ID, document: PDDocument) {
         val pageable = PDFPageable(document)
 
         val printJob = PrinterJob.getPrinterJob()

src/main/kotlin/org/datepollsystems/waiterrobot/mediator/printer/VirtualLocalPrinter.kt

@@ -2,22 +2,24 @@ package org.datepollsystems.waiterrobot.mediator.printer
 
 import org.apache.pdfbox.pdmodel.PDDocument
 import org.datepollsystems.waiterrobot.mediator.App
-import org.datepollsystems.waiterrobot.mediator.core.di.injectLogger
-import java.io.File
+import org.datepollsystems.waiterrobot.mediator.core.ID
+import org.datepollsystems.waiterrobot.mediator.core.di.injectLoggerForClass
 import kotlin.io.path.Path
+import kotlin.io.path.absolutePathString
 
-class VirtualLocalPrinter(number: Int) : AbstractLocalPrinter() {
-    override val localId: String = "virtualPrinter_$number"
-    override val name: String = "Virtual Printer $number"
-    private val basePath: File = Path(App.config.basePath, "virtualPrinters", number.toString()).toFile()
-    private val logger by injectLogger(this::class.simpleName + "#$localId")
+object VirtualLocalPrinter : AbstractLocalPrinter() {
+    override val localId: String = "virtualPrinter"
+    override val name: String = "Virtual Printer"
+    private val basePath: String = Path(App.config.basePath, "virtualPrinters").absolutePathString()
+    private val logger by injectLoggerForClass()
 
     init {
-        basePath.mkdirs()
-        logger.i("Will save to: ${basePath.absolutePath}")
+        logger.i("Will save to: $basePath")
     }
 
-    override fun printPdf(pdfId: String, document: PDDocument) {
-        document.save(File(basePath, "$pdfId.pdf"))
+    override fun printPdf(pdfId: String, bePrinterId: ID, document: PDDocument) {
+        val file = Path(basePath, bePrinterId.toString(), "$pdfId.pdf").toFile()
+        file.parentFile.mkdirs()
+        document.save(file)
     }
 }

src/main/kotlin/org/datepollsystems/waiterrobot/mediator/printer/service/PrinterDiscoverService.kt

@@ -24,7 +24,7 @@ object PrinterDiscoverService {
             .map { LocalPrinter(it) }
             .let {
                 if (App.config !is Config.Prod) {
-                    it.plus(VirtualLocalPrinter(1))
+                    it.plus(VirtualLocalPrinter)
                 } else {
                     it
                 }

src/main/kotlin/org/datepollsystems/waiterrobot/mediator/printer/service/PrinterService.kt

@@ -35,7 +35,7 @@ object PrinterService {
     private suspend fun print(pdfId: String, printerId: ID, base64data: String) {
         // TODO handle printer is not registered on this mediator (info to BE)
         val printerPairing = backendIdToPairing[printerId] ?: throw PrinterWithIdNotFoundException(printerId)
-        printerPairing.loPrinter.printPdf(pdfId, base64data)
+        printerPairing.loPrinter.printPdf(pdfId, printerPairing.bePrinter.id, base64data)
 
         printQueue.emit(PrintTransaction(pdfId, LocalDateTime.now(), printerPairing.bePrinter.name))
         // test is the id of the test pdf, no response expected by backend

src/test/kotlin/org/datepollsystems/waiterrobot/mediator/printer/LocalPrinterTest.kt

@@ -20,6 +20,6 @@ internal class LocalPrinterTest {
         val file = File("src/test/resources/testBill.pdf")
         val base64String = Base64.getEncoder().encodeToString(file.readBytes())
 
-        printer.printPdf("test", base64String)
+        printer.printPdf("test", 1, base64String)
     }
 }