Skip to content

Commit 074a11f

Browse files
jeffyantajeffyanta
committed
Additional cleanup of intents model
1 parent 994e6cf commit 074a11f

4 files changed

Lines changed: 27 additions & 51 deletions

File tree

‎pkg/code/data/intent/intent.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ type Record struct {
5252
ReceivePaymentsPubliclyMetadata *ReceivePaymentsPubliclyMetadata
5353
PublicDistributionMetadata *PublicDistributionMetadata
5454

55-
ExtendedMetadata []byte
56-
5755
State State
5856

5957
Version uint64
@@ -164,8 +162,6 @@ func (r *Record) Clone() Record {
164162
ReceivePaymentsPubliclyMetadata: receivePaymentsPubliclyMetadata,
165163
PublicDistributionMetadata: publicDistributionMetadata,
166164

167-
ExtendedMetadata: r.ExtendedMetadata,
168-
169165
State: r.State,
170166

171167
Version: r.Version,
@@ -190,8 +186,6 @@ func (r *Record) CopyTo(dst *Record) {
190186
dst.ReceivePaymentsPubliclyMetadata = r.ReceivePaymentsPubliclyMetadata
191187
dst.PublicDistributionMetadata = r.PublicDistributionMetadata
192188

193-
dst.ExtendedMetadata = r.ExtendedMetadata
194-
195189
dst.State = r.State
196190

197191
dst.Version = r.Version

‎pkg/code/data/intent/postgres/model.go‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ type intentModel struct {
4343
IsRemoteSend bool `db:"is_remote_send"`
4444
IsReturned bool `db:"is_returned"`
4545
IsIssuerVoidingGiftCard bool `db:"is_issuer_voiding_gift_card"`
46-
IsMicroPayment bool `db:"is_micro_payment"`
47-
ExtendedMetadata []byte `db:"extended_metadata"`
4846
State uint `db:"state"`
4947
Version int64 `db:"version"`
5048
CreatedAt time.Time `db:"created_at"`
@@ -69,15 +67,14 @@ func toIntentModel(obj *intent.Record) (*intentModel, error) {
6967
}
7068

7169
m := &intentModel{
72-
Id: sql.NullInt64{Int64: int64(obj.Id), Valid: true},
73-
IntentId: obj.IntentId,
74-
IntentType: uint(obj.IntentType),
75-
Mint: mint,
76-
InitiatorOwner: obj.InitiatorOwnerAccount,
77-
ExtendedMetadata: obj.ExtendedMetadata,
78-
State: uint(obj.State),
79-
CreatedAt: obj.CreatedAt,
80-
Version: int64(obj.Version),
70+
Id: sql.NullInt64{Int64: int64(obj.Id), Valid: true},
71+
IntentId: obj.IntentId,
72+
IntentType: uint(obj.IntentType),
73+
Mint: mint,
74+
InitiatorOwner: obj.InitiatorOwnerAccount,
75+
State: uint(obj.State),
76+
CreatedAt: obj.CreatedAt,
77+
Version: int64(obj.Version),
8178
}
8279

8380
switch obj.IntentType {
@@ -132,7 +129,6 @@ func fromIntentModel(obj *intentModel) *intent.Record {
132129
IntentId: obj.IntentId,
133130
IntentType: intent.Type(obj.IntentType),
134131
InitiatorOwnerAccount: obj.InitiatorOwner,
135-
ExtendedMetadata: obj.ExtendedMetadata,
136132
State: intent.State(obj.State),
137133
Version: uint64(obj.Version),
138134
CreatedAt: obj.CreatedAt.UTC(),
@@ -203,16 +199,16 @@ func (m *intentModel) dbSave(ctx context.Context, db *sqlx.DB) error {
203199

204200
return pgutil.ExecuteInTx(ctx, db, sql.LevelDefault, func(tx *sqlx.Tx) error {
205201
query := `INSERT INTO ` + intentTableName + `
206-
(intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, is_micro_payment, extended_metadata, state, version, created_at)
207-
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21 + 1, $22)
202+
(intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, state, version, created_at)
203+
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19 + 1, $20)
208204
209205
ON CONFLICT (intent_id)
210206
DO UPDATE
211-
SET state = $20, version = ` + intentTableName + `.version + 1
212-
WHERE ` + intentTableName + `.intent_id = $1 AND ` + intentTableName + `.version = $21
207+
SET state = $18, version = ` + intentTableName + `.version + 1
208+
WHERE ` + intentTableName + `.intent_id = $1 AND ` + intentTableName + `.version = $19
213209
214210
RETURNING
215-
id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, is_micro_payment, extended_metadata, state, version, created_at`
211+
id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, state, version, created_at`
216212

217213
err := tx.QueryRowxContext(
218214
ctx,
@@ -234,8 +230,6 @@ func (m *intentModel) dbSave(ctx context.Context, db *sqlx.DB) error {
234230
m.IsRemoteSend,
235231
m.IsReturned,
236232
m.IsIssuerVoidingGiftCard,
237-
m.IsMicroPayment,
238-
m.ExtendedMetadata,
239233
m.State,
240234
m.Version,
241235
m.CreatedAt,
@@ -361,7 +355,7 @@ func dbGetAccounts(ctx context.Context, db *sqlx.DB, intentType intent.Type, pag
361355
func dbGetIntentByIntentID(ctx context.Context, db *sqlx.DB, intentID string) (*intentModel, error) {
362356
res := &intentModel{}
363357

364-
query := `SELECT id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, is_micro_payment, extended_metadata, state, version, created_at
358+
query := `SELECT id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, state, version, created_at
365359
FROM ` + intentTableName + `
366360
WHERE intent_id = $1
367361
LIMIT 1`
@@ -381,7 +375,7 @@ func dbGetIntentByIntentID(ctx context.Context, db *sqlx.DB, intentID string) (*
381375
func dbGetIntentByID(ctx context.Context, db *sqlx.DB, id int64) (*intentModel, error) {
382376
res := &intentModel{}
383377

384-
query := `SELECT id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, is_micro_payment, extended_metadata, state, version, created_at
378+
query := `SELECT id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, state, version, created_at
385379
FROM ` + intentTableName + `
386380
WHERE id = $1
387381
LIMIT 1`
@@ -404,7 +398,7 @@ func dbGetAllByOwner(ctx context.Context, db *sqlx.DB, owner string, cursor q.Cu
404398
models := []*intentModel{}
405399

406400
opts := []any{owner}
407-
query1 := `SELECT id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, is_micro_payment, extended_metadata, state, version, created_at
401+
query1 := `SELECT id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, state, version, created_at
408402
FROM ` + intentTableName + `
409403
WHERE (owner = $1 OR destination_owner = $1)
410404
`
@@ -473,7 +467,7 @@ func dbGetAllByOwner(ctx context.Context, db *sqlx.DB, owner string, cursor q.Cu
473467
func dbGetOriginalGiftCardIssuedIntent(ctx context.Context, db *sqlx.DB, giftCardVault string) (*intentModel, error) {
474468
res := []*intentModel{}
475469

476-
query := `SELECT id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, is_micro_payment, extended_metadata, state, version, created_at
470+
query := `SELECT id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, state, version, created_at
477471
FROM ` + intentTableName + `
478472
WHERE destination = $1 and intent_type = $2 AND state != $3 AND is_remote_send IS TRUE
479473
LIMIT 2
@@ -505,7 +499,7 @@ func dbGetOriginalGiftCardIssuedIntent(ctx context.Context, db *sqlx.DB, giftCar
505499
func dbGetGiftCardClaimedIntent(ctx context.Context, db *sqlx.DB, giftCardVault string) (*intentModel, error) {
506500
res := []*intentModel{}
507501

508-
query := `SELECT id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, is_micro_payment, extended_metadata, state, version, created_at
502+
query := `SELECT id, intent_id, intent_type, mint, owner, source, destination_owner, destination, quantity, exchange_currency, exchange_rate, native_amount, usd_market_value, is_withdraw, is_deposit, is_remote_send, is_returned, is_issuer_voiding_gift_card, state, version, created_at
509503
FROM ` + intentTableName + `
510504
WHERE source = $1 and intent_type = $2 AND state != $3 AND is_remote_send IS TRUE
511505
LIMIT 2

‎pkg/code/data/intent/postgres/store_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const (
2626
intent_type INTEGER NOT NULL,
2727
2828
mint TEXT NULL,
29+
2930
owner TEXT NOT NULL,
3031
source TEXT NULL,
3132
destination TEXT NULL,
@@ -43,9 +44,6 @@ const (
4344
is_remote_send BOOL NOT NULL,
4445
is_returned BOOL NOT NULL,
4546
is_issuer_voiding_gift_card BOOL NOT NULL,
46-
is_micro_payment BOOL NOT NULL,
47-
48-
extended_metadata BYTEA NULL,
4947
5048
state INTEGER NOT NULL,
5149

‎pkg/code/data/intent/tests/tests.go‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ func testOpenAccountsRoundTrip(t *testing.T, s intent.Store) {
4747
MintAccount: "test_mint",
4848
InitiatorOwnerAccount: "test_owner",
4949
OpenAccountsMetadata: &intent.OpenAccountsMetadata{},
50-
ExtendedMetadata: []byte("extended_metadata"),
5150
State: intent.StateUnknown,
5251
CreatedAt: time.Now(),
5352
}
@@ -64,7 +63,6 @@ func testOpenAccountsRoundTrip(t *testing.T, s intent.Store) {
6463
assert.Equal(t, cloned.MintAccount, actual.MintAccount)
6564
assert.Equal(t, cloned.InitiatorOwnerAccount, actual.InitiatorOwnerAccount)
6665
require.NotNil(t, actual.OpenAccountsMetadata)
67-
assert.Equal(t, cloned.ExtendedMetadata, actual.ExtendedMetadata)
6866
assert.Equal(t, cloned.State, actual.State)
6967
assert.Equal(t, cloned.CreatedAt.Unix(), actual.CreatedAt.Unix())
7068
assert.EqualValues(t, 1, actual.Id)
@@ -91,9 +89,8 @@ func testExternalDepositRoundTrip(t *testing.T, s intent.Store) {
9189
Quantity: 12345,
9290
UsdMarketValue: 1.2345,
9391
},
94-
ExtendedMetadata: []byte("extended_metadata"),
95-
State: intent.StateUnknown,
96-
CreatedAt: time.Now(),
92+
State: intent.StateUnknown,
93+
CreatedAt: time.Now(),
9794
}
9895
cloned := expected.Clone()
9996
err = s.Save(ctx, &expected)
@@ -111,7 +108,6 @@ func testExternalDepositRoundTrip(t *testing.T, s intent.Store) {
111108
assert.Equal(t, cloned.ExternalDepositMetadata.DestinationTokenAccount, actual.ExternalDepositMetadata.DestinationTokenAccount)
112109
assert.Equal(t, cloned.ExternalDepositMetadata.Quantity, actual.ExternalDepositMetadata.Quantity)
113110
assert.Equal(t, cloned.ExternalDepositMetadata.UsdMarketValue, actual.ExternalDepositMetadata.UsdMarketValue)
114-
assert.Equal(t, cloned.ExtendedMetadata, actual.ExtendedMetadata)
115111
assert.Equal(t, cloned.State, actual.State)
116112
assert.Equal(t, cloned.CreatedAt.Unix(), actual.CreatedAt.Unix())
117113
assert.EqualValues(t, 1, actual.Id)
@@ -146,9 +142,8 @@ func testSendPublicPaymentRoundTrip(t *testing.T, s intent.Store) {
146142
IsWithdrawal: true,
147143
IsRemoteSend: true,
148144
},
149-
ExtendedMetadata: []byte("extended_metadata"),
150-
State: intent.StateUnknown,
151-
CreatedAt: time.Now(),
145+
State: intent.StateUnknown,
146+
CreatedAt: time.Now(),
152147
}
153148
cloned := expected.Clone()
154149
err = s.Save(ctx, &expected)
@@ -172,7 +167,6 @@ func testSendPublicPaymentRoundTrip(t *testing.T, s intent.Store) {
172167
assert.Equal(t, cloned.SendPublicPaymentMetadata.UsdMarketValue, actual.SendPublicPaymentMetadata.UsdMarketValue)
173168
assert.Equal(t, cloned.SendPublicPaymentMetadata.IsWithdrawal, actual.SendPublicPaymentMetadata.IsWithdrawal)
174169
assert.Equal(t, cloned.SendPublicPaymentMetadata.IsRemoteSend, actual.SendPublicPaymentMetadata.IsRemoteSend)
175-
assert.Equal(t, cloned.ExtendedMetadata, actual.ExtendedMetadata)
176170
assert.Equal(t, cloned.State, actual.State)
177171
assert.Equal(t, cloned.CreatedAt.Unix(), actual.CreatedAt.Unix())
178172
assert.EqualValues(t, 1, actual.Id)
@@ -205,9 +199,8 @@ func testReceivePaymentsPubliclyRoundTrip(t *testing.T, s intent.Store) {
205199
OriginalNativeAmount: 1234.5,
206200
UsdMarketValue: 999.99,
207201
},
208-
ExtendedMetadata: []byte("extended_metadata"),
209-
State: intent.StateUnknown,
210-
CreatedAt: time.Now(),
202+
State: intent.StateUnknown,
203+
CreatedAt: time.Now(),
211204
}
212205
cloned := expected.Clone()
213206
err = s.Save(ctx, &expected)
@@ -231,7 +224,6 @@ func testReceivePaymentsPubliclyRoundTrip(t *testing.T, s intent.Store) {
231224
assert.Equal(t, cloned.ReceivePaymentsPubliclyMetadata.OriginalExchangeRate, actual.ReceivePaymentsPubliclyMetadata.OriginalExchangeRate)
232225
assert.Equal(t, cloned.ReceivePaymentsPubliclyMetadata.OriginalNativeAmount, actual.ReceivePaymentsPubliclyMetadata.OriginalNativeAmount)
233226
assert.Equal(t, cloned.ReceivePaymentsPubliclyMetadata.UsdMarketValue, actual.ReceivePaymentsPubliclyMetadata.UsdMarketValue)
234-
assert.Equal(t, cloned.ExtendedMetadata, actual.ExtendedMetadata)
235227
assert.Equal(t, cloned.State, actual.State)
236228
assert.Equal(t, cloned.CreatedAt.Unix(), actual.CreatedAt.Unix())
237229
assert.EqualValues(t, 1, actual.Id)
@@ -270,9 +262,8 @@ func testPublicDistributionRoundTrip(t *testing.T, s intent.Store) {
270262
Quantity: 12345,
271263
UsdMarketValue: 999.99,
272264
},
273-
ExtendedMetadata: []byte("extended_metadata"),
274-
State: intent.StateUnknown,
275-
CreatedAt: time.Now(),
265+
State: intent.StateUnknown,
266+
CreatedAt: time.Now(),
276267
}
277268
cloned := expected.Clone()
278269
err = s.Save(ctx, &expected)
@@ -302,7 +293,6 @@ func testPublicDistributionRoundTrip(t *testing.T, s intent.Store) {
302293
}
303294
assert.Equal(t, cloned.PublicDistributionMetadata.Quantity, actual.PublicDistributionMetadata.Quantity)
304295
assert.Equal(t, cloned.PublicDistributionMetadata.UsdMarketValue, actual.PublicDistributionMetadata.UsdMarketValue)
305-
assert.Equal(t, cloned.ExtendedMetadata, actual.ExtendedMetadata)
306296
assert.Equal(t, cloned.State, actual.State)
307297
assert.Equal(t, cloned.CreatedAt.Unix(), actual.CreatedAt.Unix())
308298
assert.EqualValues(t, 1, actual.Id)

0 commit comments

Comments
 (0)