fix(model): delete method should be synchronous (#76) (#77)

cuebit · web-flow · commit 4fb4673f728f · 2021-06-08T22:24:58.000+09:00
fix #76 In addition, tests are revised to reflect the synchronous behavior.
diff --git a/src/model/Model.ts b/src/model/Model.ts
@@ -489,7 +489,7 @@ export class Model {
   /**
    * Delete the model from the database.
    */
-  async $delete(): Promise<boolean> {
+  $delete(): boolean {
     const key = this.$getKeyName()
 
     return isArray(key)
@@ -500,21 +500,21 @@ export class Model {
   /**
    * Delete the model from the database by ID.
    */
-  protected async $deleteByKeyName(key: string): Promise<boolean> {
-    return !!(await this.$query().destroy(this[key]))
+  protected $deleteByKeyName(key: string): boolean {
+    return !!this.$query().destroy(this[key])
   }
 
   /**
    * Delete the model from the database by composite key.
    */
-  protected async $deleteByCompositeKeyName(keys: string[]): Promise<boolean> {
+  protected $deleteByCompositeKeyName(keys: string[]): boolean {
     const query = this.$query()
 
     keys.forEach((key) => {
       query.where(key, this[key])
     })
 
-    return (await query.delete()).length > 0
+    return query.delete().length > 0
   }
 
   /**
diff --git a/test/feature/model/deletes_delete.spec.ts b/test/feature/model/deletes_delete.spec.ts
@@ -20,7 +20,7 @@ describe('feature/model/deletes_delete', () => {
 
     const user = store.$repo(User).find(1)!
 
-    const result = await user.$delete()
+    const result = user.$delete()
 
     expect(result).toBe(true)
 
diff --git a/test/feature/model/deletes_delete_composite_key.spec.ts b/test/feature/model/deletes_delete_composite_key.spec.ts
@@ -23,7 +23,7 @@ describe('feature/model/deletes_delete_composite_key', () => {
 
     const user = store.$repo(User).where('idA', 1).where('idB', 2).first()!
 
-    const result = await user.$delete()
+    const result = user.$delete()
 
     expect(result).toBe(true)
 
diff --git a/test/feature/relations/has_many_save.spec.ts b/test/feature/relations/has_many_save.spec.ts
@@ -53,7 +53,7 @@ describe('feature/relations/has_many_save', () => {
   it('generates missing foreign key', async () => {
     const store = createStore()
 
-    await store.$repo(User).save({
+    store.$repo(User).save({
       id: 1,
       name: 'John Doe',
       posts: [
@@ -76,7 +76,7 @@ describe('feature/relations/has_many_save', () => {
   it('can insert a record with missing relational key', async () => {
     const store = createStore()
 
-    await store.$repo(User).save({
+    store.$repo(User).save({
       id: 1,
       name: 'John Doe'
     })
