From bc05998662b69b47b61872037d9f1e187571c5cd Mon Sep 17 00:00:00 2001 From: Thibaut Patel Date: Wed, 23 Mar 2022 11:53:12 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20two=20issues=20with=20of?= =?UTF-8?q?fers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refs https://github.com/TryGhost/Team/issues/1437 - The discount was no longer showing up on the account page when the member had an active discount. - The redemption counter on the offers page was not incrementing. - The root cause was that messages sent on the internal bus were not reaching the internal bus listener, due to the unexpected duplication of the internal bus. --- package.json | 8 ++++---- yarn.lock | 51 +++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index f991d37744..7b21263f98 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@tryghost/custom-theme-settings-service": "0.3.1", "@tryghost/database-info": "0.2.4", "@tryghost/debug": "0.1.13", - "@tryghost/domain-events": "0.1.8", + "@tryghost/domain-events": "0.1.9", "@tryghost/email-analytics-provider-mailgun": "1.0.7", "@tryghost/email-analytics-service": "1.0.5", "@tryghost/errors": "1.2.5", @@ -83,12 +83,12 @@ "@tryghost/logging": "2.0.4", "@tryghost/magic-link": "1.0.21", "@tryghost/member-events": "0.4.0", - "@tryghost/members-api": "5.4.0", + "@tryghost/members-api": "5.4.1", "@tryghost/members-events-service": "0.3.1", - "@tryghost/members-importer": "0.5.3", + "@tryghost/members-importer": "0.5.6", "@tryghost/members-offers": "0.10.9", "@tryghost/members-ssr": "1.0.22", - "@tryghost/members-stripe-service": "0.9.1", + "@tryghost/members-stripe-service": "0.9.2", "@tryghost/metrics": "1.0.6", "@tryghost/minifier": "0.1.11", "@tryghost/mw-error-handler": "0.1.5", diff --git a/yarn.lock b/yarn.lock index c2d01b7c00..72ae5a1f40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1825,7 +1825,7 @@ resolved "https://registry.yarnpkg.com/@tryghost/domain-events/-/domain-events-0.1.8.tgz#754af77b05336a689135971811ee438edda04876" integrity sha512-PalAdGOADidoxXg54F/QJEc1C9PwlQvWnIF1MksWY2Pp8XiH5mzeHisNnqXfXO3dEEopPPreIj7Lx/y6U9NAyQ== -"@tryghost/domain-events@^0.1.8", "@tryghost/domain-events@^0.1.9": +"@tryghost/domain-events@0.1.9", "@tryghost/domain-events@^0.1.8", "@tryghost/domain-events@^0.1.9": version "0.1.9" resolved "https://registry.yarnpkg.com/@tryghost/domain-events/-/domain-events-0.1.9.tgz#f2de5189df2238bb72a53a76abcded0d84ae6fa7" integrity sha512-n2FEA5xBQBCHq02CNBMh8BkWV7zdy9yp/Y4dGWc2QQ58lcNTgSBqZBaPpfPURgTGJbLqO+xsNQgU0LYvUN9JTQ== @@ -2031,7 +2031,7 @@ lodash "^4.17.21" luxon "^1.26.0" -"@tryghost/logging@2.0.1", "@tryghost/logging@2.0.4", "@tryghost/logging@^2.0.0", "@tryghost/logging@^2.0.1": +"@tryghost/logging@2.0.1", "@tryghost/logging@2.0.4", "@tryghost/logging@^2.0.0", "@tryghost/logging@^2.0.1", "@tryghost/logging@^2.0.5": version "2.0.4" resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.0.4.tgz#7fadc8557fb548729a9296eed2dbff41904c38c2" integrity sha512-XYiWv4kAjdpW5wYWUsOvkov5pQa25OwPUUADE0s7G3pFHV+pQbLxbOaj0xQEPUTuMPOOCTG4ZBkZsjqs0OyKtA== @@ -2085,10 +2085,10 @@ "@tryghost/domain-events" "^0.1.9" "@tryghost/member-events" "^0.4.1" -"@tryghost/members-api@5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-5.4.0.tgz#631393fca8ffcdf88f34ef68ceeeff2d770c2284" - integrity sha512-DMRLyzKQ0wuv2Jx3/NC+xAH0PUSJcz+xEy7KXsIZFTNFVa7iHaovXZgJDryUJ6DIBhROiRy0wo1BDhqozCNVdw== +"@tryghost/members-api@5.4.1": + version "5.4.1" + resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-5.4.1.tgz#bc9f9c4c61dee186a662050aa00969325e1d3ae5" + integrity sha512-8aUQWRc7cOrpeZELdw9T1/0vvA2BSx41yMZlKG1CsOW60zt4YnwiINSlvo0QOtC7ffu59erR40H4IdhKXsMD5w== dependencies: "@nexes/nql" "^0.6.0" "@tryghost/debug" "^0.1.2" @@ -2100,7 +2100,7 @@ "@tryghost/member-events" "^0.4.1" "@tryghost/members-analytics-ingress" "^0.1.12" "@tryghost/members-payments" "^0.1.11" - "@tryghost/members-stripe-service" "^0.9.1" + "@tryghost/members-stripe-service" "^0.9.2" "@tryghost/tpl" "^0.1.2" "@types/jsonwebtoken" "^8.5.1" bluebird "^3.5.4" @@ -2113,15 +2113,15 @@ lodash "^4.17.11" node-jose "^2.0.0" -"@tryghost/members-csv@^1.2.6": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@tryghost/members-csv/-/members-csv-1.2.6.tgz#703c8fc0d79a4b5fef95a64081cab08a655f44c1" - integrity sha512-mK0ath8GUUaw/HO3/pwV2tBt4cFPxC372CIqc0EdypD0/AJKrOHRLIhqUE4VZ5qMtzAC43RFEFZM3rNay0cQHw== +"@tryghost/members-csv@^1.2.9": + version "1.2.9" + resolved "https://registry.yarnpkg.com/@tryghost/members-csv/-/members-csv-1.2.9.tgz#42f60a3ba8870b7c103c919dad28cac451863133" + integrity sha512-XjkEyqhZ3p2hxkR2YDAaKgsNQNpu+EDwyPui8zLz0u2SgvNCZNTGtDwIsR8j6rGoVHzo6tLkn/N77Wlb6B6Axw== dependencies: bluebird "^3.7.2" fs-extra "^10.0.0" lodash "^4.17.21" - papaparse "5.3.1" + papaparse "5.3.2" pump "^3.0.0" "@tryghost/members-events-service@0.3.1": @@ -2133,13 +2133,13 @@ "@tryghost/member-events" "0.4.0" moment-timezone "0.5.34" -"@tryghost/members-importer@0.5.3": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@tryghost/members-importer/-/members-importer-0.5.3.tgz#d43ee2bffdb8921647cdc1cbaa135b8af441bff3" - integrity sha512-pWiEKKeQdwJd9S3qCedNe9yqkqSkSrbcJFjE9Rt+eoQQcBYKs/l1oGS9WQ8OYH+42gt5PEX91Qj1mX34ZHw6sA== +"@tryghost/members-importer@0.5.6": + version "0.5.6" + resolved "https://registry.yarnpkg.com/@tryghost/members-importer/-/members-importer-0.5.6.tgz#dcbc7410360cbf132f5792243accae857c3a33bd" + integrity sha512-VW7URiFjwJcQ1oITIVUHyOEai4moaQZwnBAjUIylvxJJfxTIU/Afmc/JFcl6WW85dxK/gPSmzFwGwXrzsi0E1Q== dependencies: "@tryghost/errors" "^1.0.0" - "@tryghost/members-csv" "^1.2.6" + "@tryghost/members-csv" "^1.2.9" "@tryghost/tpl" "^0.1.3" moment-timezone "0.5.23" @@ -2172,14 +2172,18 @@ jsonwebtoken "^8.5.1" lodash "^4.17.11" -"@tryghost/members-stripe-service@0.9.1", "@tryghost/members-stripe-service@^0.9.1": - version "0.9.1" - resolved "https://registry.yarnpkg.com/@tryghost/members-stripe-service/-/members-stripe-service-0.9.1.tgz#6ec70a1a328dd56e54b0dbfc6578ac9826f60b52" - integrity sha512-2Q1bcx5aEKCAx5Y1cfne2H7LtA7fRI14cO3ES3h0C/yQ2N2oK/wAtge9j3LfH4aSqmQz4c43DdT2AmzuKkIXjA== +"@tryghost/members-stripe-service@0.9.2", "@tryghost/members-stripe-service@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@tryghost/members-stripe-service/-/members-stripe-service-0.9.2.tgz#c5e2a9d6410a6c66dfe35a67d90fa03ba44b58f6" + integrity sha512-wmx4Q19PGN0DxMfgbuH3whgeq+t5hggPtvLpxSBUbuu30kSvZgFqJwse9GGU7DkaD3WaMqDa57F5vrHRd8IEjA== dependencies: "@tryghost/debug" "^0.1.4" + "@tryghost/domain-events" "^0.1.9" "@tryghost/errors" "1.2.5" + "@tryghost/logging" "^2.0.5" + "@tryghost/member-events" "^0.4.1" leaky-bucket "^2.2.0" + lodash "^4.17.21" stripe "^8.174.0" "@tryghost/metrics@1.0.6": @@ -9640,11 +9644,6 @@ pako@^2.0.4: resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.4.tgz#6cebc4bbb0b6c73b0d5b8d7e8476e2b2fbea576d" integrity sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg== -papaparse@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/papaparse/-/papaparse-5.3.1.tgz#770b7a9124d821d4b2132132b7bd7dce7194b5b1" - integrity sha512-Dbt2yjLJrCwH2sRqKFFJaN5XgIASO9YOFeFP8rIBRG2Ain8mqk5r1M6DkfvqEVozVcz3r3HaUGw253hA1nLIcA== - papaparse@5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/papaparse/-/papaparse-5.3.2.tgz#d1abed498a0ee299f103130a6109720404fbd467"