Implemented embedded columns for where DSL

Author: kurbaniec

bee.persistent.test/src/test/kotlin/com/beeproduced/bee/persistent/test/BeePersistentTestA.kt

@@ -11,6 +11,7 @@ import com.beeproduced.bee.persistent.blaze.meta.dsl.InlineValueUnwrappers
 import com.beeproduced.bee.persistent.blaze.selection.BeeSelection
 import com.beeproduced.datasource.a.*
 import com.beeproduced.datasource.a.dsl.WeirdClassDSL
+import com.beeproduced.datasource.b.dsl.ComposerDSL
 import jakarta.persistence.EntityManager
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeAll
@@ -538,7 +539,6 @@ class BeePersistentTestA(
                 )
             }
 
-
             val w4 = weirdRepository.select {
                 orderBy(
                     ValuePath<Foxtrot, String>("foxtrot", Foxtrot::class).asc(),

bee.persistent/src/blaze-processor/kotlin/com/beeproduced/bee/persistent/blaze/processor/codegen/BeePersistentDSLCodegen.kt

@@ -15,7 +15,6 @@ import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentDSLCo
 import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentDSLCodegen.PoetConstants.VALUE_PATH
 import com.beeproduced.bee.persistent.blaze.processor.info.ColumnProperty
 import com.beeproduced.bee.persistent.blaze.processor.info.EntityInfo
-import com.beeproduced.bee.persistent.blaze.processor.info.Property
 import com.beeproduced.bee.persistent.blaze.processor.info.RepoInfo
 import com.beeproduced.bee.persistent.blaze.processor.utils.SubProperty
 import com.beeproduced.bee.persistent.blaze.processor.utils.viewColumnsWithSubclasses
@@ -26,6 +25,7 @@ import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.ksp.toTypeName
 import com.squareup.kotlinpoet.ksp.writeTo
+import org.gradle.configurationcache.extensions.capitalized
 
 /**
  *
@@ -278,7 +278,7 @@ class BeePersistentDSLCodegen(
         path: String = "",
         visitedEmbeddedViews: MutableMap<String, String?> = mutableMapOf(),
         sort: Boolean = false,
-    ): String = run {
+    ): TypeSpec.Builder {
 
         val (allRelations, allColumns)
             = viewColumnsWithSubclasses(entityView, views)
@@ -288,6 +288,10 @@ class BeePersistentDSLCodegen(
             viewDSL.addPath(column, path, sort)
         }
 
+        for (column in embedded) {
+            viewDSL.addPath(column, path, sort)
+        }
+
         for ((simpleName, subRelation) in allRelations) {
             val innerView = views.entityViews.getValue(subRelation.relationView)
             if (innerView.isExtended) continue
@@ -305,17 +309,17 @@ class BeePersistentDSLCodegen(
             addType(innerDSL.build())
         }
 
-
-        ""
+        return this
     }
 
     private fun TypeSpec.Builder.addPath(
         subProperty: SubProperty, path: String,
-        sort: Boolean
+        sort: Boolean, embeddedPropertyName: String? = null
     ) {
         val column = subProperty.property
-        val inner = column.innerValue
+        val propertyName = embeddedPropertyName ?: column.simpleName
         val newPath = buildPath(path, column.simpleName, subProperty.subView)
+        val inner = column.innerValue
         if (inner != null) {
             val innerType = inner.type.toTypeName().copy(nullable = false)
             val columnType = column.type.toTypeName().copy(nullable = false)
@@ -324,7 +328,7 @@ class BeePersistentDSLCodegen(
             else poetMap.classMapping(VALUE_EXP).parameterizedBy(columnType, innerType)
             val pathType = poetMap.classMapping(VALUE_PATH)
 
-            val pathProperty = PropertySpec.builder(column.simpleName, interfaceType)
+            val pathProperty = PropertySpec.builder(propertyName, interfaceType)
                 .initializer(CodeBlock.Builder()
                     .addStatement("%T(%S, %T::class)", pathType, newPath, columnType)
                     .build()
@@ -337,12 +341,20 @@ class BeePersistentDSLCodegen(
             poetMap.classMapping(SORTABLE_EXP).parameterizedBy(columnType)
         else poetMap.classMapping(EXP).parameterizedBy(columnType)
         val pathType = poetMap.classMapping(PATH)
-        val pathProperty = PropertySpec.builder(column.simpleName, interfaceType)
+        val pathProperty = PropertySpec.builder(propertyName, interfaceType)
             .initializer(CodeBlock.Builder()
                 .addStatement("%T(%S)", pathType, newPath)
                 .build()
             )
         addProperty(pathProperty.build())
+
+        val embedded = column.embedded ?: return
+        for (embeddedColumn in embedded.jpaProperties) {
+            val columnProp = ColumnProperty(embeddedColumn.declaration, embeddedColumn.type, embeddedColumn.annotations, null, null)
+            val embeddedSubProperty = SubProperty(columnProp)
+            val overrideName = "$propertyName${embeddedColumn.simpleName.capitalized()}"
+            addPath(embeddedSubProperty, newPath, sort, overrideName)
+        }
     }
 
     private fun buildPath(path: String, simpleName: String, subView: String?): String {