Skip to content

Commit c7fc143

Browse files
committed
Merge branch 'main' of github.com:juspay/hyperswitch into add-cypress-ci
* 'main' of github.com:juspay/hyperswitch: ci: obtain files modified from PR instead of git diff (#5436) fix(cypress): fix cypress tests, failing due to error codes being recently changed (#5425) feat(connector): [HELCIM] Move connector to hyperswitch_connectors (#5287) chore(version): 2024.07.25.0 feat(router): add merchant_connector_account create v2 api flow (#5385) refactor(connector): added amount conversion framework for bitpay (#4973) refactor(core): patch file for removal of id from schema (#5398) ci(cypress): Nullify positive cases for MIT payments (#5434)
2 parents 72e8a36 + 2f47491 commit c7fc143

File tree

121 files changed

+5919
-2430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+5919
-2430
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ crates/router/tests/connectors/ @juspay/hyperswitch-connector
4141
crates/test_utils/tests/connectors/ @juspay/hyperswitch-connector
4242
crates/test_utils/tests/sample_auth.toml @juspay/hyperswitch-connector
4343
crates/connector_configs/ @juspay/hyperswitch-connector
44+
crates/hyperswitch_connectors/ @juspay/hyperswitch-connector
4445

4546
crates/router/src/compatibility/ @juspay/hyperswitch-compatibility
4647

.github/workflows/CI-pr.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ jobs:
101101
- name: Checkout repository
102102
uses: actions/checkout@v4
103103

104-
- name: "Fetch base branch"
105-
shell: bash
106-
run: git fetch origin $GITHUB_BASE_REF --depth 1
107-
108104
- name: Install mold linker
109105
uses: rui314/setup-mold@v1
110106
if: ${{ runner.os == 'Linux' }}
@@ -150,6 +146,8 @@ jobs:
150146

151147
- name: Cargo hack
152148
shell: bash
149+
env:
150+
GH_TOKEN: ${{ github.token }}
153151
run: just ci_hack
154152

155153
# cargo-deny:
@@ -205,10 +203,6 @@ jobs:
205203
ref: ${{ github.event.pull_request.head.ref }}
206204
token: ${{ steps.generate_token.outputs.token }}
207205

208-
- name: "Fetch base branch"
209-
shell: bash
210-
run: git fetch origin $GITHUB_BASE_REF --depth 1
211-
212206
- name: Install mold linker
213207
uses: rui314/setup-mold@v1
214208
if: ${{ runner.os == 'Linux' }}
@@ -277,6 +271,8 @@ jobs:
277271
278272
- name: Run cargo check
279273
shell: bash
274+
env:
275+
GH_TOKEN: ${{ github.token }}
280276
run: just ci_hack
281277

282278
typos:

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,31 @@ All notable changes to HyperSwitch will be documented here.
44

55
- - -
66

7+
## 2024.07.25.0
8+
9+
### Features
10+
11+
- **connector:** [Itaubank] Add refund and rsync flow ([#5420](https://github.com/juspay/hyperswitch/pull/5420)) ([`920b323`](https://github.com/juspay/hyperswitch/commit/920b3236ee132dac446fc73de82d24806c6b5148))
12+
- **router:** Add merchant_connector_account create v2 api flow ([#5385](https://github.com/juspay/hyperswitch/pull/5385)) ([`98349a0`](https://github.com/juspay/hyperswitch/commit/98349a0c3bbc438e541a03e7fe1c005e5751e6e0))
13+
- Add create retrieve and update api endpoints for organization resource ([#5361](https://github.com/juspay/hyperswitch/pull/5361)) ([`26b8783`](https://github.com/juspay/hyperswitch/commit/26b878308f7e493d6adb8c08b54a5498406eb28a))
14+
- Create additional columns in organization table ([#5380](https://github.com/juspay/hyperswitch/pull/5380)) ([`65471da`](https://github.com/juspay/hyperswitch/commit/65471da57b19c8eb2922fba0350e06b37b53f45f))
15+
16+
### Bug Fixes
17+
18+
- **euclid:** Remove business_profile routing feature flag ([#5430](https://github.com/juspay/hyperswitch/pull/5430)) ([`e18ea7a`](https://github.com/juspay/hyperswitch/commit/e18ea7a7bab257a6082639e84da8d9e44f31168f))
19+
20+
### Refactors
21+
22+
- **connector:**
23+
- Added amount conversion framework for billwerk ([#4972](https://github.com/juspay/hyperswitch/pull/4972)) ([`9d9dce9`](https://github.com/juspay/hyperswitch/commit/9d9dce90fc3dc2a51afa2b11035c4ae729329df4))
24+
- Added amount conversion framework for bitpay ([#4973](https://github.com/juspay/hyperswitch/pull/4973)) ([`83dbb7a`](https://github.com/juspay/hyperswitch/commit/83dbb7a8daf44bdd3d8c0e98973bba4b90eb5861))
25+
- **core:** Patch file for removal of id from schema ([#5398](https://github.com/juspay/hyperswitch/pull/5398)) ([`ff3b9a2`](https://github.com/juspay/hyperswitch/commit/ff3b9a2a12cd7f7e6c20f81777f6862b1f229bd4))
26+
- **merchant_id:** Create domain type for `merchant_id` ([#5408](https://github.com/juspay/hyperswitch/pull/5408)) ([`7068fbf`](https://github.com/juspay/hyperswitch/commit/7068fbfbe2f561f71c2358d8d2a744d28672a892))
27+
28+
**Full Changelog:** [`2024.07.24.0...2024.07.25.0`](https://github.com/juspay/hyperswitch/compare/2024.07.24.0...2024.07.25.0)
29+
30+
- - -
31+
732
## 2024.07.24.0
833

934
### Features

Cargo.lock

Lines changed: 23 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api-reference/openapi_spec.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9372,7 +9372,8 @@
93729372
"payments",
93739373
"refunds",
93749374
"disputes",
9375-
"mandates"
9375+
"mandates",
9376+
"payouts"
93769377
]
93779378
},
93789379
"EventListItemResponse": {
@@ -11933,6 +11934,7 @@
1193311934
"nullable": true
1193411935
},
1193511936
"pm_auth_config": {
11937+
"type": "object",
1193611938
"nullable": true
1193711939
},
1193811940
"status": {
@@ -12181,6 +12183,7 @@
1218112183
"nullable": true
1218212184
},
1218312185
"pm_auth_config": {
12186+
"type": "object",
1218412187
"nullable": true
1218512188
},
1218612189
"status": {
@@ -12303,6 +12306,8 @@
1230312306
"nullable": true
1230412307
},
1230512308
"pm_auth_config": {
12309+
"type": "object",
12310+
"description": "pm_auth_config will relate MCA records to their respective chosen auth services, based on payment_method and pmt",
1230612311
"nullable": true
1230712312
},
1230812313
"status": {
@@ -20882,7 +20887,8 @@
2088220887
"TransactionType": {
2088320888
"type": "string",
2088420889
"enum": [
20885-
"payment"
20890+
"payment",
20891+
"payout"
2088620892
]
2088720893
},
2088820894
"UpdateApiKeyRequest": {

crates/analytics/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ common_enums = { version = "0.1.0", path = "../common_enums" }
1818
common_utils = { version = "0.1.0", path = "../common_utils" }
1919
diesel_models = { version = "0.1.0", path = "../diesel_models", features = ["kv_store"] }
2020
hyperswitch_domain_models = { version = "0.1.0", path = "../hyperswitch_domain_models", default-features = false }
21-
hyperswitch_interfaces = { version = "0.1.0", path = "../hyperswitch_interfaces" }
21+
hyperswitch_interfaces = { version = "0.1.0", path = "../hyperswitch_interfaces", default-features = false }
2222
masking = { version = "0.1.0", path = "../masking" }
2323
router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] }
2424
storage_impl = { version = "0.1.0", path = "../storage_impl", default-features = false }

crates/api_models/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ default = ["v1"]
1212
errors = ["dep:actix-web", "dep:reqwest"]
1313
dummy_connector = ["euclid/dummy_connector", "common_enums/dummy_connector"]
1414
detailed_errors = []
15-
payouts = []
15+
payouts = ["common_enums/payouts"]
1616
frm = []
1717
olap = []
1818
openapi = ["common_enums/openapi", "olap", "recon", "dummy_connector", "olap"]
1919
recon = []
2020
v2 = []
2121
v1 = []
22+
merchant_connector_account_v2 = []
2223
customer_v2 = []
2324
merchant_account_v2 = []
2425
payment_v2 = []

0 commit comments

Comments
 (0)