PARENT ISSUE: Fix the usage of userType

[palisadoes]

Describe the bug

1. The schema doesn't apply a person's userType by organization.
2. The userType is currently a part of the User definition not part of a userOrganization definition or something similar.
   1. This means that an Admin is an Admin for all organizations which grants the same rights as a SuperAdmin. This is not the intention.
   2. This has created historical confusion in the Admin and SuperAdmin roles.

Related Issues

1. API: Fix the usage of userType #1711
2. Mobile: Fix the usage of userType talawa#2373
3. Admin: Fix the usage of userType talawa-admin#1445
4. Update the Organization People Screen Design and Functionality talawa-admin#1451
5. Update the Community Users Screen Design and Functionality talawa-admin#1452
6. Update adminApproved to expected functionality in the develop-userTypeFix branch #1862
7. Update thedevelop-userTypeFix branch with the latest features from develop - Fundraising / Recurring Events #1904
8. Admin: Fix the usage of userType talawa-admin#1445
9. Fix the MemberDetail Screen in the develop-userTypeFix branch talawa-admin#1682
10. Fix the OrganizationPeople Screen in the develop-userTypeFix branch talawa-admin#1683
11. Fix the User/Users.tx Screen in the develop-userTypeFix branch talawa-admin#1684
12. Fix the UserPortal/Organizations Screen in the develop-userTypeFix branch talawa-admin#1685
13. Fix the UserPortal/Home.tsx Screen in the develop-userTypeFix branch talawa-admin#1686
14. Update thedevelop-userTypeFix branch with the latest features from develop - Deleting Recurring Events #1987

[palisadoes]

@kanhaiya04
@Atharva-Kanherkar
@adi790uu
@Shubh152

1. When do you think we will be ready to merge the develop-userTypeFix branch back into develop?
2. There are only a few issues left
3. Would the weekend be possible with a short freeze on merging PRs? Any other date in the near future?

[Atharva-Kanherkar]

@palisadoes I can try over the weekend, I have no other commitments. I am still trying to research the parent issue, so the weekend seems like a good deadline. Will try best possible approach as soon as I can with my capabilities.

[kanhaiya04]

@palisadoes I will try to complete as soon as possible.

[AVtheking]

@Atharva-Kanherkar you can ask me if you have any doubt in the api as I have worked on that .

[palisadoes]

Do you think we'll be able to merge back into develop on Sunday night IST?

[Atharva-Kanherkar]

Do you think we'll be able to merge back into develop on Sunday night IST?

There are a lot of merge conflicts and i am working on my best to resolve them and maintain the current functionality. While i can not promise the exact time, i can try my best to do it sunday night IST or monday morning.

[Shubh152]

@palisadoes I have pushed my changes on PR #2013

[palisadoes]

Do you think we'll be able to merge back into develop on Sunday night IST?

There are a lot of merge conflicts and i am working on my best to resolve them and maintain the current functionality. While i can not promise the exact time, i can try my best to do it sunday night IST or monday morning.

Why are there merge conflicts when we merged the PR into this branch without them?

[palisadoes]

@palisadoes I have pushed my changes on PR #2013

How will this impact the merge conflict problem previously mentioned?

[Atharva-Kanherkar]

Do you think we'll be able to merge back into develop on Sunday night IST?

There are a lot of merge conflicts and i am working on my best to resolve them and maintain the current functionality. While i can not promise the exact time, i can try my best to do it sunday night IST or monday morning.

Why are there merge conflicts when we merged the PR into this branch without them?

I do not know, but i have resolved a lot of them, but there are still a lot of conflicts.. Was this not supposed to happen? I thought it was normal to have these conflicts, so i started fixing them? But there seems to be a lot of them in number.

[palisadoes]

I wasn't sure how far back in the merged PR chain you were updating. It sounds like you are doing up to the most current one. This helps.

I'll try not to merge any more PRs into any of the repos so that we can have stability until we are ready to merge back into develop.

I'll let the other PR submitters know to expect a delay over the weekend in a few hours

[Shubh152]

@palisadoes I have pushed my changes on PR #2013

How will this impact the merge conflict problem previously mentioned?

I think it should not introduce more merge conflicts.

[Atharva-Kanherkar]

It is still causing merge conflicts. Is the PR merged? So that i can be sure that it is not causing any merge conflicts?

[Shubh152]

It is still causing merge conflicts. Is the PR merged? So that i can be sure that it is not causing any merge conflicts?

No, it is not merged yet.

[AVtheking]

@palisadoes I have pushed my changes on PR #2013

How will this impact the merge conflict problem previously mentioned?

@palisadoes it's because he has merged the latest changes in the develop branch which will cause merge conflicts in on all the files that are being modified in the develop recently and in develop-UserTypeFix branch

[palisadoes]

It is still causing merge conflicts. Is the PR merged? So that i can be sure that it is not causing any merge conflicts?

No, it is not merged yet.

@Shubh152 The tests are failing. Please fix

[palisadoes]

@AVtheking @Atharva-Kanherkar can you chat on slack to figure out what is going on with the conflicts.

No new PRs have been merged for 2 days.

[AVtheking]

@palisadoes yes we are interacting on slack to resolve the conflicts