call transaction Dao events only after commit, added totalPages to the search response and updated the tests

daos/base.go

@@ -65,12 +65,11 @@ func (dao *Dao) RunInTransaction(fn func(txDao *Dao) error) error {
 		// so execute the function within the current transaction
 		return fn(dao)
 	case *dbx.DB:
+		afterCalls := []afterCallGroup{}
 
-		return txOrDB.Transactional(func(tx *dbx.Tx) error {
+		txError := txOrDB.Transactional(func(tx *dbx.Tx) error {
 			txDao := New(tx)
 
-			afterCalls := []afterCallGroup{}
-
 			if dao.BeforeCreateFunc != nil {
 				txDao.BeforeCreateFunc = func(eventDao *Dao, m models.Model) error {
 					return dao.BeforeCreateFunc(eventDao, m)
@@ -103,23 +102,24 @@ func (dao *Dao) RunInTransaction(fn func(txDao *Dao) error) error {
 				}
 			}
 
-			if err := fn(txDao); err != nil {
-				return err
-			}
+			return fn(txDao)
+		})
 
-			// execute after event calls on successfull transaction
+		if txError == nil {
+			// execute after event calls on successful transaction
 			for _, call := range afterCalls {
-				if call.Action == "create" {
+				switch call.Action {
+				case "create":
 					dao.AfterCreateFunc(call.EventDao, call.Model)
-				} else if call.Action == "update" {
+				case "update":
 					dao.AfterUpdateFunc(call.EventDao, call.Model)
-				} else if call.Action == "delete" {
+				case "delete":
 					dao.AfterDeleteFunc(call.EventDao, call.Model)
 				}
 			}
+		}
 
-			return nil
-		})
+		return txError
 	}
 
 	return errors.New("Failed to start transaction (unknown dao.db)")

daos/base_test.go

@@ -365,32 +365,34 @@ func TestDaoTransactionHooksCallsOnFailure(t *testing.T) {
 
 	existingModel, _ := testApp.Dao().FindAdminByEmail("test@example.com")
 
-	baseDao.RunInTransaction(func(txDao *daos.Dao) error {
-		// test create
-		// ---
-		newModel := &models.Admin{}
-		newModel.Email = "test_new1@example.com"
-		newModel.SetPassword("123456")
-		if err := txDao.Save(newModel); err != nil {
-			t.Fatal(err)
-		}
+	baseDao.RunInTransaction(func(txDao1 *daos.Dao) error {
+		return txDao1.RunInTransaction(func(txDao2 *daos.Dao) error {
+			// test create
+			// ---
+			newModel := &models.Admin{}
+			newModel.Email = "test_new1@example.com"
+			newModel.SetPassword("123456")
+			if err := txDao2.Save(newModel); err != nil {
+				t.Fatal(err)
+			}
 
-		// test update (twice)
-		// ---
-		if err := txDao.Save(existingModel); err != nil {
-			t.Fatal(err)
-		}
-		if err := txDao.Save(existingModel); err != nil {
-			t.Fatal(err)
-		}
+			// test update (twice)
+			// ---
+			if err := txDao2.Save(existingModel); err != nil {
+				t.Fatal(err)
+			}
+			if err := txDao2.Save(existingModel); err != nil {
+				t.Fatal(err)
+			}
 
-		// test delete
-		// ---
-		if err := txDao.Delete(existingModel); err != nil {
-			t.Fatal(err)
-		}
+			// test delete
+			// ---
+			if err := txDao2.Delete(existingModel); err != nil {
+				t.Fatal(err)
+			}
 
-		return errors.New("test_tx_error")
+			return errors.New("test_tx_error")
+		})
 	})
 
 	if beforeCreateFuncCalls != 1 {
@@ -451,32 +453,34 @@ func TestDaoTransactionHooksCallsOnSuccess(t *testing.T) {
 
 	existingModel, _ := testApp.Dao().FindAdminByEmail("test@example.com")
 
-	baseDao.RunInTransaction(func(txDao *daos.Dao) error {
-		// test create
-		// ---
-		newModel := &models.Admin{}
-		newModel.Email = "test_new1@example.com"
-		newModel.SetPassword("123456")
-		if err := txDao.Save(newModel); err != nil {
-			t.Fatal(err)
-		}
+	baseDao.RunInTransaction(func(txDao1 *daos.Dao) error {
+		return txDao1.RunInTransaction(func(txDao2 *daos.Dao) error {
+			// test create
+			// ---
+			newModel := &models.Admin{}
+			newModel.Email = "test_new1@example.com"
+			newModel.SetPassword("123456")
+			if err := txDao2.Save(newModel); err != nil {
+				t.Fatal(err)
+			}
 
-		// test update (twice)
-		// ---
-		if err := txDao.Save(existingModel); err != nil {
-			t.Fatal(err)
-		}
-		if err := txDao.Save(existingModel); err != nil {
-			t.Fatal(err)
-		}
+			// test update (twice)
+			// ---
+			if err := txDao2.Save(existingModel); err != nil {
+				t.Fatal(err)
+			}
+			if err := txDao2.Save(existingModel); err != nil {
+				t.Fatal(err)
+			}
 
-		// test delete
-		// ---
-		if err := txDao.Delete(existingModel); err != nil {
-			t.Fatal(err)
-		}
+			// test delete
+			// ---
+			if err := txDao2.Delete(existingModel); err != nil {
+				t.Fatal(err)
+			}
 
-		return nil
+			return nil
+		})
 	})
 
 	if beforeCreateFuncCalls != 1 {

daos/record_test.go

@@ -298,7 +298,6 @@ func TestFindUserRelatedRecords(t *testing.T) {
 		}
 
 		if len(records) != len(scenario.expectedIds) {
-			fmt.Println(records[0])
 			t.Errorf("(%d) Expected %d records, got %d (%v)", i, len(scenario.expectedIds), len(records), records)
 			continue
 		}