-
Couldn't load subscription status.
- Fork 0
Get all users route #69
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mehanana
wants to merge
9
commits into
main
Choose a base branch
from
49-get-all-users-route
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
f852c0b
added GET /users route
mehanana bd102d8
Merge branch 'main' into 49-get-all-users-route
mehanana c4fd9eb
added logic and kysely db
mehanana bd3d8b0
added pagination
mehanana 4603e63
wrote tests
mehanana 490469e
Merge branch 'main' into 49-get-all-users-route
nourshoreibah 2f7bde9
Merge branch 'main' into 49-get-all-users-route
nourshoreibah fa2927e
Merge branch 'main' into 49-get-all-users-route
nourshoreibah 6ce5544
Merge branch 'main' into 49-get-all-users-route
nourshoreibah File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| DATABASE_URL=postgresql://branch_dev:password@localhost:5432/branch_db | ||
| DATABASE_URL=postgresql://branch_dev:password@localhost:5433/branch_db | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -1,5 +1,6 @@ | ||||||||
| import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda'; | ||||||||
| import db from './db'; | ||||||||
| import db from './db' | ||||||||
|
|
||||||||
|
|
||||||||
| export const handler = async (event: any): Promise<APIGatewayProxyResult> => { | ||||||||
| try { | ||||||||
|
|
@@ -10,6 +11,8 @@ export const handler = async (event: any): Promise<APIGatewayProxyResult> => { | |||||||
| const normalizedPath = rawPath.replace(/\/$/, ''); | ||||||||
| const method = (event.requestContext?.http?.method || event.httpMethod || 'GET').toUpperCase(); | ||||||||
|
|
||||||||
| console.log('DEBUG - rawPath:', rawPath, 'normalizedPath:', normalizedPath, 'method:', method); | ||||||||
|
|
||||||||
| // Health check | ||||||||
| if ((normalizedPath.endsWith('/health') || normalizedPath === '/health') && method === 'GET') { | ||||||||
| return json(200, { ok: true, timestamp: new Date().toISOString() }); | ||||||||
|
|
@@ -18,7 +21,52 @@ export const handler = async (event: any): Promise<APIGatewayProxyResult> => { | |||||||
| // >>> ROUTES-START (do not remove this marker) | ||||||||
| // CLI-generated routes will be inserted here | ||||||||
|
|
||||||||
| // GET /{userId} (dev server strips /users prefix) | ||||||||
|
|
||||||||
| // GET /users | ||||||||
| if ((normalizedPath === '/users' || normalizedPath === '' || normalizedPath === '/') && method === 'GET') { | ||||||||
| // TODO: Add your business logic here | ||||||||
| const queryParams = event.queryStringParameters || {}; | ||||||||
| const page = queryParams.page ? parseInt(queryParams.page, 10) : null; | ||||||||
| const limit = queryParams.limit ? parseInt(queryParams.limit, 10) : null; | ||||||||
|
|
||||||||
| if (page && limit) { | ||||||||
| const offset = (page - 1) * limit; | ||||||||
|
|
||||||||
| const totalCount = await db | ||||||||
| .selectFrom('branch.users') | ||||||||
| .select(db.fn.count('user_id').as('count')) | ||||||||
| .executeTakeFirst(); | ||||||||
|
|
||||||||
| const totalUsers = Number(totalCount?.count || 0); | ||||||||
| const totalPages = Math.ceil(totalUsers / limit); | ||||||||
|
|
||||||||
| const users = await db | ||||||||
| .selectFrom('branch.users') | ||||||||
| .selectAll() | ||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Need this to make sure tests pass since it depends on users being ordered by id |
||||||||
| .limit(limit) | ||||||||
| .offset(offset) | ||||||||
| .execute(); | ||||||||
| return json(200, { | ||||||||
| users, | ||||||||
| pagination: { | ||||||||
| page, | ||||||||
| limit, | ||||||||
| totalUsers, | ||||||||
| totalPages | ||||||||
| } | ||||||||
| }); | ||||||||
| } | ||||||||
|
|
||||||||
| const users = await db | ||||||||
| .selectFrom('branch.users') | ||||||||
| .selectAll() | ||||||||
| .execute(); | ||||||||
|
|
||||||||
| console.log(users); | ||||||||
| return json(200, { users }); | ||||||||
| } | ||||||||
|
|
||||||||
| // GET /{userId} | ||||||||
| if (normalizedPath.startsWith('/') && normalizedPath.split('/').length === 2 && method === 'GET') { | ||||||||
nourshoreibah marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||
| const userId = normalizedPath.split('/')[1]; | ||||||||
| if (!userId) return json(400, { message: 'userId is required' }); | ||||||||
|
|
@@ -65,6 +113,7 @@ export const handler = async (event: any): Promise<APIGatewayProxyResult> => { | |||||||
|
|
||||||||
| return json(200, { ok: true, route: 'PATCH /users/{userId}', pathParams: { userId }, body: { email: updatedUser!.email, name: updatedUser!.name, isAdmin: updatedUser!.is_admin } }); | ||||||||
| } | ||||||||
|
|
||||||||
| // <<< ROUTES-END | ||||||||
|
|
||||||||
| return json(404, { message: 'Not Found', path: normalizedPath, method }); | ||||||||
|
|
@@ -85,4 +134,4 @@ function json(statusCode: number, body: unknown): APIGatewayProxyResult { | |||||||
| }, | ||||||||
| body: JSON.stringify(body) | ||||||||
| }; | ||||||||
| } | ||||||||
| } | ||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| module.exports = { | ||
| preset: 'ts-jest', | ||
| testEnvironment: 'node', | ||
| testMatch: ['**/*.test.ts'], | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch!