Fix Nested DTO's

Author: reactivestudio

convertible-core/src/main/kotlin/pro/vlprojects/convertible/core/processor/ConvertibleProcessor.kt

@@ -43,7 +43,7 @@ class ConvertibleProcessor(
 		.forEach { definition ->
 			check(strategy.supports(definition)) { "The strategy does not support the definition: $definition" }
 
-			val targetPackage = "${definition.objectClassName.packageName}.${definition.scope.lowercase()}"
+			val targetPackage = definition.objectClassName.packageName
 			val specification = strategy.build(definition)
 
 			specification.writeWith(generator, targetPackage, definition.source)

convertible-jpa/src/main/kotlin/pro/vlprojects/convertible/jpa/JpaAttributeConverter.kt

@@ -71,7 +71,8 @@ class JpaAttributeConverter : ConvertibleStrategy {
 		val nullable = definition.nullable
 		val safeAccess = if (definition.nullable) "?." else "."
 		val isConstructor = definition.factoryAccessor.isConstructor
-		val factoryCall = if (isConstructor) "::${definition.objectClassName.simpleName}" else "${definition.objectClassName.simpleName}::${definition.factoryAccessor.name}"
+		val method = definition.objectClassName.simpleNames.joinToString(".")
+		val factoryCall = if (isConstructor) "::$method" else "$method::${definition.factoryAccessor.name}"
 		val expression = "source${safeAccess}let($factoryCall)"
 
 		return FunSpec

convertible-jpa/src/test/kotlin/pro/vlprojects/convertible/jpa/JpaAttributeConverterTests.kt

@@ -128,6 +128,12 @@ class JpaAttributeConverterTests {
 					TestCase("Prefix.kt", "SomePrefixJpaConverter.kt"),
 				)
 			),
+			Arguments.of(
+				Named.of(
+					"Nested. Factory declared. Value declared",
+					TestCase("Base.kt", "NestedJpaConverter.kt"),
+				)
+			),
 		)
 	}
 

convertible-jpa/src/test/resources/converter/NestedJpaConverter.kt

@@ -0,0 +1,14 @@
+package com.example.vo
+
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
+import kotlin.String
+import org.springframework.stereotype.Component
+
+@Component
+@Converter(autoApply = true)
+public class NestedJpaConverter : AttributeConverter<Base.Nested, String> {
+  override fun convertToDatabaseColumn(attribute: Base.Nested): String = attribute.value
+
+  override fun convertToEntityAttribute(source: String): Base.Nested = source.let(Base.Nested::from)
+}

convertible-jpa/src/test/resources/vo/Base.kt

@@ -0,0 +1,22 @@
+package com.example.vo
+
+import pro.vlprojects.convertible.core.annotation.Convertible
+import pro.vlprojects.convertible.core.annotation.ConvertibleFactory
+import pro.vlprojects.convertible.core.annotation.ConvertibleValue
+import pro.vlprojects.convertible.core.annotation.Scope
+
+data class Base(
+	val nested: Nested,
+) {
+	@Convertible(scopes = [Scope.JPA])
+	data class Nested(val raw: String) {
+
+		@ConvertibleValue(scopes = [Scope.JPA])
+		val value = raw
+
+		companion object Factory {
+			@ConvertibleFactory(scopes = [Scope.JPA])
+			fun from(input: String) = Nested(input)
+		}
+	}
+}

gradle.properties

@@ -1,4 +1,4 @@
 group=pro.vlprojects
-version=0.1.1
+version=0.1.2
 kotlin.version=2.1.21
 kotlin.code.style=official