Skip to content

Add asset_to_network table #231

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

Merged
ocasta181 merged 2 commits into from
Jul 17, 2023
Merged

Add asset_to_network table #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a14daed
updated for consistency with service/user.go:162
ocasta181 Jul 14, 2023
82f2c71
remove references to asset.network; update asset.Create()
ocasta181 Jul 14, 2023
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: 4 additions & 4 deletions pkg/internal/unit21/transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,12 @@ func mockTransactionRows(mock sqlmock.Sqlmock, transaction model.Transaction, us
AddRow(transaction.DestinationTxLegId, time.Now(), "1", transaction.TransactionAmount, assetId2, userId, instrumentId2)
mock.ExpectQuery("SELECT * FROM tx_leg WHERE id = $1 AND deleted_at IS NULL").WithArgs(transaction.DestinationTxLegId).WillReturnRows(mockedTxLegRow2)

mockedAssetRow1 := sqlmock.NewRows([]string{"id", "name", "description", "decimals", "is_crypto", "network_id", "value_oracle"}).
AddRow(assetId1, "USD", "fiat USD", 6, false, transaction.NetworkId, "self")
mockedAssetRow1 := sqlmock.NewRows([]string{"id", "name", "description", "decimals", "is_crypto", "value_oracle"}).
AddRow(assetId1, "USD", "fiat USD", 6, false, "self")
mock.ExpectQuery("SELECT * FROM asset WHERE id = $1 AND deleted_at IS NULL").WithArgs(assetId1).WillReturnRows(mockedAssetRow1)

mockedAssetRow2 := sqlmock.NewRows([]string{"id", "name", "description", "decimals", "is_crypto", "network_id", "value_oracle"}).
AddRow(assetId2, "Noose The Goose", "Noose the Goose NFT", 0, true, transaction.NetworkId, "joepegs.com")
mockedAssetRow2 := sqlmock.NewRows([]string{"id", "name", "description", "decimals", "is_crypto", "value_oracle"}).
AddRow(assetId2, "Noose The Goose", "Noose the Goose NFT", 0, true, "joepegs.com")
mock.ExpectQuery("SELECT * FROM asset WHERE id = $1 AND deleted_at IS NULL").WithArgs(assetId2).WillReturnRows(mockedAssetRow2)

mockedDeviceRow := sqlmock.NewRows([]string{"id", "type", "description", "fingerprint", "ip_addresses", "user_id"}).
Expand Down
1 change: 0 additions & 1 deletion pkg/model/entity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ type Asset struct {
Description string `json:"description" db:"description"`
Decimals uint64 `json:"decimals" db:"decimals"`
IsCrypto bool `json:"isCrypto" db:"is_crypto"`
NetworkId sql.NullString `json:"networkId" db:"network_id"`
ValueOracle sql.NullString `json:"valueOracle" db:"value_oracle"`
ValueOracle2 sql.NullString `json:"valueOracle2" db:"value_oracle_2"`
}
Expand Down
12 changes: 10 additions & 2 deletions pkg/repository/asset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,16 @@ func (a asset[T]) Create(ctx context.Context, insert model.Asset) (model.Asset,
m := model.Asset{}

query, args, err := a.Named(`
INSERT INTO asset (name, description, decimals, is_crypto, network_id, value_oracle, value_oracle_2)
VALUES(:name, :description, :decimals, :is_crypto, :network_id, :value_oracle, :value_oracle_2) RETURNING *`, insert)
WITH insert_asset AS (
INSERT INTO asset (name, description, decimals, is_crypto, value_oracle, value_oracle_2)
VALUES(:name, :description, :decimals, :is_crypto, :value_oracle, :value_oracle_2)
ON CONFLICT (name) DO NOTHING
RETURNING *
)
INSERT INTO asset_to_network (asset_id, network_id)
VALUES(insert_asset.id, :network_id)
ON CONFLICT (asset_id, network_id) DO NOTHING
`, insert)

if err != nil {
return m, libcommon.StringError(err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/service/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ func (t transaction) addWalletInstrumentIdIfNew(ctx context.Context, address str
}

// Create a new instrument
instrument = model.Instrument{Type: "crypto wallet", Status: "external", Network: "ethereum", PublicKey: address, UserId: id} // No locationId or userId because this wallet was not registered with the user and is some other recipient
instrument = model.Instrument{Type: "crypto wallet", Status: "external", Network: "EVM", PublicKey: address, UserId: id} // No locationId or userId because this wallet was not registered with the user and is some other recipient
instrument, err = t.repos.Instrument.Create(ctx, instrument)
if err != nil {
return "", libcommon.StringError(err)
Expand Down