feat : Update thedevelop-userTypeFix branch with the latest features from develop #2032

Atharva-Kanherkar · 2024-03-19T20:19:09Z

What kind of change does this PR introduce?

Feature

Issue Number:

Fixes #1987

Did you add tests for your changes?

Yes

Summary

Merging the develop branch.

Does this PR introduce a breaking change?
No

Have you read the contributing guide?

Yes

…1.0 (PalisadoesFoundation#1842) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.20.0 to 6.21.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.21.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…n#1843) Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.9.8 to 6.9.9. - [Release notes](https://github.com/nodemailer/nodemailer/releases) - [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md) - [Commits](nodemailer/nodemailer@v6.9.8...v6.9.9) --- updated-dependencies: - dependency-name: nodemailer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…tion#1844) Bumps [lint-staged](https://github.com/okonet/lint-staged) from 15.2.1 to 15.2.2. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md) - [Commits](lint-staged/lint-staged@v15.2.1...v15.2.2) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…lisadoesFoundation#1846) Bumps [@graphql-codegen/typescript](https://github.com/dotansimha/graphql-code-generator/tree/HEAD/packages/plugins/typescript/typescript) from 4.0.1 to 4.0.4. - [Release notes](https://github.com/dotansimha/graphql-code-generator/releases) - [Changelog](https://github.com/dotansimha/graphql-code-generator/blob/master/packages/plugins/typescript/typescript/CHANGELOG.md) - [Commits](https://github.com/dotansimha/graphql-code-generator/commits/@graphql-codegen/typescript@4.0.4/packages/plugins/typescript/typescript) --- updated-dependencies: - dependency-name: "@graphql-codegen/typescript" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…sFoundation#1845) Bumps [@types/validator](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/validator) from 13.11.8 to 13.11.9. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/validator) --- updated-dependencies: - dependency-name: "@types/validator" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…Foundation#1833) * Modified tests * some minor changes * Fixed Errors * 100% code covered * Fixed Linting errors

…ation#1835) * removeAdvertisement.ts test updated to 100% coverage * failing tests updated * Update package.json * Update package.json * Update package-lock.json * Update package.json * Update package.json * Update package.json * Update package.json * Update package-lock.json back to normal * Update package-lock.json * Update package-lock.json * Update package-lock.json * Update package-lock.json

…ation#1807) * create recurring event helpers and refactor * remove unnecessary file * add documentation and comments * add tests * fix comments * update generateRecurrenceRuleString function * speed up code * fix formatting * format fix * restore package.json * fix failing test * better implementation and faster code * minor refactoring * minor correction * fix imports * return single recurring instance * fix failing test * Revert "return single recurring instance" This reverts commit 60353fd. * Reapply "return single recurring instance" This reverts commit fc12a99. * test commit * update test * fix test * convert to UTC dates * test commit with minor change * limit instance generation date according to the recurrence frequency * adjust for different timezones * remove unnecessary code * remove unnecessary formatting * change variable names

…UD (PalisadoesFoundation#1785) * test * Agenda category CRUD * fixed format check * Renamed organization to organizationId, and changed file names wherever needed, also made organization non null where it wasnt * Added requested changes, involving : 1. field level resolvers for categor ies in organization, an updated by resolver in agendaCategory. 2. Removed the agendacatego ries resolver because it was futile. 3. removed organizationId from updateagendaCategory i nput and other minute changes. * Fixed failing tests * Removed ESLint disabled comments * Removed some linting errors * Fixed the remaining linting errors * Fixed lint error * Ran prettier * Ran prettier * Fixed the failing test * Final issues resolved

* feat: add Event Volunteer collectionand CRUD mutations/queries * write tests for createEventVolunteer and updateEventVolunteer * write tests for eventVolunteersByEvent and removeEventVolunteers * fix formatting * better code coverage * fix formatting * better code coverage * fix formatting * better code coverage * fix linting test

…1806) * Updated inspect.yml * Updated pull-request.yml * Updated push.yml * Delete .github/workflows/inspect.yml * Updated push.yml * Updated pull-request.yml * Updated push.yml * Updated push.yml

…on#1849) * Database transaction logging middleware * Review changes * updated .gitignore * logging middlware for all models * fix lint * fix format * fix failing tests

…erkar/talawa-api into develop-userTypeFix

varshith257 · 2024-03-22T13:09:14Z

@AVtheking @Atharva-Kanherkar Check the latest workflow test of Testing Application(20.x) PR. All failing tests are exposed in this branch. Ignore .env_test test fails and need to fix remaining

varshith257 · 2024-03-22T13:12:27Z

I have added .env_test file in my code and triggered the action though it's not capturing.

@Anubhav-2003 Can check out the failing test of .env_test. And why it's not able to capture .env_test added in .gitignore? It's related to your work done in develop branch

Anubhav-2003 · 2024-03-22T13:50:43Z

I have added .env_test file in my code and triggered the action though it's not capturing.

@Anubhav-2003 Can check out the failing test of .env_test. And why it's not able to capture .env_test added in .gitignore? It's related to your work done in develop branch.

this is because you people have implemented a faulty version of the setup. If you see the current refactored version of the set up has around 900 lines. You people are still using the old version of the setup.ts. Also you people have removed the line where the .env_test file would be automatically created inside the set up. Please fix your setup file. Merge properly to the latest one.

Thank you.

varshith257 · 2024-03-22T14:01:56Z

We haven't looked at that file. We are joined with @Atharva-Kanherkar to speedup the work recently. Ok , we will make sure to refactor it

Anubhav-2003 · 2024-03-22T14:05:42Z

We haven't looked at that file. We are joined with @Atharva-Kanherkar to speedup the work recently. Ok , we will make sure to refactor it

No problem, collaborative work is always appreciated, if you have any more doubts, or if any help is needed from my side. Please let me know. Thank you.

…erkar/talawa-api into develop-userTypeFix

palisadoes · 2024-03-22T14:45:00Z

@Anubhav-2003

Join the #proj-user-role slack channel
Feel free to join in and refactor setup.ts according to this requirement. @Atharva-Kanherkar please add @Anubhav-2003 as a collaborator to your repo

Anubhav-2003 · 2024-03-22T15:37:26Z

@palisadoes sure sir, also I can assist not just in setup but in other parts as well, if the present contributors feel they need any assistance. When this PR will be merged with develop, a few bugs may surface initially. I will be happy to fix them through separate PRs. Thank you.

Atharva-Kanherkar · 2024-03-22T15:38:37Z

@palisadoes sure sir, also I can assist not just in setup but in other parts as well, if the present contributors feel they need any assistance. When this PR will be merged with develop, a few bugs may surface initially. I will be happy to fix them through separate PRs. Thank you.

I hace added you as a contributor. Seperate PRs will not make any sense for this issue, I guess it would just add up to the work as we have freezed the merging of other PRs, please help in this to us, it would be really helpful.

Anubhav-2003 · 2024-03-22T16:08:22Z

@palisadoes sure sir, also I can assist not just in setup but in other parts as well, if the present contributors feel they need any assistance. When this PR will be merged with develop, a few bugs may surface initially. I will be happy to fix them through separate PRs. Thank you.

I hace added you as a contributor. Seperate PRs will not make any sense for this issue, I guess it would just add up to the work as we have freezed the merging of other PRs, please help in this to us, it would be really helpful.

What you are saying makes no sense. once you merge this PR into the develop, there will be consequences in the other repositories as well because the merging for this with the current develop has not yet been tested for the entire talawa suite. Just like the setup file, there will be other files whose errors might not initially pop up in the workflow. But there will be instances of inconsistent merging. For fixing those we would need separate PRs, I hope you understand what I’m saying.

But I’m happy to help in this pull. Request as well. Thank you.

Thank you

AVtheking · 2024-03-22T16:10:43Z

@palisadoes sure sir, also I can assist not just in setup but in other parts as well, if the present contributors feel they need any assistance. When this PR will be merged with develop, a few bugs may surface initially. I will be happy to fix them through separate PRs. Thank you.

I hace added you as a contributor. Seperate PRs will not make any sense for this issue, I guess it would just add up to the work as we have freezed the merging of other PRs, please help in this to us, it would be really helpful.

@palisadoes sure sir, also I can assist not just in setup but in other parts as well, if the present contributors feel they need any assistance. When this PR will be merged with develop, a few bugs may surface initially. I will be happy to fix them through separate PRs. Thank you.

I hace added you as a contributor. Seperate PRs will not make any sense for this issue, I guess it would just add up to the work as we have freezed the merging of other PRs, please help in this to us, it would be really helpful.

What you are saying makes no sense. once you merge this PR into the develop, there will be consequences in the other repositories as well because the merging for this with the current develop has not yet been tested for the entire talawa suite. Just like the setup file, there will be other files whose errors might not initially pop up in the workflow. But there will be instances of inconsistent merging. For fixing those we would need separate PRs, I hope you understand what I’m saying. Thank you

yes after merging it in develop we need to lookout for any breaking thing and resolves them as soon as possible.

varshith257 · 2024-03-22T16:34:03Z

@Anubhav-2003 Cool! Once it got merged the bugs could be there and if you found then make a PR against a parent issue to track

Anubhav-2003 · 2024-03-22T16:36:37Z

@Anubhav-2003 Cool! Once it got merged the bugs could be there and if you found then make a PR against a parent issue to track

Sure I will

codecov · 2024-03-22T19:16:36Z

Codecov Report

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

Project coverage is 95.53%. Comparing base (330879e) to head (47641ec).

Files	Patch %	Lines
...eleteEventHelpers/deleteRecurringEventInstances.ts	14.87%	166 Missing ⚠️
...s/event/deleteEventHelpers/deleteRecurringEvent.ts	30.50%	41 Missing ⚠️
src/resolvers/Mutation/sendMembershipRequest.ts	38.46%	32 Missing ⚠️
src/resolvers/Mutation/createAgendaSection.ts	81.25%	17 Missing and 1 partial ⚠️
src/resolvers/Mutation/editVenue.ts	90.34%	12 Missing and 2 partials ⚠️
src/resolvers/Mutation/createAgendaItem.ts	91.92%	12 Missing and 1 partial ⚠️
src/resolvers/Mutation/createVenue.ts	91.40%	10 Missing and 1 partial ⚠️
src/resolvers/Mutation/updateAdvertisement.ts	71.79%	11 Missing ⚠️
src/resolvers/Mutation/addEventAttendee.ts	33.33%	10 Missing ⚠️
src/libraries/validators/compareTime.ts	0.00%	9 Missing ⚠️
... and 16 more

Additional details and impacted files

@@                   Coverage Diff                   @@
##           develop-userTypeFix    #2032      +/-   ##
=======================================================
- Coverage                97.07%   95.53%   -1.54%     
=======================================================
  Files                      293      331      +38     
  Lines                    20041    22462    +2421     
  Branches                  1578     1810     +232     
=======================================================
+ Hits                     19454    21459    +2005     
- Misses                     567      974     +407     
- Partials                    20       29       +9

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

varshith257

LGTM
Except for these files of low test coverage

palisadoes and others added 30 commits February 10, 2024 19:27

Restore the automated-docs if statement

031adf9

Create pull_changes.yml

94d2d18

Update push.yml

7b9a88f

Update push.yml

d7450c4

Update pull_changes.yml

332c429

Update pull_changes.yml

e1bbff6

Update Advertisement.ts

57f4d91

Update push.yml

70701ba

Update Advertisement.ts

73b68f0

Update push.yml

4e6113d

Update Advertisement.ts

12ccdb6

Update Advertisement.ts

07f7042

Update push.yml

60d4b4b

Update push.yml

26e0d10

Update pull_changes.yml

5fe0ae8

Update Advertisement.ts

d069d40

Update pull_changes.yml

125853a

Added tests for file src/resolvers/Mutation/createPost.ts (Palisadoes…

cc21e65

…Foundation#1833) * Modified tests * some minor changes * Fixed Errors * 100% code covered * Fixed Linting errors

Update INSTALLATION.md

51e3f79

Fixed Introspection Schema check GitHub Action (PalisadoesFoundation#…

a431418

…1806) * Updated inspect.yml * Updated pull-request.yml * Updated push.yml * Delete .github/workflows/inspect.yml * Updated push.yml * Updated pull-request.yml * Updated push.yml * Updated push.yml

feat: database transaction logging for all models (PalisadoesFoundati…

bee07a9

…on#1849) * Database transaction logging middleware * Review changes * updated .gitignore * logging middlware for all models * fix lint * fix format * fix failing tests

varshith257 added 2 commits March 22, 2024 18:06

fix setup test

2f95851

Merge branch 'develop-userTypeFix' of https://github.com/Atharva-Kanh…

5a43394

…erkar/talawa-api into develop-userTypeFix

updated tooglePostPin.ts

dab830c

AVtheking added 4 commits March 22, 2024 19:46

fixed setup file

fa73595

Merge branch 'develop-userTypeFix' of https://github.com/Atharva-Kanh…

6d6ea2f

…erkar/talawa-api into develop-userTypeFix

fixed linting error

9035ceb

fixed user exists test

7ec4c2a

AVtheking added 2 commits March 22, 2024 21:03

fix failing test and sample data

7f8fa8a

fix formatting error

5f05791

fixed advertisement test

d766411

adi790uu and others added 4 commits March 23, 2024 00:02

fixed create, edit and delete Venue mutations

dc041f1

fixed failing test

85ef857

fixed liniting error

6d27494

fixed failing test

47641ec

varshith257 approved these changes Mar 22, 2024

View reviewed changes

palisadoes merged commit 229ad9a into PalisadoesFoundation:develop-userTypeFix Mar 22, 2024
6 of 11 checks passed

meetulr mentioned this pull request Apr 4, 2024

Test: Create tests for src/helpers/event/deleteEventHelpers/deleteRecurringEvent.ts #2054

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat : Update thedevelop-userTypeFix branch with the latest features from develop #2032

feat : Update thedevelop-userTypeFix branch with the latest features from develop #2032

Atharva-Kanherkar commented Mar 19, 2024

varshith257 commented Mar 22, 2024 •

edited

Loading

varshith257 commented Mar 22, 2024 •

edited

Loading

Anubhav-2003 commented Mar 22, 2024 •

edited

Loading

varshith257 commented Mar 22, 2024

Anubhav-2003 commented Mar 22, 2024

palisadoes commented Mar 22, 2024

Anubhav-2003 commented Mar 22, 2024

Atharva-Kanherkar commented Mar 22, 2024

Anubhav-2003 commented Mar 22, 2024 •

edited

Loading

AVtheking commented Mar 22, 2024

varshith257 commented Mar 22, 2024

Anubhav-2003 commented Mar 22, 2024

codecov bot commented Mar 22, 2024

varshith257 left a comment •

edited

Loading

feat : Update thedevelop-userTypeFix branch with the latest features from develop #2032

feat : Update thedevelop-userTypeFix branch with the latest features from develop #2032

Conversation

Atharva-Kanherkar commented Mar 19, 2024

varshith257 commented Mar 22, 2024 • edited Loading

varshith257 commented Mar 22, 2024 • edited Loading

Anubhav-2003 commented Mar 22, 2024 • edited Loading

varshith257 commented Mar 22, 2024

Anubhav-2003 commented Mar 22, 2024

palisadoes commented Mar 22, 2024

Anubhav-2003 commented Mar 22, 2024

Atharva-Kanherkar commented Mar 22, 2024

Anubhav-2003 commented Mar 22, 2024 • edited Loading

AVtheking commented Mar 22, 2024

varshith257 commented Mar 22, 2024

Anubhav-2003 commented Mar 22, 2024

codecov bot commented Mar 22, 2024

Codecov Report

varshith257 left a comment • edited Loading

Choose a reason for hiding this comment

varshith257 commented Mar 22, 2024 •

edited

Loading

varshith257 commented Mar 22, 2024 •

edited

Loading

Anubhav-2003 commented Mar 22, 2024 •

edited

Loading

Anubhav-2003 commented Mar 22, 2024 •

edited

Loading

varshith257 left a comment •

edited

Loading