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

Isaac/merge main release #96

Merged
merged 29 commits into from
Jun 26, 2023
Merged

Isaac/merge main release #96

merged 29 commits into from
Jun 26, 2023

Commits on Nov 14, 2022

  1. Add Jest testing (#63)

    * Initial boilerplate setup
    
    * Add ArticleFactory, TestingDBConnection, FactoryUtils, placeholder article test file
    
    * Add test cases on getAllArticles
    
    * Create PublicationFactory, add tests for getAllArticles, getArticlesByPublicationID(s), getArticlesByPublicationSlug(s)
    
    * Add hooks
    
    * Update README
    
    * Add pr changes
    
    * Add pr changes
    
    * Add tests for incrementShoutouts, searchArticle, getArticlesAfterDate
    
    * Add publication tests and refactor factory files
    
    * Remove test db open message
    
    * Update src/tests/article.test.ts
    
    Co-authored-by: Archit Mehta <[email protected]>
    
    * Update src/tests/data/ArticleFactory.ts
    
    Co-authored-by: Archit Mehta <[email protected]>
    
    * Refactor code
    
    * Refactor byDate
    
    Co-authored-by: Kidus Zegeye <[email protected]>
    Co-authored-by: Archit Mehta <[email protected]>
    3 people authored Nov 14, 2022
    Configuration menu
    Copy the full SHA
    512c725 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Add Docstrings to Test Factory Functions (#64)

    * Initial boilerplate setup
    
    * Add ArticleFactory, TestingDBConnection, FactoryUtils, placeholder article test file
    
    * Add test cases on getAllArticles
    
    * Create PublicationFactory, add tests for getAllArticles, getArticlesByPublicationID(s), getArticlesByPublicationSlug(s)
    
    * Add hooks
    
    * Update README
    
    * Add pr changes
    
    * Add pr changes
    
    * Add tests for incrementShoutouts, searchArticle, getArticlesAfterDate
    
    * Add publication tests and refactor factory files
    
    * Remove test db open message
    
    * Update src/tests/article.test.ts
    
    Co-authored-by: Archit Mehta <[email protected]>
    
    * Update src/tests/data/ArticleFactory.ts
    
    Co-authored-by: Archit Mehta <[email protected]>
    
    * Refactor code
    
    * Refactor byDate
    
    * Add docstrings
    
    Co-authored-by: Kidus Zegeye <[email protected]>
    Co-authored-by: Archit Mehta <[email protected]>
    3 people authored Nov 17, 2022
    Configuration menu
    Copy the full SHA
    a0c56bb View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2023

  1. Update README.md

    snajima authored Feb 15, 2023
    Configuration menu
    Copy the full SHA
    f974d1a View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2023

  1. Implement community board models (#65)

    * Implemented community board models
    
    - implemented Flyer and Organization models for community board feature
    - modified User model
    - updated typescript version to 4.0.5 to resolve es lint issue
    
    * Revert package.json changes
    
    - reverted package.json changes that are addressed in a different pr
    isaachan100 authored Mar 18, 2023
    Configuration menu
    Copy the full SHA
    bf2774c View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Add magazines to weekly debrief (#66)

    * Implemented community board models
    
    - implemented Flyer and Organization models for community board feature
    - modified User model
    - updated typescript version to 4.0.5 to resolve es lint issue
    
    * Implemented weekly debrief magazines
    
    - added magazines to weekly debrief feature
    - updated user and weekly debrief models to allow tracking of read magazines
    - updated logic in user and weekly debrief controllers to enable reading of magazines
    
    * Revert package.json changes
    
    - reverted package.json changes back to the original file
    - added additional rules to eslintrc to suppress es lint warnings
    
    * Create jest testing for magazines
    
    - added jest test cases for magazines
    
    * Implement jest testing for User
    
    - implemented unit testing for UserRepo
    - indirectly test Weekly Debrief with User unit tests
    
    * Update gitignore
    
    - updated gitignore file to include secrets folder
    isaachan100 authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    6505521 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Implement reshuffle articles (#68)

    * Add Docstrings to Test Factory Functions (#64)
    
    * Initial boilerplate setup
    
    * Add ArticleFactory, TestingDBConnection, FactoryUtils, placeholder article test file
    
    * Add test cases on getAllArticles
    
    * Create PublicationFactory, add tests for getAllArticles, getArticlesByPublicationID(s), getArticlesByPublicationSlug(s)
    
    * Add hooks
    
    * Update README
    
    * Add pr changes
    
    * Add pr changes
    
    * Add tests for incrementShoutouts, searchArticle, getArticlesAfterDate
    
    * Add publication tests and refactor factory files
    
    * Remove test db open message
    
    * Update src/tests/article.test.ts
    
    Co-authored-by: Archit Mehta <[email protected]>
    
    * Update src/tests/data/ArticleFactory.ts
    
    Co-authored-by: Archit Mehta <[email protected]>
    
    * Refactor code
    
    * Refactor byDate
    
    * Add docstrings
    
    Co-authored-by: Kidus Zegeye <[email protected]>
    Co-authored-by: Archit Mehta <[email protected]>
    
    Implement shuffle article function
    
    try to implement reshuffling with aggregate
    
    * Implement reshuffling of articles
    
    * Revert package.json, update eslint and update .gitignore to match main branch
    
    ---------
    
    Co-authored-by: Kidus Zegeye <[email protected]>
    SashaLoayza and kidzegeye authored Mar 23, 2023
    Configuration menu
    Copy the full SHA
    8cd07aa View commit details
    Browse the repository at this point in the history
  2. Implement magazine search (#69)

    * Implement magazine search
    
    - implemented searching for magazines
    
    * update magazinerepo
    
    * Add unit test for magazine search
    
    - created unit test for MagazineRepo.searchMagazine
    isaachan100 authored Mar 23, 2023
    Configuration menu
    Copy the full SHA
    08705a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2023

  1. Configuration menu
    Copy the full SHA
    ca89a00 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. Add 3 new publications (Cornell Daily Sun, Collective X, and Cornell …

    …Healthcare Review) to publications.js (#70)
    SashaLoayza authored Apr 4, 2023
    Configuration menu
    Copy the full SHA
    274b344 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Resolve merge conflicts in publications.json (keep release version) (#76

    )
    
    * Kidus/filter articles (#48)
    
    * Add covid filter to all article query functions
    
    * Add filtering capability
    
    * Fix getArticleById filter
    
    * Create filter migration script
    
    * Finish migration script
    
    * Add toggle for filtering enforcement
    
    * Implement PR changes
    
    Co-authored-by: Kidus Zegeye <[email protected]>
    
    * Fix BRSN's url
    
    * Migrate bookmark resolver and update User Repo & Entity
    
    * Resolve remaining merge conflicts
    
    * Implement chronological sorting
    
    * Update prod deployment script
    
    * Remove unused MagazineURL index from Magazine DB
    
    * Add no rules to publications.json
    
    * Remove trailing comma
    
    ---------
    
    Co-authored-by: Kidus Zegeye <[email protected]>
    Co-authored-by: Kidus Zegeye <[email protected]>
    Co-authored-by: Archit404Error <[email protected]>
    4 people authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    eccf00c View commit details
    Browse the repository at this point in the history
  2. Revert "Resolve merge conflicts in publications.json (keep release ve…

    …rsion) (#76)" (#77)
    
    This reverts commit eccf00c.
    isaachan100 authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    94ddfa2 View commit details
    Browse the repository at this point in the history
  3. fix merge conflicts (#78)

    * Kidus/filter articles (#48)
    
    * Add covid filter to all article query functions
    
    * Add filtering capability
    
    * Fix getArticleById filter
    
    * Create filter migration script
    
    * Finish migration script
    
    * Add toggle for filtering enforcement
    
    * Implement PR changes
    
    Co-authored-by: Kidus Zegeye <[email protected]>
    
    * Fix BRSN's url
    
    * Migrate bookmark resolver and update User Repo & Entity
    
    * Resolve remaining merge conflicts
    
    * Implement chronological sorting
    
    * Update prod deployment script
    
    * Remove unused MagazineURL index from Magazine DB
    
    * Add no rules to publications.json
    
    * Remove trailing comma
    
    ---------
    
    Co-authored-by: Kidus Zegeye <[email protected]>
    Co-authored-by: Kidus Zegeye <[email protected]>
    Co-authored-by: Archit404Error <[email protected]>
    4 people authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    ebd91ec View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Implement community board [1/7] (#81)

    * Begin implementing FlyerRepo
    
    - implemented basic FlyerRepo functions
    - updated Flyer model to support uploading in app instead of through a google form
    
    * Implement flyers for community board
    
    - alphabetized imports and fields
    - finished implementing flyers for community board
    
    * Address pr review comments
    
    - addressed pr review comments
    - removed redundant filtering in FlyerRepo
    - added checks for null return values in FlyerRepo
    - alphabetized imports and exports
    isaachan100 authored Apr 21, 2023
    Configuration menu
    Copy the full SHA
    573b70d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    904c4ae View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2023

  1. Configuration menu
    Copy the full SHA
    e012894 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. Implement community board (flyer tests) [2/7] (#84)

    * Begin implementing FlyerRepo
    
    - implemented basic FlyerRepo functions
    - updated Flyer model to support uploading in app instead of through a google form
    
    * Implement flyers for community board
    
    - alphabetized imports and fields
    - finished implementing flyers for community board
    
    * Implement jest testing for flyers
    
    - created jest unit testing for FlyerRepo
    - created FlyerFactory to help with jest testing
    
    * Remove isFiltered field from Flyer entity
    
    - removed redundant isFiltered field from Flyer entity (already checked in microservice)
    - updated FlyerRepo and jest testing to reflect changes
    
    * Alphabetize imports and exports
    
    - alphabetized imports and exports in FlyerRepo, flyer.test, and FlyerFactory
    
    * Revert merge conflict changes
    
    - reverted merge conflict changes (accept incoming when actually wanted to keep current)
    
    * Address review comments
    
    - alphabetize imports
    - add unit test cases for FlyerRepo including searching for 0 flyers and maximum limit in response
    - added unit test case for FlyerRepo.getTrendingFlyers
    
    * Address review comments (Shungo)
    
    - added spaces between test cases
    isaachan100 authored Apr 25, 2023
    Configuration menu
    Copy the full SHA
    34f1bd8 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. Implement community board organizations (#85)

    - resolve merge conflicts in Flyer.ts and FlyerFactory.ts
    - update Organization model
    - implement logic in OrganizationRepo
    - implement queries and mutations in OrganizationResolver
    isaachan100 authored Apr 26, 2023
    Configuration menu
    Copy the full SHA
    ed6913f View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. Implement community board (organization tests) [4/7] (#86)

    * Implement community board organizations
    
    - resolve merge conflicts in Flyer.ts and FlyerFactory.ts
    - update Organization model
    - implement logic in OrganizationRepo
    - implement queries and mutations in OrganizationResolver
    
    * Implement jest testing for organizations
    
    - implemented jest testing for community board organizations
    - created organizations.json with 3 onboarded organizations
    - added FlyerResolver and OrganizationResolver to app.ts
    isaachan100 authored Apr 27, 2023
    Configuration menu
    Copy the full SHA
    e0dcd22 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Configuration menu
    Copy the full SHA
    6a0c1cc View commit details
    Browse the repository at this point in the history
  2. Implement community board (user queries/mutations) [5/7] (#87)

    * Kidus/filter articles (#48)
    
    * Add covid filter to all article query functions
    
    * Add filtering capability
    
    * Fix getArticleById filter
    
    * Create filter migration script
    
    * Finish migration script
    
    * Add toggle for filtering enforcement
    
    * Implement PR changes
    
    Co-authored-by: Kidus Zegeye <[email protected]>
    
    * Fix BRSN's url
    
    * Migrate bookmark resolver and update User Repo & Entity
    
    * Resolve remaining merge conflicts
    
    * Implement chronological sorting
    
    * Update prod deployment script
    
    * Remove unused MagazineURL index from Magazine DB
    
    * Add no rules to publications.json
    
    * Remove trailing comma
    
    * Begin implementing FlyerRepo
    
    - implemented basic FlyerRepo functions
    - updated Flyer model to support uploading in app instead of through a google form
    
    * Implement basic community board features
    
    - finished implementing basic organization and flyer repos/resolvers
    - created jest testing for organization and flyer repos
    
    * Remove unnecessary OrganizationRepo function
    
    - removed content types route from organization repo and organization resolver
    
    * Implement user routes for community board
    
    - implemented user routes for community board to allow following orgs and reading flyers
    - added jest unit test cases for new UserRepo functions
    
    * Implement mutations for following and unfollowing organizations
    
    - added resolvers to UserResolver for following and unfollowing organizations
    - updated documentation in UserRepo
    - added import of FlyerRepo in app.ts
    
    * Address pr review comments
    
    - fix spelling
    
    * Address pr review comments
    
    - made style consistent in UserRepo by checking for if(user) in appendReadFlyer, appendReadArticle, and appendReadMagazine
    
    ---------
    
    Co-authored-by: Kidus Zegeye <[email protected]>
    Co-authored-by: Kidus Zegeye <[email protected]>
    Co-authored-by: Archit404Error <[email protected]>
    4 people authored Apr 28, 2023
    Configuration menu
    Copy the full SHA
    5cd38cd View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. Onboard organizations (#90)

    - add organizations from volume-microservice onto organizations.json
    isaachan100 authored May 1, 2023
    Configuration menu
    Copy the full SHA
    048a834 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Implement community board (categories and org lists) [6/7] (#89)

    * Implement community board organizations
    
    - resolve merge conflicts in Flyer.ts and FlyerFactory.ts
    - update Organization model
    - implement logic in OrganizationRepo
    - implement queries and mutations in OrganizationResolver
    
    * Implement jest testing for organizations
    
    - implemented jest testing for community board organizations
    - created organizations.json with 3 onboarded organizations
    - added FlyerResolver and OrganizationResolver to app.ts
    
    * initial commit
    
    * Implement organizations as list for flyer model
    
    - updated flyer model to allow a list of organizations and organizationSlugs to be associated with each flyer
    - updated flyer and organization queries accordingly
    - added unit jest test cases and update old ones accordingly
    
    * Address pr review comments
    
    - removed redundant resolvers
    - updated getOrganizationByCategory test
    
    * Address pr review comments (kate)
    
    - updated docs in OrganizationResolver
    isaachan100 authored May 2, 2023
    Configuration menu
    Copy the full SHA
    b1f9cad View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Configuration menu
    Copy the full SHA
    7461cea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    69909e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2023

  1. Implement cboard start and end dates (#93)

    * Implement end dates
    
    - implemented start and end dates
    - changed shoutouts to times clicked
    - updated testing and documentation to reflect changes
    
    * Address pr review comments
    
    - removed async from getFlyersBeforeDate and getFlyersAfterDate
    - updated documentation in FactoryUtils
    
    * add incrementTimesClicked to resolver
    isaachan100 authored Jun 3, 2023
    Configuration menu
    Copy the full SHA
    bce6431 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. update organization shoutouts query (#94)

    * Implement end dates
    
    - implemented start and end dates
    - changed shoutouts to times clicked
    - updated testing and documentation to reflect changes
    
    * Address pr review comments
    
    - removed async from getFlyersBeforeDate and getFlyersAfterDate
    - updated documentation in FactoryUtils
    
    * add incrementTimesClicked to resolver
    
    * Update organization clicks
    
    - changed shoutouts query to clicks in OrganizationResolver
    isaachan100 authored Jun 5, 2023
    Configuration menu
    Copy the full SHA
    8860183 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Implement trending flyers logic (#95)

    - updated trending flyers logic
    - updated FlyerRepo
    - updated documentation in FlyerResolver
    isaachan100 authored Jun 12, 2023
    Configuration menu
    Copy the full SHA
    c766c93 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. Configuration menu
    Copy the full SHA
    8e4406c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e0d462b View commit details
    Browse the repository at this point in the history