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.

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

Fixes #1897 #2027

Closed
wants to merge 2 commits into from
Closed

Conversation

adi790uu
Copy link
Contributor

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

@adi790uu adi790uu requested a review from palisadoes as a code owner March 18, 2024 18:11
Copy link

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:

  1. The overall code coverage drops below the target threshold of the repository
  2. Any file in the pull request has code coverage levels below the repository threshold
  3. 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:

  1. comments in this PR or
  2. our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

  1. arbitrators of future discussions with other contributors about the validity of your changes
  2. point of contact for evaluating the validity of your work
  3. person who verifies matching issues by others that should be closed.
  4. person who gives general guidance in fixing your tests

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

  1. PRs with issues not assigned to you will be closed by the reviewer
  2. Fix the first comment in the PR so that each issue listed automatically closes

Other

  1. 🎯 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.
  2. Read the CONTRIBUTING.md file make

Copy link

codecov bot commented Mar 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

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           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Cioppolo14 Cioppolo14 requested review from SiddheshKukade and EshaanAgg and removed request for palisadoes March 18, 2024 23:53
@palisadoes
Copy link
Contributor

This is an update on the PR merging freeze:

  1. In the next few hours we will be merging the develop-userTypeFix branch into the develop branch.
  2. The develop-userTypeFix branch was created to fix a long standing design flaw where Admins were Admins of all organizations, not specific ones.
  3. The userType field has been removed from the User collection and it has been replaced by an appUserProfileId field.
    1. 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.
    2. When not null the AppUserProfileID will reference a AppUserProfile collection with App related information such as the organizations for which a user may be an Admin.
    3. The updated schema can be found here https://github.com/PalisadoesFoundation/talawa-api/blob/develop-userTypeFix/schema.graphql
    4. This is the parent issue that we have been using to track progress:
      1. PARENT ISSUE: Fix the usage of userType #1965
  4. 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.

@palisadoes
Copy link
Contributor

The PR merging freeze is lifted.

  1. We are working on bug fixes that may arise. These should be few and are being tracked here:
    1. https://github.com/orgs/PalisadoesFoundation/projects/24
  2. Please update your PRs and local repos. Fix any new merge conflicts that may have occurred.

Background:

  1. The develop-userTypeFix branch was created to fix a long standing design flaw where Admins were Admins of all organizations, not specific ones.
  2. The userType field has been removed from the User collection and it has been replaced by an appUserProfileId field.
    1. 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.
    2. When not null the AppUserProfileID will reference a AppUserProfile collection with App related information such as the organizations for which a user may be an Admin.
    3. The updated schema can be found here https://github.com/PalisadoesFoundation/talawa-api/blob/develop-userTypeFix/schema.graphql
    4. This is the parent issue that we have been using to track progress:
      1. PARENT ISSUE: Fix the usage of userType #1965
  3. If your PRs have already been approved, request a re-review after fixing the conflicts and refactoring to the new AppUserProfileID methodology.

@Cioppolo14
Copy link
Contributor

@adi790uu Please fix the conflicting files.

@adi790uu
Copy link
Contributor Author

@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

@adi790uu
Copy link
Contributor Author

@anwersayeed can you review this.

@palisadoes
Copy link
Contributor

Please fix the conflicting file

@palisadoes palisadoes requested a review from anwersayeed March 24, 2024 15:13
@anwersayeed
Copy link
Contributor

@adi790uu Please resolve the conflicts, we will merge this PR as PalisadoesFoundation/talawa-docs#774 is now working.

Copy link

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.

@github-actions github-actions bot added the no-pr-activity No pull request activity label Apr 10, 2024
@palisadoes
Copy link
Contributor

Please fix the conflicting files. The documentation workflow is still failing.

@github-actions github-actions bot removed the no-pr-activity No pull request activity label Apr 11, 2024
@palisadoes
Copy link
Contributor

Closing as abandoned. No activity for 3 weeks.

@palisadoes palisadoes closed this Apr 18, 2024
@adi790uu
Copy link
Contributor Author

@palisadoes sorry for the delay but can you reopen this, I am working on mobile docs automation after that I will fix this.

@palisadoes palisadoes reopened this Apr 18, 2024
Copy link

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.

@github-actions github-actions bot added the no-pr-activity No pull request activity label Apr 29, 2024
@palisadoes
Copy link
Contributor

Please fix the conflicting file

@github-actions github-actions bot removed the no-pr-activity No pull request activity label May 17, 2024
Copy link

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.

@github-actions github-actions bot added the no-pr-activity No pull request activity label May 27, 2024
@palisadoes
Copy link
Contributor

Closing as abandoned

@palisadoes palisadoes closed this May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-pr-activity No pull request activity Ready 4 PR Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants