talawa-api
talawa-api copied to clipboard
Fixes #1897
What kind of change does this PR introduce?
feature
Issue Number:
Fixes #1897
Did you add tests for your changes?
No
If relevant, did you update the documentation?
No
Summary
Removes some unnecessary steps, workflows and scripts.
Does this PR introduce a breaking change?
Yes
Have you read the contributing guide?
yes
Our Pull Request Approval Process
We have these basic policies to make the approval process smoother for our volunteer team.
Testing Your Code
Please make sure your code passes all tests. Our test code coverage system will fail if these conditions occur:
- The overall code coverage drops below the target threshold of the repository
- Any file in the pull request has code coverage levels below the repository threshold
- Merge conflicts
The process helps maintain the overall reliability of the code base and is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing.
Reviewers
Do not assign reviewers. Our Queue Monitors will review your PR and assign them. When your PR has been assigned reviewers contact them to get your code reviewed and approved via:
- comments in this PR or
- our slack channel
Reviewing Your Code
Your reviewer(s) will have the following roles:
- arbitrators of future discussions with other contributors about the validity of your changes
- point of contact for evaluating the validity of your work
- person who verifies matching issues by others that should be closed.
- person who gives general guidance in fixing your tests
CONTRIBUTING.md
Read our CONTRIBUTING.md file. Most importantly:
- PRs with issues not assigned to you will be closed by the reviewer
- Fix the first comment in the PR so that each issue listed automatically closes
Other
- :dart: Please be considerate of our volunteers' time. Contacting the person who assigned the reviewers is not advised unless they ask for your input. Do not @ the person who did the assignment otherwise.
- Read the CONTRIBUTING.md file make
Codecov Report
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 98.75%. Comparing base (
1d59a11
) to head (4808a84
). Report is 156 commits behind head on develop.
Additional details and impacted files
@@ Coverage Diff @@
## develop #2027 +/- ##
========================================
Coverage 98.75% 98.75%
========================================
Files 331 331
Lines 20928 20928
Branches 1680 1699 +19
========================================
Hits 20668 20668
Misses 244 244
Partials 16 16
:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.
This is an update on the PR merging freeze:
- In the next few hours we will be merging the
develop-userTypeFix
branch into thedevelop
branch. - The
develop-userTypeFix
branch was created to fix a long standing design flaw where Admins were Admins of all organizations, not specific ones. - The
userType
field has been removed from the User collection and it has been replaced by anappUserProfileId
field.- This field is
null
if the user isn’t registered to use the apps. This will help people to add users manually during the event checkin process, or if an Admin wants to manually add someone in the Admin dashboard. - When not
null
theAppUserProfileID
will reference aAppUserProfile
collection with App related information such as the organizations for which a user may be an Admin. - The updated schema can be found here https://github.com/PalisadoesFoundation/talawa-api/blob/develop-userTypeFix/schema.graphql
- This is the parent issue that we have been using to track progress:
- https://github.com/PalisadoesFoundation/talawa-api/issues/1965
- This field is
- This merge will cause some conflicts in your PR.
We decided to do this at the beginning of the weekend to give us all time to adjust PR code and create bug fixes that may arise.
Update your code at or after midnight GMT on the morning of March 23, 2024. (5:30am IST).
If your PRs have already been approved, request a re-review after fixing the conflicts and refactoring to the new AppUserProfileID
methodology.
The PR merging freeze is lifted.
- We are working on bug fixes that may arise. These should be few and are being tracked here:
- https://github.com/orgs/PalisadoesFoundation/projects/24
- Please update your PRs and local repos. Fix any new merge conflicts that may have occurred.
Background:
- The
develop-userTypeFix
branch was created to fix a long standing design flaw where Admins were Admins of all organizations, not specific ones. - The
userType
field has been removed from the User collection and it has been replaced by anappUserProfileId
field.- This field is
null
if the user isn’t registered to use the apps. This will help people to add users manually during the event checkin process, or if an Admin wants to manually add someone in the Admin dashboard. - When not
null
theAppUserProfileID
will reference aAppUserProfile
collection with App related information such as the organizations for which a user may be an Admin. - The updated schema can be found here https://github.com/PalisadoesFoundation/talawa-api/blob/develop-userTypeFix/schema.graphql
- This is the parent issue that we have been using to track progress:
- https://github.com/PalisadoesFoundation/talawa-api/issues/1965
- This field is
- If your PRs have already been approved, request a re-review after fixing the conflicts and refactoring to the new
AppUserProfileID
methodology.
@adi790uu Please fix the conflicting files.
@Cioppolo14 it will fail as I have removed certain parts of the workflow which are not necessary after the merge of my latest PR in talawa-docs repo
@anwersayeed can you review this.
Please fix the conflicting file
@adi790uu Please resolve the conflicts, we will merge this PR as https://github.com/PalisadoesFoundation/talawa-docs/pull/774 is now working.
This pull request did not get any activity in the past 10 days and will be closed in 180 days if no update occurs. Please verify it has no conflicts with the develop branch and rebase if needed. Mention it now if you need help or give permission to other people to finish your work.
Please fix the conflicting files. The documentation workflow is still failing.
Closing as abandoned. No activity for 3 weeks.
@palisadoes sorry for the delay but can you reopen this, I am working on mobile docs automation after that I will fix this.
This pull request did not get any activity in the past 10 days and will be closed in 180 days if no update occurs. Please verify it has no conflicts with the develop branch and rebase if needed. Mention it now if you need help or give permission to other people to finish your work.
Please fix the conflicting file
This pull request did not get any activity in the past 10 days and will be closed in 180 days if no update occurs. Please verify it has no conflicts with the develop branch and rebase if needed. Mention it now if you need help or give permission to other people to finish your work.
Closing as abandoned