fix 色々直した

build.gradle.kts

@@ -113,10 +113,6 @@ dependencies {
     compileOnly("io.swagger.core.v3:swagger-annotations:2.2.6")
     implementation("io.swagger.core.v3:swagger-models:2.2.6")
     implementation("org.jetbrains.exposed:exposed-java-time:$exposed_version")
-    implementation("org.jetbrains.exposed:spring-transaction:$exposed_version")
-    implementation("org.springframework.data:spring-data-commons")
-    implementation("org.springframework.boot:spring-boot-starter-jdbc")
-    implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
     testImplementation("org.springframework.boot:spring-boot-test-autoconfigure")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")

src/main/kotlin/dev/usbharu/hideout/SpringApplication.kt

@@ -3,9 +3,11 @@ package dev.usbharu.hideout
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan
 import org.springframework.boot.runApplication
+import org.springframework.cache.annotation.EnableCaching
 
 @SpringBootApplication
 @ConfigurationPropertiesScan
+@EnableCaching
 class SpringApplication
 
 @Suppress("SpreadOperator")

src/main/kotlin/dev/usbharu/hideout/config/HttpClientConfig.kt

@@ -20,7 +20,8 @@ class HttpClientConfig {
         }
         install(Logging) {
             logger = Logger.DEFAULT
-            level = LogLevel.ALL
+            level = LogLevel.INFO
+
         }
         expectSuccess = true
     }

src/main/kotlin/dev/usbharu/hideout/controller/InboxControllerImpl.kt

@@ -2,6 +2,7 @@ package dev.usbharu.hideout.controller
 
 import dev.usbharu.hideout.service.ap.APService
 import kotlinx.coroutines.runBlocking
+import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.RequestBody
@@ -11,7 +12,12 @@ import org.springframework.web.bind.annotation.RestController
 class InboxControllerImpl(private val apService: APService) : InboxController {
     override fun inbox(@RequestBody string: String): ResponseEntity<Unit> = runBlocking {
         val parseActivity = apService.parseActivity(string)
+        LOGGER.info("INBOX Processing Activity Type: {}", parseActivity)
         apService.processActivity(string, parseActivity)
         ResponseEntity(HttpStatus.ACCEPTED)
     }
+
+    companion object {
+        val LOGGER = LoggerFactory.getLogger(InboxControllerImpl::class.java)
+    }
 }

src/main/kotlin/dev/usbharu/hideout/controller/mastodon/MastodonAppsApiController.kt

