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

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Merge Develop onto Main #586

wants to merge 20 commits into from

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 <43586156+kyleecodes@users.noreply.github.com>
Co-authored-by: Anna Hughes <annaraehughes@live.co.uk>
@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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
@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] <support@github.com>
SangilYun and others added 8 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 <eleanor.reem@hotmail.co.uk>
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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
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.

6 participants