debut ajout compte joint

internal/expense/database.go

@@ -32,6 +32,31 @@ func (db *Database) CreateExpense(expense *Expense) error {
 	return err
 }
 
+func (db Database) GetExpensesOfAnAccountBetween(id, from, to string) ([]*Expense, error) {
+	q := `
+		SELECT a.id, a.account_id, a.value, a.type_expense, a.expense_date, a.created_at, a.updated_at, a.libelle
+		FROM public.expense a
+		WHERE a.account_id = $1
+		AND a.expense_date BETWEEN $2 and $3
+	`
+	rows, err := db.Session.Query(q, id, from, to)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	es := make([]*Expense, 0)
+	for rows.Next() {
+		e := Expense{}
+		err := rows.Scan(&e.ID, &e.AccountId, &e.Value, &e.TypeExpense, &e.ExpenseDate, &e.CreatedAt, &e.UpdatedAt, &e.Libelle)
+		if err != nil {
+			return nil, err
+		}
+		es = append(es, &e)
+	}
+	return es, nil
+}
+
 func (db Database) GetAllExpensesOfAnAccount(id string) ([]*Expense, error) {
 	q := `
 		SELECT a.id, a.account_id, a.value, a.type_expense, a.expense_date, a.created_at, a.updated_at, a.libelle

internal/expense/handler.go

@@ -9,6 +9,7 @@ import (
 	"nos-comptes/internal/storage/model"
 	"nos-comptes/internal/storage/validators"
 	"nos-comptes/internal/utils"
+	"time"
 
 	"github.com/gin-gonic/gin"
 )
@@ -78,7 +79,31 @@ func (c *Context) DeleteExpense(gc *gin.Context) {
 
 func (c *Context) GetAllExpenses(gc *gin.Context) {
 	accountId := gc.Param("accountId")
-	expenses, err := c.service.GetAllExpensesOfAnAccount(accountId)
+	from := gc.Query("from")
+	to := gc.Query("to")
+	var expenses []*Expense
+	var err error
+	if from != "" || to != "" {
+		if to == "" {
+			fromParsed, err := time.Parse("2006-01-02", from)
+			if err == nil {
+				to = time.Now().Format("2006-01-02")
+			} else {
+				to = fromParsed.AddDate(0, 1, 0).Format("2006-01-02")
+			}
+		}
+		if from == "" {
+			toParsed, err := time.Parse("2006-01-02", to)
+			if err == nil {
+				from = "1900-01-01"
+			} else {
+				from = toParsed.AddDate(0, -1, 0).Format("2006-01-02")
+			}
+		}
+		expenses, err = c.service.GetExpensesOfAnAccountBetween(accountId, from, to)
+	} else {
+		expenses, err = c.service.GetAllExpensesOfAnAccount(accountId)
+	}
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetAllExpenses: get expenses")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)

internal/expense/service.go

@@ -14,6 +14,26 @@ type Service struct {
 	db *Database
 }
 
+func (s Service) GetExpensesOfAnAccountBetween(accountId, from, to string) ([]*Expense, error) {
+	expenses, err := s.db.GetExpensesOfAnAccountBetween(accountId, from, to)
+	utils.GetLogger().Info(err)
+	if e, ok := err.(*dao.Error); ok {
+		switch {
+		case e.Type == dao.ErrTypeNotFound:
+			return nil, &model.ErrNotFound
+		default:
+			return nil, &model.ErrInternalServer
+		}
+	} else if err != nil {
+		return nil, &model.ErrInternalServer
+	}
+
+	if expenses == nil {
+		return nil, &model.ErrNotFound
+	}
+	return expenses, nil
+}
+
 func (s Service) GetAllExpensesOfAnAccount(accountId string) ([]*Expense, error) {
 	expenses, err := s.db.GetAllExpensesOfAnAccount(accountId)
 	utils.GetLogger().Info(err)