Skip to content

Commit bc690a3

Browse files
authored
Merge pull request #1182 from code-corps/fix-order-of-github-events
Fix order of github events
2 parents 3c668e3 + 9587413 commit bc690a3

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

lib/code_corps_web/controllers/github_event_controller.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ defmodule CodeCorpsWeb.GithubEventController do
1919
github_events =
2020
GithubEvent
2121
|> Query.id_filter(params)
22-
|> Ecto.Query.order_by([asc: :inserted_at])
22+
|> Ecto.Query.order_by([desc: :inserted_at])
2323
|> paginate(params)
2424

2525
conn |> render("index.json-api", data: github_events)

priv/repo/structure.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
-- PostgreSQL database dump
33
--
44

5-
-- Dumped from database version 9.5.9
6-
-- Dumped by pg_dump version 10.0
5+
-- Dumped from database version 9.5.10
6+
-- Dumped by pg_dump version 10.1
77

88
SET statement_timeout = 0;
99
SET lock_timeout = 0;

test/lib/code_corps_web/controllers/github_event_controller_test.exs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ defmodule CodeCorpsWeb.GithubEventControllerTest do
2828
end
2929

3030
@tag authenticated: :admin
31-
test "lists all entries on index by inserted_at", %{conn: conn} do
32-
github_event_1 = insert(:github_event, inserted_at: Timex.now())
33-
github_event_2 = insert(:github_event, inserted_at: Timex.now() |> Timex.shift(days: 3))
31+
test "lists all entries on index by inserted_at desc", %{conn: conn} do
32+
past_event = insert(:github_event, inserted_at: Timex.now())
33+
recent_event = insert(:github_event, inserted_at: Timex.now() |> Timex.shift(days: 3))
3434

35-
data =
35+
data =
3636
conn
3737
|> request_index
3838
|> json_response(200)
3939
|> Map.get("data")
4040

4141
[first_event, second_event] = data
42-
assert first_event["id"] == github_event_1.id |> Integer.to_string
43-
assert second_event["id"] == github_event_2.id |> Integer.to_string
42+
assert first_event["id"] == recent_event.id |> Integer.to_string
43+
assert second_event["id"] == past_event.id |> Integer.to_string
4444
end
4545

4646
@tag authenticated: :admin

0 commit comments

Comments
 (0)