@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam
 @Controller
 class MastodonAppsApiController(private val appApiService: AppApiService) : AppApi {
     override fun apiV1AppsPost(appsRequest: AppsRequest): ResponseEntity<Application> = runBlocking {
-        println(appsRequest)
         ResponseEntity(
             appApiService.createApp(appsRequest),
             HttpStatus.OK

src/main/kotlin/dev/usbharu/hideout/domain/model/UserDetailsImpl.kt

@@ -51,7 +51,6 @@ class UserDetailsDeserializer : JsonDeserializer<UserDetailsImpl>() {
     override fun deserialize(p: JsonParser, ctxt: DeserializationContext): UserDetailsImpl {
         val mapper = p.codec as ObjectMapper
         val jsonNode: JsonNode = mapper.readTree(p)
-        println(jsonNode)
         val authorities: Set<GrantedAuthority> = mapper.convertValue(
             jsonNode["authorities"],
             SIMPLE_GRANTED_AUTHORITY_SET

src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Object.kt

@@ -54,7 +54,6 @@ open class Object : JsonLd {
 
 class TypeSerializer : JsonSerializer<List<String>>() {
     override fun serialize(value: List<String>?, gen: JsonGenerator?, serializers: SerializerProvider?) {
-        println(value)
         if (value?.size == 1) {
             gen?.writeString(value[0])
         } else {

src/main/kotlin/dev/usbharu/hideout/domain/model/ap/ObjectDeserializer.kt

@@ -34,7 +34,6 @@ class ObjectDeserializer : JsonDeserializer<Object>() {
             return when (activityType) {
                 ExtendedActivityVocabulary.Follow -> {
                     val readValue = p.codec.treeToValue(treeNode, Follow::class.java)
-                    println(readValue)
                     readValue
                 }
 

src/main/kotlin/dev/usbharu/hideout/domain/model/hideout/entity/Timeline.kt

@@ -1,7 +1,9 @@
 package dev.usbharu.hideout.domain.model.hideout.entity
 
 import org.springframework.data.annotation.Id
+import org.springframework.data.mongodb.core.mapping.Document
 
+@Document
 data class Timeline(
     @Id
     val id: Long,

src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt

@@ -67,11 +67,9 @@ val httpSignaturePlugin: ClientPlugin<HttpSignaturePluginConfig> = createClientP
 
         request.header("Date", format.format(Date()))
         request.header("Host", request.url.host)
-        println(request.bodyType)
-        println(request.bodyType?.type)
         if (request.bodyType?.type == String::class) {
-            println(body as String)
-            println("Digest !!")
+            body as String
+
 //            UserAuthService.sha256.reset()
             val digest =
                 Base64.getEncoder().encodeToString(UserAuthServiceImpl.sha256.digest(body.toByteArray(Charsets.UTF_8)))

src/main/kotlin/dev/usbharu/hideout/query/PostQueryServiceImpl.kt

@@ -6,25 +6,24 @@ import dev.usbharu.hideout.repository.Posts
 import dev.usbharu.hideout.repository.PostsMedia
 import dev.usbharu.hideout.repository.toPost
 import dev.usbharu.hideout.util.singleOr
-import org.jetbrains.exposed.sql.innerJoin
 import org.jetbrains.exposed.sql.select
 import org.springframework.stereotype.Repository
 
 @Repository
 class PostQueryServiceImpl : PostQueryService {
     override suspend fun findById(id: Long): Post =
-        Posts.innerJoin(PostsMedia, onColumn = { Posts.id }, otherColumn = { PostsMedia.postId })
+        Posts.leftJoin(PostsMedia)
             .select { Posts.id eq id }
             .singleOr { FailedToGetResourcesException("id: $id is duplicate or does not exist.", it) }.toPost()
 
     override suspend fun findByUrl(url: String): Post =
-        Posts.innerJoin(PostsMedia, onColumn = { Posts.id }, otherColumn = { PostsMedia.postId })
+        Posts.leftJoin(PostsMedia)
             .select { Posts.url eq url }
             .toPost()
             .singleOr { FailedToGetResourcesException("url: $url is duplicate or does not exist.", it) }
 
     override suspend fun findByApId(string: String): Post =
-        Posts.innerJoin(PostsMedia, onColumn = { Posts.id }, otherColumn = { PostsMedia.postId })
+        Posts.leftJoin(PostsMedia)
             .select { Posts.apId eq string }
             .toPost()
             .singleOr { FailedToGetResourcesException("apId: $string is duplicate or does not exist.", it) }

src/main/kotlin/dev/usbharu/hideout/repository/PostRepositoryImpl.kt

@@ -54,6 +54,12 @@ class PostRepositoryImpl(private val idGenerateService: IdGenerateService) : Pos
                 it[apId] = post.apId
             }
         }
+
+
+        assert(Posts.select { Posts.id eq post.id }.singleOrNull() != null) {
+            "Faild to insert"
+        }
+
         return post
     }
 
@@ -109,5 +115,5 @@ fun ResultRow.toPost(): Post {
 fun Query.toPost(): List<Post> {
     return this.groupBy { it[Posts.id] }
         .map { it.value }
-        .map { it.first().toPost().copy(mediaIds = it.map { it[PostsMedia.mediaId] }) }
+        .map { it.first().toPost().copy(mediaIds = it.mapNotNull { it.getOrNull(PostsMedia.mediaId) }) }
 }

src/main/kotlin/dev/usbharu/hideout/repository/UserRepositoryImpl.kt

@@ -14,8 +14,8 @@ class UserRepositoryImpl(private val idGenerateService: IdGenerateService) :
     UserRepository {
 
     override suspend fun save(user: User): User {
-        val singleOrNull = Users.select { Users.id eq user.id }.singleOrNull()
-        if (singleOrNull == null) {
+        val singleOrNull = Users.select { Users.id eq user.id or (Users.url eq user.url) }.empty()
+        if (singleOrNull) {
             Users.insert {
                 it[id] = user.id
                 it[name] = user.name

src/main/kotlin/dev/usbharu/hideout/service/ap/APLikeService.kt

@@ -26,7 +26,7 @@ class APLikeServiceImpl(
         val actor = like.actor ?: throw IllegalActivityPubObjectException("actor is null")
         val content = like.content ?: throw IllegalActivityPubObjectException("content is null")
         like.`object` ?: throw IllegalActivityPubObjectException("object is null")
-        transaction.transaction(java.sql.Connection.TRANSACTION_SERIALIZABLE) {
+        transaction.transaction {
             val person = apUserService.fetchPersonWithEntity(actor)
             apNoteService.fetchNote(like.`object` ?: return@transaction)
 

src/main/kotlin/dev/usbharu/hideout/service/ap/APService.kt

@@ -226,8 +226,6 @@ class APServiceImpl(
     override suspend fun <T : HideoutJob> processActivity(job: JobContextWithProps<T>, hideoutJob: HideoutJob) {
         logger.debug("processActivity: ${hideoutJob.name}")
 
-//        println(apReceiveFollowService::class.java)
-//        apReceiveFollowService.receiveFollowJob(job.props as JobProps<ReceiveFollowJob>)
         when (hideoutJob) {
             is ReceiveFollowJob -> {
                 apReceiveFollowService.receiveFollowJob(

src/main/kotlin/dev/usbharu/hideout/service/api/mastodon/StatusesApiService.kt

@@ -39,7 +39,6 @@ class StatsesApiServiceImpl(
         statusesRequest: dev.usbharu.hideout.domain.model.mastodon.StatusesRequest,
         userId: Long
     ): Status = transaction.transaction {
-        println("Post status media ids " + statusesRequest.media_ids)
         val visibility = when (statusesRequest.visibility) {
             StatusesRequest.Visibility.public -> Visibility.PUBLIC
             StatusesRequest.Visibility.unlisted -> Visibility.UNLISTED

src/main/kotlin/dev/usbharu/hideout/service/core/ExposedTransaction.kt

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service
 @Service
 class ExposedTransaction : Transaction {
     override suspend fun <T> transaction(block: suspend () -> T): T {
-        return newSuspendedTransaction(transactionIsolation = java.sql.Connection.TRANSACTION_SERIALIZABLE) {
+        return newSuspendedTransaction {
             block()
         }
     }

src/main/kotlin/dev/usbharu/hideout/service/core/MdcXrequestIdFilter.kt

@@ -0,0 +1,27 @@
+package dev.usbharu.hideout.service.core
+
+import jakarta.servlet.Filter
+import jakarta.servlet.FilterChain
+import jakarta.servlet.ServletRequest
+import jakarta.servlet.ServletResponse
+import org.slf4j.MDC
+import org.springframework.stereotype.Service
+import java.util.*
+
+@Service
+class MdcXrequestIdFilter : Filter {
+    override fun doFilter(request: ServletRequest?, response: ServletResponse?, chain: FilterChain) {
+        val uuid = UUID.randomUUID()
+        try {
+            MDC.put(KEY, uuid.toString())
+            chain.doFilter(request, response)
+        } finally {
+            MDC.remove(KEY)
+        }
+
+    }
+
+    companion object {
+        val KEY = "x-request-id"
+    }
+}

src/main/kotlin/dev/usbharu/hideout/service/post/PostServiceImpl.kt

@@ -3,6 +3,7 @@ package dev.usbharu.hideout.service.post
 import dev.usbharu.hideout.domain.model.hideout.dto.PostCreateDto
 import dev.usbharu.hideout.domain.model.hideout.entity.Post
 import dev.usbharu.hideout.exception.UserNotFoundException
+import dev.usbharu.hideout.query.PostQueryService
 import dev.usbharu.hideout.repository.PostRepository
 import dev.usbharu.hideout.repository.UserRepository
 import org.springframework.stereotype.Service
@@ -13,7 +14,8 @@ import java.util.*
 class PostServiceImpl(
     private val postRepository: PostRepository,
     private val userRepository: UserRepository,
-    private val timelineService: TimelineService
+    private val timelineService: TimelineService,
+    private val postQueryService: PostQueryService
 ) : PostService {
     private val interceptors = Collections.synchronizedList(mutableListOf<PostCreateInterceptor>())
 
@@ -30,8 +32,13 @@ class PostServiceImpl(
     }
 
     private suspend fun internalCreate(post: Post, isLocal: Boolean): Post {
-        timelineService.publishTimeline(post, isLocal)
-        return postRepository.save(post)
+        val save = try {
+            postRepository.save(post)
+        } catch (e: Exception) {
+            postQueryService.findByApId(post.apId)
+        }
+        timelineService.publishTimeline(save, isLocal)
+        return save
     }
 
     private suspend fun internalCreate(post: PostCreateDto, isLocal: Boolean): Post {

src/main/kotlin/dev/usbharu/hideout/service/user/UserServiceImpl.kt

@@ -64,7 +64,11 @@ class UserServiceImpl(
             publicKey = user.publicKey,
             createdAt = Instant.now()
         )
-        return userRepository.save(userEntity)
+        return try {
+            userRepository.save(userEntity)
+        } catch (e: Exception) {
+            userQueryService.findByUrl(user.url)
+        }
     }
 
     // TODO APのフォロー処理を作る

src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt

@@ -20,7 +20,6 @@ object HttpUtil {
         subType: String,
         parameter: String
     ): Boolean {
-        println("$contentType/$subType $parameter")
         if (contentType != "application") {
             return false
         }

src/main/resources/logback.xml

@@ -1,17 +1,16 @@
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{x-request-id}] %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-    <root level="DEBUG">
+    <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
     <logger name="org.eclipse.jetty" level="INFO"/>
     <logger name="io.netty" level="INFO"/>
     <logger name="kjob.core.internal.scheduler.JobServiceImpl" level="INFO"/>
-    <logger name="Exposed" level="INFO"/>
+    <logger name="Exposed" level="DEBUG"/>
     <logger name="io.ktor.server.plugins.contentnegotiation" level="INFO"/>
-    <logger name="org.springframework.security" level="DEBUG"/>
-    <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="DEBUG"/>
+    <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="INFO"/>
 </configuration>