ADDED - GET endpoint /users/{userId}/additional-info to fetch additional information from userId

anitab-org / bridge-in-tech-backend

BridgeInTech (BIT) is an application that allows organizations, mentors and mentees to actively collaborate through mentoring programs. This is the backend client of BridgeInTech.

https://bridgeintech-bit-heroku-psql.herokuapp.com/

GNU General Public License v3.0

24 stars 80 forks source link

ADDED - GET endpoint /users/{userId}/additional-info to fetch additional information from userId #275

Closed naveen8801 closed 3 years ago

naveen8801 commented 3 years ago

Description

Added GET endpoint /users/{userId}/additional-info to fetch additional information from userId

Fixes #215

Type of Change:

Code

Code/Quality Assurance Only

New feature (non-breaking change which adds functionality pre-approved by mentors)

How Has This Been Tested?

Screenshot (59)

Checklist:

[x] My PR follows the style guidelines of this project
[x] I have performed a self-review of my own code or materials
[x] I have commented my code or provided relevant documentation, particularly in hard-to-understand areas

Code/Quality Assurance Only

[x] My changes generate no new warnings
[x] New and existing unit tests pass locally with my changes

naveen8801 commented 3 years ago

Hi @mtreacy002 , can you please explain me the conflict & how to resolve it ?

epicadk commented 3 years ago

Please solve the merge conflicts

naveen8801 commented 3 years ago

Please solve the merge conflicts

Hi @mtreacy002 @epicadk , i am unable to solve this conflict :( , please help !

epicadk commented 3 years ago

Please solve the merge conflicts

Hi @mtreacy002 @epicadk , i am unable to solve this conflict :( , please help !

Do git fetch upstream and then git merge upstream/develop

naveen8801 commented 3 years ago

Please solve the merge conflicts

Hi @mtreacy002 @epicadk , i am unable to solve this conflict :( , please help !

Do git fetch upstream and then git merge upstream/develop

@epicadk , i have executed both commands but know user.py is showing errors :(

conflict

epicadk commented 3 years ago

Please solve the merge conflicts

Hi @mtreacy002 @epicadk , i am unable to solve this conflict :( , please help !

Do git fetch upstream and then git merge upstream/develop

@epicadk , i have executed both commands but know user.py is showing errors :(

Yeah you'll have to fix these and them run git merge --continue

vj-codes commented 3 years ago

@naveen8801 your fork is 2 commits behind develop , in case you are having a problem resolving the conflicts as said above just copy-paste users.py from the main repo to your fork and commit.

mtreacy002 commented 3 years ago

@epicadk and @vj-codes , can you please help give final review before I merge this to develop? Thanks 😉

mtreacy002 commented 3 years ago

Thank you @epicadk and @vj-codes ❤️ . Merging it now 😉