Skip to content

Commit 3d075e1

Browse files
authored
Merge pull request #427 from devforth/feature/AdminForth/1049/rip
fix: reverse date and display bug
2 parents 33f7829 + 04ef594 commit 3d075e1

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

live-demo/app/index.ts

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,16 @@ if (import.meta.url === `file://${process.argv[1]}`) {
148148
const db = admin.resource('aparts').dataConnector.client;
149149
const days = req.body.days || 7;
150150
const apartsByDays = await db.prepare(
151-
`SELECT
151+
`SELECT
152152
strftime('%Y-%m-%d', created_at) as day,
153153
COUNT(*) as count
154154
FROM apartments
155155
GROUP BY day
156-
ORDER BY day DESC
157-
LIMIT ?;
158-
`
156+
ORDER BY day ASC
157+
LIMIT ?;`
159158
).all(days);
160159

160+
161161
const totalAparts = apartsByDays.reduce((acc: number, { count }: { count:number }) => acc + count, 0);
162162

163163
// add listed, unlisted, listedPrice, unlistedPrice
@@ -170,19 +170,18 @@ if (import.meta.url === `file://${process.argv[1]}`) {
170170
SUM((1 - listed) * price) as unlistedPrice
171171
FROM apartments
172172
GROUP BY day
173-
ORDER BY day DESC
174-
LIMIT ?;
175-
`
173+
ORDER BY day ASC
174+
LIMIT ?;`
176175
).all(days);
177176

177+
178178
const apartsCountsByRooms = await db.prepare(
179179
`SELECT
180180
number_of_rooms,
181181
COUNT(*) as count
182182
FROM apartments
183183
GROUP BY number_of_rooms
184-
ORDER BY number_of_rooms;
185-
`
184+
ORDER BY number_of_rooms;`
186185
).all();
187186

188187
const topCountries = await db.prepare(
@@ -192,27 +191,24 @@ if (import.meta.url === `file://${process.argv[1]}`) {
192191
FROM apartments
193192
GROUP BY country
194193
ORDER BY count DESC
195-
LIMIT 4;
196-
`
194+
LIMIT 4;`
197195
).all();
198196

199197
const totalSquare = await db.prepare(
200198
`SELECT
201199
SUM(square_meter) as totalSquare
202-
FROM apartments;
203-
`
200+
FROM apartments;`
204201
).get();
205202

206203
const listedVsUnlistedPriceByDays = await db.prepare(
207-
`SELECT
204+
`SELECT
208205
strftime('%Y-%m-%d', created_at) as day,
209206
SUM(listed * price) as listedPrice,
210207
SUM((1 - listed) * price) as unlistedPrice
211208
FROM apartments
212209
GROUP BY day
213-
ORDER BY day DESC
214-
LIMIT ?;
215-
`
210+
ORDER BY day ASC
211+
LIMIT ?;`
216212
).all(days);
217213

218214
const totalListedPrice = Math.round(listedVsUnlistedByDays.reduce((

0 commit comments

Comments
 (0)