Merge pull request #62 from zeoflow/bug/key-name-wrong-format

Fixed Wrong-Key format
zeoflow · Jun 30, 2022 · 3600a81 · 3600a81
2 parents fdf756d + 91d1999
commit 3600a81
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app-kotlin/src/main/java/com/zeoflow/memo/demo/entities/City.kt b/app-kotlin/src/main/java/com/zeoflow/memo/demo/entities/City.kt
@@ -23,6 +23,7 @@ data class City(
     @Observable
     val country: String,
 
+    @KeyName("population_count")
     @Observable
     @Default(PopulationDefault::class)
     val population: Int,

diff --git a/memo-processor/src/main/java/com/zeoflow/memo/processor/entity/EntityBuilder.kt b/memo-processor/src/main/java/com/zeoflow/memo/processor/entity/EntityBuilder.kt
@@ -127,7 +127,7 @@ class EntityBuilder(
                             "return %T().get(%T[%S, field])",
                             getType(field.functionsType!!.typeName),
                             types.Memo(),
-                            field.keyName
+                            field.storeKeyName
                         )
                         .build()
                 )
@@ -136,7 +136,7 @@ class EntityBuilder(
                 .addStatement(
                     "%T.put(%S, %T().set(value))",
                     types.Memo(),
-                    field.keyName,
+                    field.storeKeyName,
                     getType(field.functionsType!!.typeName)
                 )
             if (field.isObservable) {
@@ -156,7 +156,7 @@ class EntityBuilder(
                         .addStatement(
                             "return %T[%S, field]",
                             types.Memo(),
-                            field.keyName
+                            field.storeKeyName
                         )
                         .build()
                 )
@@ -165,7 +165,7 @@ class EntityBuilder(
                 .addStatement(
                     "%T.put(%S, value)",
                     types.Memo(),
-                    field.keyName
+                    field.storeKeyName
                 )
             if (field.isObservable) {
                 funcSetter.addStatement(

diff --git a/memo-processor/src/main/java/com/zeoflow/memo/processor/entity/EntityField.kt b/memo-processor/src/main/java/com/zeoflow/memo/processor/entity/EntityField.kt
@@ -13,16 +13,18 @@ class EntityField(var xFieldElement: XFieldElement) {
     var functionsType: XType? = null
     val className: ClassName
     val keyName: String
+    val storeKeyName: String
     val isObservable: Boolean
     val isListener: Boolean
 
     init {
-        keyName = if (xFieldElement.hasAnnotation(KeyName::class)) {
+        storeKeyName = if (xFieldElement.hasAnnotation(KeyName::class)) {
             val keyNameAnnotation = xFieldElement.getAnnotation(KeyName::class)!!.value
             keyNameAnnotation.value
         } else {
             xFieldElement.name
         }
+        keyName = xFieldElement.name
         className = getType(xFieldElement.type.typeName)
         isObservable = xFieldElement.hasAnnotation(Observable::class)
         isListener = xFieldElement.hasAnnotation(Listener::class)