Skip to content

Get rid of remains of ShopIDs and WalletIDs #182

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.

Sign up for GitHub

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

Open
ndiezel0 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Get rid of remains of ShopIDs and WalletIDs #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a29dcdf
Get rid of remains of ShopIDs and WalletIDs
ndiezel0 Aug 28, 2025
e9dc15e
Revert "Get rid of remains of ShopIDs and WalletIDs"
WWWcool Aug 29, 2025
1e7a2c2
Revert "Get rid of remains of ShopIDs and WalletIDs"
WWWcool Aug 29, 2025
f01f0e2
revert refs
WWWcool Aug 29, 2025
9f11ebd
returned refs
WWWcool Aug 29, 2025
d5a851b
Revert shop in proxy provider
ndiezel0 Sep 22, 2025
4ce8bb8
Merge branch 'remove_shop_wallet_ids' of github.com:valitydev/damsel …
ndiezel0 Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions proto/domain.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,8 +775,6 @@ struct PartyContactInfo {

/* Shops */

typedef base.ID ShopID

struct ShopAccount {
1: required CurrencyRef currency
2: required AccountID settlement
Expand Down Expand Up @@ -2337,11 +2335,9 @@ struct PartyCondition {
2: optional PartyConditionDefinition definition
}

typedef base.ID WalletID

union PartyConditionDefinition {
1: ShopID shop_is
2: WalletID wallet_is
1: ShopConfigRef shop_is
2: WalletConfigRef wallet_is
}

struct CriterionRef { 1: required ObjectID id }
Expand Down
16 changes: 8 additions & 8 deletions proto/merch_stat.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ namespace erlang dmsl.merchstat
struct StatPayment {
1 : required domain.InvoicePaymentID id
2 : required domain.InvoiceID invoice_id
3 : required domain.PartyConfigRef owner_id
4 : required domain.ShopConfigRef shop_id
3 : required domain.PartyConfigRef party_ref
4 : required domain.ShopConfigRef shop_ref
5 : required base.Timestamp created_at
6 : required InvoicePaymentStatus status
7 : required domain.Amount amount
Expand Down Expand Up @@ -160,8 +160,8 @@ struct DigitalWallet {
*/
struct StatInvoice {
1 : required domain.InvoiceID id
2 : required domain.PartyConfigRef owner_id
3 : required domain.ShopConfigRef shop_id
2 : required domain.PartyConfigRef party_ref
3 : required domain.ShopConfigRef shop_ref
4 : required base.Timestamp created_at
5 : required InvoiceStatus status
6 : required string product
Expand Down Expand Up @@ -204,8 +204,8 @@ struct StatRefund {
1 : required domain.InvoicePaymentRefundID id
2 : required domain.InvoicePaymentID payment_id
3 : required domain.InvoiceID invoice_id
4 : required domain.PartyConfigRef owner_id
5 : required domain.ShopConfigRef shop_id
4 : required domain.PartyConfigRef party_ref
5 : required domain.ShopConfigRef shop_ref
6 : required InvoicePaymentRefundStatus status
7 : required base.Timestamp created_at
8 : required domain.Amount amount
Expand Down Expand Up @@ -240,8 +240,8 @@ struct StatChargeback {
1: required domain.InvoiceID invoice_id
2: required domain.InvoicePaymentID payment_id
3: required domain.InvoicePaymentChargebackID chargeback_id
4: required domain.PartyConfigRef party_id
5: required domain.ShopConfigRef shop_id
4: required domain.PartyConfigRef party_ref
5: required domain.ShopConfigRef shop_ref
6: required domain.InvoicePaymentChargebackStatus chargeback_status
7: required base.Timestamp created_at
8: optional domain.InvoicePaymentChargebackReason chargeback_reason
Expand Down
14 changes: 6 additions & 8 deletions proto/payment_processing.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,8 @@ struct EventRange {
typedef domain.InvoiceMutationParams InvoiceMutationParams

struct InvoiceParams {
1: required domain.PartyConfigRef party_id
2: required domain.ShopConfigRef shop_id
1: required domain.PartyConfigRef party_ref
2: required domain.ShopConfigRef shop_ref
3: required domain.InvoiceDetails details
4: required base.Timestamp due
5: required domain.Cash cost
Expand All @@ -527,8 +527,8 @@ struct InvoiceWithTemplateParams {

struct InvoiceTemplateCreateParams {
10: required domain.InvoiceTemplateID template_id
1: required domain.PartyConfigRef party_id
2: required domain.ShopConfigRef shop_id
1: required domain.PartyConfigRef party_ref
2: required domain.ShopConfigRef shop_ref
4: required domain.LifetimeInterval invoice_lifetime
7: required string product # for backward compatibility
11: optional string name
Expand Down Expand Up @@ -1487,17 +1487,15 @@ service InvoiceTemplating {
/* Party management service definitions */

// Types

typedef domain.WalletID WalletID
typedef domain.PaymentInstitutionRef PaymentInstitutionRef

struct Varset {
1: optional domain.CategoryRef category
2: optional domain.CurrencyRef currency
3: optional domain.Cash amount
4: optional domain.PaymentMethodRef payment_method
5: optional domain.WalletID wallet_id
6: optional domain.ShopID shop_id
5: optional domain.WalletConfigRef wallet_ref
6: optional domain.ShopConfigRef shop_ref
8: optional domain.PaymentTool payment_tool
9: optional domain.PartyConfigRef party_ref
10: optional domain.BinData bin_data
Expand Down
2 changes: 1 addition & 1 deletion proto/proxy_provider.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ struct PaymentInfo {
}

struct Shop {
1: required domain.ShopID id
1: required base.ID id
2: required domain.Category category
3: required string name
4: optional string description
Expand Down
Loading