correction des pb de space : le spaceId est maintenant dans l'url uniquement

backend/internal/adapter/database/turso/user_repository.go

@@ -4,34 +4,33 @@ import (
 	"database/sql"
 	"log"
 
+	"trankilou.fr/lassistanoque/backend/internal/adapter/database/orm"
 	"trankilou.fr/lassistanoque/backend/internal/domain"
-
-	"gitea.trankilou.fr/fabien/lasebuche"
 )
 
 type TursoUserRepository struct {
 	DB            *sql.DB
-	UserTable     lasebuche.Table[domain.User]
-	TeamTable     lasebuche.Table[domain.Team]
-	UserTeamTable lasebuche.Table[domain.UserTeam]
-	AddressTable  lasebuche.Table[domain.UserAddress]
+	UserTable     orm.Table[domain.User]
+	TeamTable     orm.Table[domain.Team]
+	UserTeamTable orm.Table[domain.UserTeam]
+	AddressTable  orm.Table[domain.UserAddress]
 }
 
 func NewTursoUserRepository(db *sql.DB) *TursoUserRepository {
-	dialect := lasebuche.NewSqliteDialect()
-	userTable, err := lasebuche.NewTable[domain.User](db, dialect, "users")
+	dialect := orm.NewSqliteDialect()
+	userTable, err := orm.NewTable[domain.User](db, dialect, "users")
 	if err != nil {
 		log.Fatalf("error creating lasebuche user table")
 	}
-	teamTable, err := lasebuche.NewTable[domain.Team](db, dialect, "teams")
+	teamTable, err := orm.NewTable[domain.Team](db, dialect, "teams")
 	if err != nil {
 		log.Fatalf("error creating lasebuche team table")
 	}
-	userTeamTable, err := lasebuche.NewTable[domain.UserTeam](db, dialect, "user_teams")
+	userTeamTable, err := orm.NewTable[domain.UserTeam](db, dialect, "user_teams")
 	if err != nil {
 		log.Fatalf("error creating lasebuche team table")
 	}
-	userAddressTable, err := lasebuche.NewTable[domain.UserAddress](db, dialect, "user_addresses")
+	userAddressTable, err := orm.NewTable[domain.UserAddress](db, dialect, "user_addresses")
 	if err != nil {
 		log.Fatalf("error creating lasebuche team table")
 	}
@@ -53,7 +52,7 @@ func (ur *TursoUserRepository) FindUserByEmail(email string) (*domain.User, erro
 }
 
 func (ur *TursoUserRepository) ListUsers() ([]*domain.User, error) {
-	return ur.UserTable.SelectWhere("")
+	return ur.UserTable.Select()
 }
 
 func (ur *TursoUserRepository) CreateUser(user *domain.User) (*domain.User, error) {
@@ -73,7 +72,10 @@ func (ur *TursoUserRepository) FindTeam(userid string, teamid string) (*domain.T
 }
 
 func (ur *TursoUserRepository) ListTeams(userid string) ([]*domain.Team, error) {
-	return ur.TeamTable.SelectWhere("id in (select team_id from user_teams where user_id=$1)", userid)
+	return ur.TeamTable.Select(
+		orm.WithWhere("id in (select team_id from user_teams where user_id=$1)", userid),
+		orm.WithOrder("label asc"),
+	)
 }
 
 func (ur *TursoUserRepository) CreateTeam(userid string, team *domain.Team) (*domain.Team, error) {
@@ -108,7 +110,9 @@ func (ur *TursoUserRepository) FindUserTeam(userid string, teamid string) (*doma
 }
 
 func (ur *TursoUserRepository) ListUserTeams(userid string) ([]*domain.UserTeam, error) {
-	return ur.UserTeamTable.SelectWhere("user_id=$1", userid)
+	return ur.UserTeamTable.Select(
+		orm.WithWhere("user_id=$1", userid),
+	)
 }
 
 func (ur *TursoUserRepository) CreateUserTeam(userid string, team *domain.UserTeam) (*domain.UserTeam, error) {
@@ -124,7 +128,10 @@ func (ur *TursoUserRepository) DeleteUserTeam(userid string, teamid string) erro
 }
 
 func (ur *TursoUserRepository) ListUserAddresses(id string) ([]*domain.UserAddress, error) {
-	return ur.AddressTable.SelectWhere("user_id=$1", id)
+	return ur.AddressTable.Select(
+		orm.WithWhere("user_id=$1", id),
+		orm.WithOrder("type asc"),
+	)
 }
 
 func (ur *TursoUserRepository) GetUserAddress(addrID string) (*domain.UserAddress, error) {