From 1cba8e87a4ee061ab2cc12cbc795c8acb3c74c12 Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Sun, 26 Nov 2023 13:17:49 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20Inbox=E3=81=AE=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=96=E3=82=AD=E3=83=A5=E3=83=BC=E3=82=92=E5=9E=8B=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E3=82=B8=E3=83=A7=E3=83=96=E3=82=AD=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E5=AE=9F=E8=A3=85=E3=81=AB=E5=88=87=E3=82=8A=E6=9B=BF=E3=81=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/tmp/InboxJobProcessor.kt          | 11 +++++++-
 .../application/config/JobQueueRunner.kt      | 27 ++++++++++---------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/InboxJobProcessor.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/InboxJobProcessor.kt
index 99ad3fb9..e33da23b 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/InboxJobProcessor.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/InboxJobProcessor.kt
@@ -7,7 +7,9 @@ import dev.usbharu.hideout.activitypub.service.common.ActivityType
 import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
 import dev.usbharu.hideout.core.external.job.InboxJob
+import dev.usbharu.hideout.core.external.job.InboxJobParam
 import dev.usbharu.hideout.core.query.UserQueryService
+import dev.usbharu.hideout.core.service.job.JobProcessor
 import dev.usbharu.hideout.util.RsaUtil
 import dev.usbharu.httpsignature.common.HttpHeaders
 import dev.usbharu.httpsignature.common.HttpRequest
@@ -27,7 +29,7 @@ class InboxJobProcessor(
     private val signatureVerifier: HttpSignatureVerifier,
     private val userQueryService: UserQueryService,
     private val apUserService: APUserService
-) {
+) : JobProcessor<InboxJobParam, InboxJob> {
     suspend fun process(props: JobProps<InboxJob>) {
 
         val type = ActivityType.valueOf(props[InboxJob.type])
@@ -90,6 +92,13 @@ class InboxJobProcessor(
         }
     }
 
+    override suspend fun process(param: InboxJobParam) {
+        println(param)
+        System.err.println("aaaaaaaaaaaaaaaaaaaaaaaaaaa")
+    }
+
+    override fun job(): InboxJob = InboxJob
+
     companion object {
         private val logger = LoggerFactory.getLogger(InboxJobProcessor::class.java)
     }
diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt b/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt
index bb22e6d6..cc1580ea 100644
--- a/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt
@@ -34,19 +34,20 @@ class JobQueueWorkerRunner(
 ) : ApplicationRunner {
     override fun run(args: ApplicationArguments?) {
         LOGGER.info("Init job queue worker.")
-        jobQueueWorkerService.init(
-            jobs.map {
-                it to {
-                    execute {
-                        LOGGER.debug("excute job ${it.name}")
-                        apJobService.processActivity(
-                            job = this,
-                            hideoutJob = it
-                        )
-                    }
-                }
-            }
-        )
+//        jobQueueWorkerService.init<Any?, HideoutJob<*, *>>(
+//            jobs.map {
+//                it to {
+//                    execute {
+//                        LOGGER.debug("excute job ${it.name}")
+//                        apJobService.processActivity(
+//                            job = this,
+//                            hideoutJob = it
+//                        )
+//                    }
+//                }
+//            }
+//        )
+        jobQueueWorkerService.init<Any?, HideoutJob<*, *>>(emptyList())
     }
 
     companion object {