-
Notifications
You must be signed in to change notification settings - Fork 49
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Implement mentor availability endpoint #64
Merged
anjula-sack
merged 17 commits into
sef-global:main
from
Shrenik0321:implement-mentor-availability-endpoint
Sep 23, 2023
Merged
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
fd3ab92
Get all users endpoint
Shrenik0321 be88998
Merge branch 'main' of https://github.com/Shrenik0321/scholarx-backen…
Shrenik0321 38ddb1f
Merge branch 'main' into get-all-users-endpoint
YoshithaRathnayake 0c23030
Merge branch 'main' into get-all-users-endpoint
Shrenik0321 7640d98
Folder structure fix
Shrenik0321 50d0837
Merge branch 'main' of https://github.com/Shrenik0321/scholarx-backen…
Shrenik0321 932e287
Issue fixes
Shrenik0321 2301af2
Merge branch 'get-all-users-endpoint' of https://github.com/Shrenik03…
Shrenik0321 990c846
Unit Test updates
Shrenik0321 17bf386
Testing for Admin role
Shrenik0321 833f565
Issue fixes for Admin role
Shrenik0321 23d63c3
Merge conflict
Shrenik0321 b363354
Implement the mentor availability endpoint
Shrenik0321 cadcd48
Implement the mentor availability endpoint
Shrenik0321 0e3c4af
Changed routes and added test
Shrenik0321 73097e3
lint warning fix
Shrenik0321 ddffc6c
Admin route update
Shrenik0321 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 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 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,86 @@ | ||
import { startServer } from '../../app' | ||
import type { Express } from 'express' | ||
import supertest from 'supertest' | ||
import Profile from '../../entities/profile.entity' | ||
import { ProfileTypes } from '../../enums' | ||
import { dataSource } from '../../configs/dbConfig' | ||
import bcrypt from 'bcrypt' | ||
|
||
const port = Math.floor(Math.random() * (9999 - 3000 + 1)) + 3000 | ||
|
||
const randomString = Math.random().toString(36) | ||
const randomStringAdmin = Math.random().toString(36) | ||
let server: Express | ||
let agent: supertest.SuperAgentTest | ||
let adminAgent: supertest.SuperAgentTest | ||
|
||
describe('Get all users route', () => { | ||
beforeAll(async () => { | ||
server = await startServer(port) | ||
agent = supertest.agent(server) | ||
adminAgent = supertest.agent(server) | ||
|
||
const defaultUser = { | ||
email: `test${randomString}@gmail.com`, | ||
password: '123' | ||
} | ||
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. You can import this from mock.ts. |
||
|
||
await supertest(server) | ||
.post('/api/auth/register') | ||
.send(defaultUser) | ||
.expect(201) | ||
|
||
await agent.post('/api/auth/#').send(defaultUser).expect(200) | ||
|
||
const adminUser = { | ||
email: `test${randomStringAdmin}@gmail.com`, | ||
password: 'admin123' | ||
} | ||
|
||
const profileRepository = dataSource.getRepository(Profile) | ||
|
||
const hashedPassword = await bcrypt.hash(adminUser.password, 10) | ||
const newProfile = profileRepository.create({ | ||
primary_email: adminUser.email, | ||
password: hashedPassword, | ||
contact_email: '', | ||
first_name: '', | ||
last_name: '', | ||
image_url: '', | ||
linkedin_url: '', | ||
type: ProfileTypes.ADMIN | ||
}) | ||
|
||
await profileRepository.save(newProfile) | ||
|
||
await adminAgent.post('/api/auth/#').send(adminUser).expect(200) | ||
}, 5000) | ||
|
||
it('should return a 401 when a valid access token is not provided', async () => { | ||
await supertest(server).get('/api/admin/users').expect(401) | ||
}) | ||
|
||
it('should return a 403 if user is not admin', async () => { | ||
await agent.get('/api/admin/users').expect(403) | ||
}) | ||
|
||
it('should return a 200 with all users if user is admin', async () => { | ||
const response = await adminAgent.get('/api/admin/users').expect(200) | ||
|
||
const userProfiles = response.body.profiles | ||
|
||
userProfiles.forEach((userProfile: Partial<Profile>) => { | ||
expect(userProfile).toHaveProperty('created_at') | ||
expect(userProfile).toHaveProperty('updated_at') | ||
expect(userProfile).toHaveProperty('primary_email') | ||
expect(userProfile).toHaveProperty('contact_email') | ||
expect(userProfile).toHaveProperty('first_name') | ||
expect(userProfile).toHaveProperty('last_name') | ||
expect(userProfile).toHaveProperty('image_url') | ||
expect(userProfile).toHaveProperty('linkedin_url') | ||
expect(userProfile).toHaveProperty('type') | ||
expect(userProfile).toHaveProperty('uuid') | ||
expect(userProfile).not.toHaveProperty('password') | ||
}) | ||
}) | ||
}) |
This file contains 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 |
---|---|---|
|
@@ -4,12 +4,18 @@ import { | |
getProfileHandler, | ||
updateProfileHandler | ||
} from '../../controllers/profile.controller' | ||
import { mentorAvailabilityHandler } from './../../controllers/mentor.controller' | ||
import { requireAuth } from '../../controllers/auth.controller' | ||
|
||
const profileRouter = express.Router() | ||
|
||
profileRouter.get('/profile', requireAuth, getProfileHandler) | ||
profileRouter.put('/profile', requireAuth, updateProfileHandler) | ||
profileRouter.delete('/profile', requireAuth, deleteProfileHandler) | ||
profileRouter.put( | ||
'/mentor/availability', | ||
requireAuth, | ||
mentorAvailabilityHandler | ||
) | ||
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. This should go to mentor routes @Shrenik0321 |
||
|
||
export default profileRouter |
This file contains 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,8 @@ | ||
import { dataSource } from '../configs/dbConfig' | ||
import Profile from '../entities/profile.entity' | ||
|
||
export const getAllUsers = async (): Promise<Profile[] | undefined> => { | ||
const profileRepository = dataSource.getRepository(Profile) | ||
const allUsers = await profileRepository.find() | ||
return allUsers | ||
} |
This file contains 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
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.
This can be removed. Check mock.ts