Merge pull request #36 from ogurilab/feature/fix-menu-order

fix menu order by sql

app/infrastructure/db/query/menu.sql

@@ -26,8 +26,8 @@ WHERE id = sqlc.arg(id)
 SELECT *
 FROM menus AS m
 WHERE city_code = sqlc.arg(city_code)
-  AND offered_at >= sqlc.arg(offered_at)
-ORDER BY offered_at
+  AND offered_at <= sqlc.arg(offered_at)
+ORDER BY offered_at DESC
 LIMIT ? OFFSET ?;
 
 -- name: GetMenuWithDishes :one
@@ -63,9 +63,9 @@ SELECT m.*,
 FROM menus AS m
   LEFT JOIN dishes AS d ON m.id = d.menu_id
 WHERE m.city_code = sqlc.arg(city_code)
-  AND m.offered_at >= sqlc.arg(offered_at)
+  AND m.offered_at <= sqlc.arg(offered_at)
 GROUP BY m.id
-ORDER BY offered_at
+ORDER BY offered_at DESC
 LIMIT ? OFFSET ?;
 
 -- name: ListMenuWithDishes :many
@@ -82,7 +82,7 @@ SELECT m.*,
   ) AS dishes
 FROM menus AS m
   LEFT JOIN dishes AS d ON m.id = d.menu_id
-WHERE m.offered_at >= sqlc.arg(offered_at)
+WHERE m.offered_at <= sqlc.arg(offered_at)
 GROUP BY m.id
-ORDER BY offered_at
+ORDER BY offered_at DESC
 LIMIT ? OFFSET ?;

app/infrastructure/db/sqlc/menu_test.go

@@ -96,18 +96,20 @@ func TestGetWithDishes(t *testing.T) {
 }
 
 func TestFetchMenuWithDishesByCity(t *testing.T) {
+	start := time.Now()
 	for i := 0; i < 10; i++ {
-		menu := createRandomMenu(t)
+		menu := createRandomMenuFromStart(t, start)
 
 		for j := 0; j < 10; j++ {
 			createRandomDish(t, menu.ID)
 		}
 	}
 
 	arg := ListMenuWithDishesByCityParams{
-		Limit:    5,
-		Offset:   5,
-		CityCode: cityCode,
+		Limit:     5,
+		Offset:    5,
+		CityCode:  cityCode,
+		OfferedAt: start,
 	}
 
 	results, err := testQuery.ListMenuWithDishesByCity(context.Background(), arg)

app/util/random.go

@@ -70,7 +70,7 @@ func RandomYYYYMMDD() string {
 func RandomDateFromStart(start time.Time) time.Time {
 	// YYYY-MM-DD
 
-	year := RandomInt(start.Year(), start.Year()+1000)
+	year := RandomInt(start.Year()-1000, start.Year())
 	month := RandomInt(1, 12)
 	day := RandomInt(1, 31)