Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merging Google Code-in work into develop branch #440

Merged
merged 28 commits into from
Feb 16, 2020
Merged

Merging Google Code-in work into develop branch #440

merged 28 commits into from
Feb 16, 2020

Conversation

isabelcosta
Copy link
Member

@isabelcosta isabelcosta commented Feb 16, 2020 •
edited
Loading

Description

This pull request intends to merge the work from Google Code-in (GCI) participants.

Check here the list of GCI tasks

Fixes # [ISSUE]

Type of Change:

  • Code
  • Quality Assurance
  • Documentation

Code/Quality Assurance Only

  • Bug fix (non-breaking change which fixes an issue)
  • This change requires a documentation update (software upgrade on readme file)
  • New feature (non-breaking change which adds functionality pre-approved by mentors)

How Has This Been Tested?

Mentors performed some manual testing over crucial features of the app.

Checklist:

  • My PR follows the style guidelines of this project
  • I have performed a self-review of my own code or materials
  • I have commented my code or provided relevant documentation, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • Any dependent changes have been merged
  • Update Postman API at /docs folder
  • Update Swagger documentation and the exported file at /docs folder
  • Update requirements.txt

Code/Quality Assurance Only

  • My changes generate no new warnings
  • My PR currently breaks something (fix or feature that would cause existing functionality to not work as expected)
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been published in downstream modules

asawesome07 and others added 28 commits January 30, 2020 21:24
@asawesome07
feature: added GET/dashboard endpoint (#380)
94b9b6d
@daksha-aeer
test: Accept mentorship relation using PUT /accept API (#325)
73873bc
@asawesome07
test: add tests for cancel mentorship api (#311)
7f27349
@ooooda
test: add tests for change password api (#324)
08f8cee
@bartekpacia
feat: created cron job function which removes unverified users (#350)
6172791
@nikkiguo
style: fix typo in email verification message (#258)
3bede99
@bboomboom
style: typo fix on "user was created successfully" (#243)
eec9487
@olifog
test: delete_task error on invalid task (#247)
d0a87b5 
A test to validate whether 'delete_task' will throw a TASK_DOES_NOT_EXIST error upon an invalid task.
@daksha-aeer
feat: Add user name search functionality in GET /users API (#397)
04d4624 
Working:
1. New query string parameter 'search' added for GET /users route. If 'search' is empty then show all users, otherwise search for the query.
2. 'flask_whooshalchemyplus' module installed for search functionality. It creates search index for fields specified in '__searchable__'. Woosh index created for 'name' and 'username'.
3. search_users() function created in dao/user.py. It searches for the specified query in database. This function is called by GET /users route.

References:
https://www.youtube.com/watch?v=bAPcmGNsulc
https://github.com/Revolution1/Flask-WhooshAlchemyPlus
@annabauza
Revert "feat: Add user name search functionality in GET /users API (#397
0806a48 
)" (#426)

This reverts commit 04d4624.
@daksha-aeer
docs: add error responses to Swagger UI (#365)
6690b9f 
- 400, 401, 402, 403, 404 error codes added
- Responses taken from messages.py

Fixes issue #345
@daksha-aeer
test: add test for user deleting unauthorized task (#245)
5c2e99a 
Unauthorized user simulated using auth_header. Two tests created for admin_user and second_user. This will resolve issue #227.
@daksha-aeer
docs: improve Mentorship Relation API doc strings (#405)
2045d34
@daksha-aeer
chore: create dockerfile for backend (#298)
a7b86ce 
Resolves issue #266
@daksha-aeer
test: create tasks using POST /mentorship_relation/{request_id}/task (#…
da8b662 
…310)

Three test cases created:
1. User not involved in mentorship relation tries to create a task (FAIL)
Gives 400 and UNACCEPTED_STATE_RELATION response. Test case created using
```mentorship_relation_without_first_user```

2. Valid user tries to create task without description in the body (FAIL)
Gives 400 and DESCRIPTION_FIELD_IS_MISSING response. Test case created by
keeping description empty.

3. Valid user tries to create a task with authentication token expired (FAIL)
gives 401, TOKEN_HAS_EXPIRED response. Expired token generated using
token_expiration_delta property. Delta set to -10 seconds

Resolves issue #305
@ilyamaier
fix: validate if new and current password are different (#316)
ea10f40
@ilyamaier
feat: Add search query parameter to GET /users API (#391)
60fd800
@ilyamaier
feat: Optimize code with lambda expressions (#388)
57109df
@ilyamaier
[Program: GCI] Add is_available property to user in GET/users (#360)
35ce9c1
@Hardik0403
feat:Added query param to filter relations by state (#369)
4c0c8d2
@bartekpacia
feat: sending an email when a user receives new relation request (#273)
e393cdd
@ilyamaier
[Program: GCI] Add comment task database table (#356)
a9ade22 
feat: Add comment task database table and endpoints
Add ability to comment tasks and identify them by task_id and relationship_id
@aaeliu
style: Fix typo on line 11 of deploy.sh (#237)
fa5a796
@Xu-Zijun
style: fix typo in user database model (#280)
fd9e75f 
The models/user.py has 2 typos that I supposingly fixed.

On line 60, I removed the extra "
On line 112, I removed the extra id.
@Hardik0403
[Program:GCI] Send email when mentorship relation is accepted. (#327)
36b2395 
feat:Send email when mentorship relation accepted.
@sumit-badsara
fix: Scheduler starts only if it isn't running already. (#436)
98fd040
@isabelcosta
chore: change dockerfile to start w capital letter (#435)
e3a44d0
@annabauza
fix: dashboard crash when user is not in mentorship relation (#439)
0456540
@isabelcosta isabelcosta merged commit 3fb1a21 into develop Feb 16, 2020
@isabelcosta isabelcosta deleted the gci-dev branch March 15, 2020 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@annabauza annabauza annabauza approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.