removed search
This commit is contained in:
parent
d4780ccef4
commit
d2ffc76066
6 changed files with 10 additions and 16 deletions
|
|
@ -20,6 +20,7 @@ func (s *Store) loadFile(file string) {
|
|||
if version <= s.version() {
|
||||
return
|
||||
}
|
||||
log.Println("migration: ", file)
|
||||
|
||||
query, _ := migrations.ReadFile("migrations/" + file)
|
||||
_, err = s.db.Exec(string(query))
|
||||
|
|
|
|||
|
|
@ -77,18 +77,14 @@ func (s *Store) GetOrder(id int) (models.Order, error) {
|
|||
return out[0], nil
|
||||
}
|
||||
|
||||
func (s *Store) GetFilteredOrder(filter string, from, to time.Time) ([]models.Order, error) {
|
||||
func (s *Store) GetOrders(from, to time.Time) ([]models.Order, error) {
|
||||
start := from.Format("2006-01-02") + " 00:00"
|
||||
end := to.Format("2006-01-02") + " 99:99"
|
||||
if to.IsZero() {
|
||||
end = "9999-99-99 99:99"
|
||||
}
|
||||
if filter == "" {
|
||||
query := "select * from customer_order where status != 'done' and delivery_date >= ? and delivery_date <= ? ;"
|
||||
return s.getOrdersFromQuery(query, start, end)
|
||||
}
|
||||
query := "select id, name, surname, phone, location, order_date, delivery_date, status, paid from order_fts(?) where delivery_date >= ? and delivery_date <= ? order by rank;"
|
||||
return s.getOrdersFromQuery(query, filter, start, end)
|
||||
query := "select * from customer_order where status != 'done' and delivery_date >= ? and delivery_date <= ? ;"
|
||||
return s.getOrdersFromQuery(query, start, end)
|
||||
}
|
||||
|
||||
func (s *Store) UpdateOrderContents(tx *sql.Tx, newOrder models.Order) error {
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ func OpenStore(filename string) *Store {
|
|||
|
||||
out.loadMigrations()
|
||||
out.cakes, err = out.loadCakes()
|
||||
log.Println(out.cakes)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/Bronku/iroon/internal/models"
|
||||
"github.com/Bronku/iroon/models"
|
||||
)
|
||||
|
||||
func TestStore(t *testing.T) {
|
||||
|
|
@ -19,7 +19,7 @@ func TestStore(t *testing.T) {
|
|||
if len(cakes) != 0 {
|
||||
t.Errorf("Expected empty cakes list, got: %v", cakes)
|
||||
}
|
||||
orders, err := s.GetFilteredOrder("", time.Now(), time.Now().Add(time.Hour*24))
|
||||
orders, err := s.GetOrders(time.Now(), time.Now().Add(time.Hour*24))
|
||||
if err != nil {
|
||||
t.Errorf("Error getting orders: %v", err)
|
||||
}
|
||||
|
|
@ -170,7 +170,7 @@ func TestStore(t *testing.T) {
|
|||
}
|
||||
|
||||
// get orders
|
||||
orders, err = s.GetFilteredOrder("", time.Time{}, time.Time{})
|
||||
orders, err = s.GetOrders(time.Time{}, time.Time{})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to get all orders after creation: %v", err)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue