merged develop into develop-userTypeFix branch

[AdityaRaimec22]

What kind of change does this PR introduce?
merged develop into develop-userTypeFix branch

Issue Number:

Fixes #1904

Did you add tests for your changes?

Snapshots/Videos:
Not required

If relevant, did you update the documentation?
Not relevant

Summary

Does this PR introduce a breaking change?

Other information
Not required

Have you read the contributing guide?

[github-actions]

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

[palisadoes]

Please fix the failing tests

[palisadoes]

Please fix the failing tests

[codecov]

Codecov Report

Attention: Patch coverage is 99.01038% with 41 lines in your changes are missing coverage. Please review.

Project coverage is 97.83%. Comparing base (4fdec6d) to head (60d9714).

Files	Patch %	Lines
src/resolvers/Mutation/deleteAdvertisement.ts	71.42%	15 Missing and 1 partial ⚠️
src/resolvers/Organization/advertisements.ts	96.80%	4 Missing ⚠️
src/resolvers/Organization/posts.ts	96.99%	4 Missing ⚠️
src/resolvers/User/posts.ts	96.99%	4 Missing ⚠️
src/resolvers/UserTag/childTags.ts	96.11%	4 Missing ⚠️
src/resolvers/UserTag/usersAssignedTo.ts	96.29%	4 Missing ⚠️
src/utilities/checkReplicaSet.ts	80.00%	4 Missing ⚠️
src/resolvers/Mutation/checkIn.ts	97.36%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@                   Coverage Diff                   @@
##           develop-userTypeFix    #1931      +/-   ##
=======================================================
- Coverage                97.91%   97.83%   -0.08%     
=======================================================
  Files                      253      293      +40     
  Lines                    15959    19655    +3696     
  Branches                  1347     1570     +223     
=======================================================
+ Hits                     15626    19230    +3604     
- Misses                     303      409     +106     
+ Partials                    30       16      -14     

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

[AdityaRaimec22]

@palisadoes I resolved merge conflicts in numerous files, and a minor oversight in the resolution led to test failures. To rectify this, I meticulously reviewed and corrected the files, taking into account the referenced pull requests. The resolution process was time-consuming as it involved a thorough understanding of many files. However, after addressing these issues, all tests now pass successfully. The PR is up for review, Thanks.

[palisadoes]

I'm going to merge on good faith. We'll have to do integration testing with Admin and Mobile to make sure it truly works.

[AVtheking]

@palisadoes this change is wrong he doesn't removed the userType and not used appUserProfile

[AVtheking]

@AdityaRaimec22 you have to make changes according to this PR #1830

[AdityaRaimec22]

@palisadoes this change is wrong he doesn't removed the userType and not used appUserProfile

Hii @AVtheking The alterations are correct; the problem you're referring to is limited to just four files. This could have arisen from managing a large number of files, perhaps during test fixes or resolving merge conflicts. I'll make the required changes. Sorry for this discrepancy.

[AVtheking]

Hey @AdityaRaimec22 these are not 4 files you have directly merged all the new changes in the develop branch into this which should not be done you have to refactor those changes according to this new branch.

Also you have reverted the new user model to the develop one ,it should be converted back. Please look out carefully at all these changes,it will require some time ,if you need any help then contact me .

[AdityaRaimec22]

Hey @AdityaRaimec22 these are not 4 files you have directly merged all the new changes in the develop branch into this which should not be done you have to refactor those changes according to this new branch.

Also you have reverted the new user model to the develop one ,it should be converted back. Please look out carefully at all these changes,it will require some time ,if you need any help then contact me .

Actually the issue doesn't mentioned that I have to refactor the changes and then merge so I directly merged them and the tests were failing due to the old user model so I converted back it to that of the develop branch.
I will make all the changes.

@palisadoes Can I go on with the new PR. Thanks.

[palisadoes]

Hey @AdityaRaimec22 these are not 4 files you have directly merged all the new changes in the develop branch into this which should not be done you have to refactor those changes according to this new branch.
Also you have reverted the new user model to the develop one ,it should be converted back. Please look out carefully at all these changes,it will require some time ,if you need any help then contact me .

Actually the issue doesn't mentioned that I have to refactor the changes and then merge so I directly merged them and the tests were failing due to the old user model so I converted back it to that of the develop branch. I will make all the changes.

@palisadoes Can I go on with the new PR. Thanks.

Please fix this immediately. This branch is to create new features for the new userType approach.

[palisadoes]

I'll revert the PR. That will be faster

[palisadoes]

Please open a new PR that does as the issue requests

[palisadoes]

@AdityaRaimec22

1. Do you feel comfortable making the requested changes?
2. This is a really important update and we need people with the experience to implement the required changes.

[palisadoes]

Hey @AdityaRaimec22 these are not 4 files you have directly merged all the new changes in the develop branch into this which should not be done you have to refactor those changes according to this new branch.

Also you have reverted the new user model to the develop one ,it should be converted back. Please look out carefully at all these changes,it will require some time ,if you need any help then contact me .

Actually the issue doesn't mentioned that I have to refactor the changes and then merge so I directly merged them and the tests were failing due to the old user model so I converted back it to that of the develop branch.
I will make all the changes.

@palisadoes Can I go on with the new PR. Thanks.

It does say to refactor. The issue text states:

Make sure all newly added features to the develop branch are included in the develop-userTypeFix branch.

I have edited the issue further to reiterate this and add some clarity in other areas.

Do you feel comfortable doing this? It's an important feature that needs to be fixed and has caused confusion for a few years