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

Merge Develop onto Main #586

Merged
merged 42 commits into from
Oct 28, 2024
Merged

Merge Develop onto Main #586

merged 42 commits into from
Oct 28, 2024

Conversation

github-actions[bot]
Copy link

This PR was auto-generated - see create-release-pr.yml and
actions/github-script.
Merging this PR will trigger an automatic deployment to production on Heroku.

Replaced req['user'] with req['userEntity'] in controller and changed type from GetUserDto to userEntity in controller and service

Co-authored-by: Kylee Fields <[email protected]>
Co-authored-by: Anna Hughes <[email protected]>
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging August 14, 2024 20:55 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging August 15, 2024 09:31 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging August 19, 2024 14:06 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging August 19, 2024 16:26 Inactive
…#568)

* Ticket-547 updated sub-user service and controller to use user entity

* Ticket-547 fix naming issue
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging August 20, 2024 11:25 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging August 21, 2024 18:37 Inactive
Bumps [eslint](https://github.com/eslint/eslint) from 9.3.0 to 9.9.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v9.3.0...v9.9.1)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@nestjs/testing](https://github.com/nestjs/nest/tree/HEAD/packages/testing) from 10.3.10 to 10.4.1.
- [Release notes](https://github.com/nestjs/nest/releases)
- [Commits](https://github.com/nestjs/nest/commits/v10.4.1/packages/testing)

---
updated-dependencies:
- dependency-name: "@nestjs/testing"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@nestjs/common](https://github.com/nestjs/nest/tree/HEAD/packages/common) from 10.3.10 to 10.4.1.
- [Release notes](https://github.com/nestjs/nest/releases)
- [Commits](https://github.com/nestjs/nest/commits/v10.4.1/packages/common)

---
updated-dependencies:
- dependency-name: "@nestjs/common"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [storyblok-js-client](https://github.com/storyblok/storyblok-js-client) from 6.7.3 to 6.8.4.
- [Release notes](https://github.com/storyblok/storyblok-js-client/releases)
- [Changelog](https://github.com/storyblok/storyblok-js-client/blob/main/changelog.md)
- [Commits](storyblok/storyblok-js-client@v6.7.3...v6.8.4)

---
updated-dependencies:
- dependency-name: storyblok-js-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/4.0.8/CHANGELOG.md)
- [Commits](micromatch/micromatch@4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging August 26, 2024 12:20 Inactive
Bumps [storyblok-js-client](https://github.com/storyblok/storyblok-js-client) from 6.8.4 to 6.9.0.
- [Release notes](https://github.com/storyblok/storyblok-js-client/releases)
- [Changelog](https://github.com/storyblok/storyblok-js-client/blob/main/changelog.md)
- [Commits](storyblok/storyblok-js-client@v6.8.4...v6.9.0)

---
updated-dependencies:
- dependency-name: storyblok-js-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging August 28, 2024 12:52 Inactive
SangilYun and others added 10 commits September 10, 2024 10:55
)

* Replace req["user"] with req["userEntity"] in the user.controller.ts

* clean up

* use the service method user.getUserProfile rather than returning req["user"]

* cc points

* use getUserProfile
* refactor: add GetSubscriptionUserDto and getUserSubscriptions endpoint [WIP][Refactor][Tests]

* refactor: remove userId property from GetSubscriptionUserDto, fixed overly nested response.

* test: add getUserSubscriptions service tests

* refactor: add try catch to getSubscriptions service.

* chore: abstract serialization into utils

* Remove GetSubscriptionUsersDto

* Update get-subscription-user.dto.ts

---------

Co-authored-by: eleanorreem <[email protected]>
Bumps [newrelic/deployment-marker-action](https://github.com/newrelic/deployment-marker-action) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/newrelic/deployment-marker-action/releases)
- [Changelog](https://github.com/newrelic/deployment-marker-action/blob/main/CHANGELOG.md)
- [Commits](newrelic/deployment-marker-action@v2.5.0...v2.5.1)

---
updated-dependencies:
- dependency-name: newrelic/deployment-marker-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.5 to 5.5.4.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](microsoft/TypeScript@v5.4.5...v5.5.4)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 29.2.4 to 29.2.5.
- [Release notes](https://github.com/kulshekhar/ts-jest/releases)
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md)
- [Commits](kulshekhar/ts-jest@v29.2.4...v29.2.5)

---
updated-dependencies:
- dependency-name: ts-jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [storyblok-js-client](https://github.com/storyblok/storyblok-js-client) from 6.9.0 to 6.9.2.
- [Release notes](https://github.com/storyblok/storyblok-js-client/releases)
- [Changelog](https://github.com/storyblok/storyblok-js-client/blob/main/changelog.md)
- [Commits](storyblok/storyblok-js-client@v6.9.0...v6.9.2)

---
updated-dependencies:
- dependency-name: storyblok-js-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.12.12 to 22.5.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
srodiftsis and others added 19 commits September 20, 2024 16:21
Bumps [@nestjs/core](https://github.com/nestjs/nest/tree/HEAD/packages/core) from 10.3.8 to 10.4.1.
- [Release notes](https://github.com/nestjs/nest/releases)
- [Commits](https://github.com/nestjs/nest/commits/v10.4.1/packages/core)

---
updated-dependencies:
- dependency-name: "@nestjs/core"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@nestjs/schematics](https://github.com/nestjs/schematics) from 10.1.3 to 10.1.4.
- [Release notes](https://github.com/nestjs/schematics/releases)
- [Changelog](https://github.com/nestjs/schematics/blob/master/.release-it.json)
- [Commits](nestjs/schematics@10.1.3...10.1.4)

---
updated-dependencies:
- dependency-name: "@nestjs/schematics"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 29.5.12 to 29.5.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)

---
updated-dependencies:
- dependency-name: "@types/jest"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@nestjs/axios](https://github.com/nestjs/axios) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/nestjs/axios/releases)
- [Changelog](https://github.com/nestjs/axios/blob/master/.release-it.json)
- [Commits](nestjs/axios@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: "@nestjs/axios"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [newrelic](https://github.com/newrelic/node-newrelic) from 11.17.0 to 12.5.1.
- [Release notes](https://github.com/newrelic/node-newrelic/releases)
- [Changelog](https://github.com/newrelic/node-newrelic/blob/main/changelog.json)
- [Commits](newrelic/node-newrelic@v11.17.0...v12.5.1)

---
updated-dependencies:
- dependency-name: newrelic
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) from 9.9.1 to 9.11.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.11.1/packages/js)

---
updated-dependencies:
- dependency-name: "@eslint/js"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 5.1.3 to 5.2.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](prettier/eslint-plugin-prettier@v5.1.3...v5.2.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@nestjs/core](https://github.com/nestjs/nest/tree/HEAD/packages/core) from 10.4.1 to 10.4.4.
- [Release notes](https://github.com/nestjs/nest/releases)
- [Commits](https://github.com/nestjs/nest/commits/v10.4.4/packages/core)

---
updated-dependencies:
- dependency-name: "@nestjs/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [axios](https://github.com/axios/axios) from 1.7.4 to 1.7.7.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.7.4...v1.7.7)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Remove dependabot issue generator
Bumps [@nestjs/platform-express](https://github.com/nestjs/nest/tree/HEAD/packages/platform-express) from 10.4.1 to 10.4.6.
- [Release notes](https://github.com/nestjs/nest/releases)
- [Commits](https://github.com/nestjs/nest/commits/v10.4.6/packages/platform-express)

---
updated-dependencies:
- dependency-name: "@nestjs/platform-express"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@nestjs/common](https://github.com/nestjs/nest/tree/HEAD/packages/common) from 10.4.1 to 10.4.6.
- [Release notes](https://github.com/nestjs/nest/releases)
- [Commits](https://github.com/nestjs/nest/commits/v10.4.6/packages/common)

---
updated-dependencies:
- dependency-name: "@nestjs/common"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.5.4 to 22.8.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.5.0 to 8.11.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.11.0/packages/typescript-eslint)

---
updated-dependencies:
- dependency-name: typescript-eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anna Hughes <[email protected]>
@annarhughes annarhughes merged commit 4af82b7 into main Oct 28, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants