added select auto fail/retry

daos/record.go

@@ -20,7 +20,72 @@ func (dao *Dao) RecordQuery(collection *models.Collection) *dbx.SelectQuery {
 	tableName := collection.Name
 	selectCols := fmt.Sprintf("%s.*", dao.DB().QuoteSimpleColumnName(tableName))
 
-	return dao.DB().Select(selectCols).From(tableName)
+	return dao.DB().
+		Select(selectCols).
+		From(tableName).
+		WithExecHook(onLockErrorRetry).
+		WithOneHook(func(s *dbx.SelectQuery, a any, op func(b any) error) error {
+			switch v := a.(type) {
+			case *models.Record:
+				if v == nil {
+					return op(a)
+				}
+
+				row := dbx.NullStringMap{}
+				if err := op(&row); err != nil {
+					return err
+				}
+
+				record := models.NewRecordFromNullStringMap(collection, row)
+
+				*v = *record
+
+				return nil
+			default:
+				return op(a)
+			}
+		}).
+		WithAllHook(func(s *dbx.SelectQuery, sliceA any, op func(sliceB any) error) error {
+			switch v := sliceA.(type) {
+			case *[]*models.Record:
+				if v == nil {
+					return op(sliceA)
+				}
+
+				rows := []dbx.NullStringMap{}
+				if err := op(&rows); err != nil {
+					return err
+				}
+
+				records := models.NewRecordsFromNullStringMaps(collection, rows)
+
+				*v = records
+
+				return nil
+			case *[]models.Record:
+				if v == nil {
+					return op(sliceA)
+				}
+
+				rows := []dbx.NullStringMap{}
+				if err := op(&rows); err != nil {
+					return err
+				}
+
+				records := models.NewRecordsFromNullStringMaps(collection, rows)
+
+				nonPointers := make([]models.Record, len(records))
+				for i, r := range records {
+					nonPointers[i] = *r
+				}
+
+				*v = nonPointers
+
+				return nil
+			default:
+				return op(sliceA)
+			}
+		})
 }
 
 // FindRecordById finds the Record model by its id.
@@ -34,10 +99,8 @@ func (dao *Dao) FindRecordById(
 		return nil, err
 	}
 
-	tableName := collection.Name
-
 	query := dao.RecordQuery(collection).
-		AndWhere(dbx.HashExp{tableName + ".id": recordId})
+		AndWhere(dbx.HashExp{collection.Name + ".id": recordId})
 
 	for _, filter := range optFilters {
 		if filter == nil {
@@ -48,12 +111,13 @@ func (dao *Dao) FindRecordById(
 		}
 	}
 
-	row := dbx.NullStringMap{}
-	if err := query.Limit(1).One(row); err != nil {
+	record := &models.Record{}
+
+	if err := query.Limit(1).One(record); err != nil {
 		return nil, err
 	}
 
-	return models.NewRecordFromNullStringMap(collection, row), nil
+	return record, nil
 }
 
 // FindRecordsByIds finds all Record models by the provided ids.
@@ -83,12 +147,13 @@ func (dao *Dao) FindRecordsByIds(
 		}
 	}
 
-	rows := make([]dbx.NullStringMap, 0, len(recordIds))
-	if err := query.All(&rows); err != nil {
+	records := make([]*models.Record, 0, len(recordIds))
+
+	if err := query.All(&records); err != nil {
 		return nil, err
 	}
 
-	return models.NewRecordsFromNullStringMaps(collection, rows), nil
+	return records, nil
 }
 
 // FindRecordsByExpr finds all records by the specified db expression.
@@ -117,13 +182,13 @@ func (dao *Dao) FindRecordsByExpr(collectionNameOrId string, exprs ...dbx.Expres
 		}
 	}
 
-	rows := []dbx.NullStringMap{}
+	var records []*models.Record
 
-	if err := query.All(&rows); err != nil {
+	if err := query.All(&records); err != nil {
 		return nil, err
 	}
 
-	return models.NewRecordsFromNullStringMaps(collection, rows), nil
+	return records, nil
 }
 
 // FindFirstRecordByData returns the first found record matching
@@ -138,18 +203,17 @@ func (dao *Dao) FindFirstRecordByData(
 		return nil, err
 	}
 
-	row := dbx.NullStringMap{}
+	record := &models.Record{}
 
 	err = dao.RecordQuery(collection).
 		AndWhere(dbx.HashExp{inflector.Columnify(key): value}).
 		Limit(1).
-		One(row)
-
+		One(record)
 	if err != nil {
 		return nil, err
 	}
 
-	return models.NewRecordFromNullStringMap(collection, row), nil
+	return record, nil
 }
 
 // IsRecordValueUnique checks if the provided key-value pair is a unique Record value.
@@ -252,18 +316,17 @@ func (dao *Dao) FindAuthRecordByEmail(collectionNameOrId string, email string) (
 		return nil, fmt.Errorf("%q is not an auth collection", collectionNameOrId)
 	}
 
-	row := dbx.NullStringMap{}
+	record := &models.Record{}
 
 	err = dao.RecordQuery(collection).
 		AndWhere(dbx.HashExp{schema.FieldNameEmail: email}).
 		Limit(1).
-		One(row)
-
+		One(record)
 	if err != nil {
 		return nil, err
 	}
 
-	return models.NewRecordFromNullStringMap(collection, row), nil
+	return record, nil
 }
 
 // FindAuthRecordByUsername finds the auth record associated with the provided username (case insensitive).
@@ -278,20 +341,19 @@ func (dao *Dao) FindAuthRecordByUsername(collectionNameOrId string, username str
 		return nil, fmt.Errorf("%q is not an auth collection", collectionNameOrId)
 	}
 
-	row := dbx.NullStringMap{}
+	record := &models.Record{}
 
 	err = dao.RecordQuery(collection).
 		AndWhere(dbx.NewExp("LOWER([["+schema.FieldNameUsername+"]])={:username}", dbx.Params{
 			"username": strings.ToLower(username),
 		})).
 		Limit(1).
-		One(row)
-
+		One(record)
 	if err != nil {
 		return nil, err
 	}
 
-	return models.NewRecordFromNullStringMap(collection, row), nil
+	return record, nil
 }
 
 // SuggestUniqueAuthRecordUsername checks if the provided username is unique