refactor(orm): use naming strategy for computed field

adonisjs · Nov 6, 2023 · e988bcd · e988bcd
1 parent 3717436
commit e988bcd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/orm/base_model/index.ts b/src/orm/base_model/index.ts
@@ -347,7 +347,10 @@ class BaseModelImpl implements LucidRow {
    */
   static $addComputed(name: string, options: Partial<ComputedOptions>) {
     const computed: ComputedOptions = {
-      serializeAs: options.serializeAs || name,
+      serializeAs:
+        options.serializeAs !== undefined
+          ? options.serializeAs
+          : this.namingStrategy.serializedName(this, name),
       meta: options.meta,
     }
     this.$computedDefinitions.set(name, computed)

diff --git a/test/orm/base_model.spec.ts b/test/orm/base_model.spec.ts
@@ -2506,7 +2506,7 @@ test.group('Base Model | toJSON', (group) => {
     const user = new User()
     user.username = 'virk'
 
-    assert.deepEqual(user.toJSON(), { username: 'virk', fullName: 'VIRK' })
+    assert.deepEqual(user.toJSON(), { username: 'virk', full_name: 'VIRK' })
   })
 
   test('do not add computed property when it returns undefined', async ({ fs, assert }) => {
@@ -2585,7 +2585,7 @@ test.group('Base Model | toJSON', (group) => {
 
     assert.deepEqual(user.toJSON(), {
       username: 'virk',
-      fullName: 'VIRK',
+      full_name: 'VIRK',
       meta: {
         postsCount: 10,
       },
@@ -2623,7 +2623,7 @@ test.group('Base Model | toJSON', (group) => {
 
     assert.deepEqual(user.toJSON(), {
       username: 'virk',
-      fullName: 'VIRK',
+      full_name: 'VIRK',
       posts: {
         count: 10,
       },
@@ -7612,7 +7612,7 @@ test.group('Base model | inheritance', (group) => {
           'fullName',
           {
             meta: undefined,
-            serializeAs: 'fullName',
+            serializeAs: 'full_name',
           },
         ],
         [
@@ -7638,7 +7638,7 @@ test.group('Base model | inheritance', (group) => {
           'fullName',
           {
             meta: undefined,
-            serializeAs: 'fullName',
+            serializeAs: 'full_name',
           },
         ],
       ])
@@ -7733,7 +7733,7 @@ test.group('Base model | inheritance', (group) => {
           'fullName',
           {
             meta: undefined,
-            serializeAs: 'fullName',
+            serializeAs: 'full_name',
           },
         ],
       ])