From b375caa3ed73510a780b0b647f516bd6b2169476 Mon Sep 17 00:00:00 2001 From: nnn-gif Date: Thu, 22 Aug 2024 10:38:42 +0530 Subject: [PATCH] set customerid while creating oracle --- cmd/http/oraclebuilder/account.go | 7 +++++-- pkg/model/oracle.go | 6 +++--- pkg/model/relDB.go | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/http/oraclebuilder/account.go b/cmd/http/oraclebuilder/account.go index b5be13369..ddb1f7aab 100644 --- a/cmd/http/oraclebuilder/account.go +++ b/cmd/http/oraclebuilder/account.go @@ -25,17 +25,20 @@ type ViewInput struct { } func (ob *Env) ViewAccount(context *gin.Context) { + requestId := context.GetString(REQUEST_ID) + var input ViewInput if err := context.ShouldBind(&input); err != nil { log.Errorln("ShouldBind", err) + log.Errorf("Request ID: %s, ShouldBind err %v ", requestId, err) + context.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) return } //TODO check permission customer, err := ob.RelDB.GetCustomerByPublicKey(input.Creator) if err != nil { - log.Errorln("AddWalletKeys", err) - + log.Errorf("Request ID: %s, ViewAccount err %v ", requestId, err) context.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) return } diff --git a/pkg/model/oracle.go b/pkg/model/oracle.go index 69111978f..19fd6c544 100644 --- a/pkg/model/oracle.go +++ b/pkg/model/oracle.go @@ -61,10 +61,10 @@ func (rdb *RelDB) GetKeyPairID(publicKey string) string { return keypairId } -func (rdb *RelDB) SetOracleConfig(address, feederID, owner, feederAddress, symbols, feedSelection, chainID, frequency, sleepseconds, deviationpermille, blockchainnode, mandatoryFrequency string) error { +func (rdb *RelDB) SetOracleConfig(ctx context.Context, customerId, address, feederID, owner, feederAddress, symbols, feedSelection, chainID, frequency, sleepseconds, deviationpermille, blockchainnode, mandatoryFrequency string) error { currentTime := time.Now() query := fmt.Sprintf(` - INSERT INTO %s (address,feeder_id,owner,symbols,chainID,frequency,sleepseconds,deviationpermille,blockchainnode,mandatory_frequency,feeder_address,createddate,lastupdate,feedSelection) + INSERT INTO %s (customer_id, address,feeder_id,owner,symbols,chainID,frequency,sleepseconds,deviationpermille,blockchainnode,mandatory_frequency,feeder_address,createddate,lastupdate,feedSelection) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14) ON CONFLICT(feeder_id) DO UPDATE SET symbols=$4,frequency=$6,sleepseconds=$7,deviationpermille=$8,blockchainnode=$9,mandatory_frequency=$10,feeder_address=$11,lastupdate=$13,feedSelection=$14`, @@ -72,7 +72,7 @@ func (rdb *RelDB) SetOracleConfig(address, feederID, owner, feederAddress, symbo ) log.Infoln("SetOracleConfig Query", query) - _, err := rdb.postgresClient.Exec(context.Background(), query, address, feederID, owner, symbols, chainID, frequency, sleepseconds, deviationpermille, blockchainnode, mandatoryFrequency, feederAddress, currentTime, currentTime, feedSelection) + _, err := rdb.postgresClient.Exec(ctx, query, customerId, address, feederID, owner, symbols, chainID, frequency, sleepseconds, deviationpermille, blockchainnode, mandatoryFrequency, feederAddress, currentTime, currentTime, feedSelection) if err != nil { return err } diff --git a/pkg/model/relDB.go b/pkg/model/relDB.go index 0ee0f0075..4d11a1081 100644 --- a/pkg/model/relDB.go +++ b/pkg/model/relDB.go @@ -161,7 +161,7 @@ type RelDatastore interface { GetKeyPairID(publickey string) string GetFeederAccessByID(id string) (owner string) GetFeederByID(id string) (owner string) - SetOracleConfig(address, feederID, owner, feederAddress, symbols, feedSelection, chainID, frequency, sleepseconds, deviationpermille, blockchainnode, mandatoryFrequency string) error + SetOracleConfig(ctx context.Context, customerId, address, feederID, owner, feederAddress, symbols, feedSelection, chainID, frequency, sleepseconds, deviationpermille, blockchainnode, mandatoryFrequency string) error SetFeederConfig(feederid, oracleconfigid string) error GetFeederID(address string) (feederId string) GetFeederLimit(owner string) (limit int)