Merge pull request #36 from LATOKEN/feature-swap-status-by-txhash

Added handler for getting status by txHash

Author: arout2

src/app/app.go

@@ -55,6 +55,7 @@ func (a *App) setRouters() {
 	a.Get("/", a.Endpoints)
 	a.Get("/status", a.StatusHandler)
 	a.Get("/status/{destination_chain}/{sender}/{receipt}/{amount}/{tx_hash}", a.SwapStatusHandler)
+	a.Get("/status/{tx_hash}", a.SwapStatusByTxHashHandler)
 	// a.Get("/resend_tx/{id}", a.ResendTxHandler)
 	// a.Get("/set_mode/{mode}", a.SetModeHandler)
 }

src/app/handles.go

@@ -19,6 +19,7 @@ func (a *App) Endpoints(w http.ResponseWriter, r *http.Request) {
 		Endpoints: []string{
 			"/status",
 			"/status/{destination_chain}/{sender}/{receipt}/{amount}/{tx_hash}",
+			"/status/{tx_hash}",
 		},
 	}
 
@@ -49,6 +50,24 @@ func (a *App) SwapStatusHandler(w http.ResponseWriter, r *http.Request) {
 	common.ResponJSON(w, http.StatusOK, status)
 }
 
+// StatusHandler ...
+func (a *App) SwapStatusByTxHashHandler(w http.ResponseWriter, r *http.Request) {
+	txHash := mux.Vars(r)["tx_hash"]
+	if txHash == "" {
+		a.logger.Errorf("Empty request(/status/{tx_hash})")
+		common.ResponJSON(w, http.StatusInternalServerError, createNewError("empty request", ""))
+		return
+	}
+
+	status, err := a.relayer.GetSwapByTxHashStatus(txHash)
+	if err != nil {
+		common.ResponJSON(w, http.StatusNotFound, createNewError("get swap from database", err.Error()))
+		return
+	}
+
+	common.ResponJSON(w, http.StatusOK, status)
+}
+
 // StatusHandler ...
 func (a *App) StatusHandler(w http.ResponseWriter, r *http.Request) {
 	status, err := a.relayer.StatusOfWorkers()

src/service/relayer.go

@@ -88,6 +88,19 @@ func (r *RelayerSRV) GetSwapStatus(req *models.SwapStatus) (storage.SwapStatus,
 	return "", nil
 }
 
+func (r *RelayerSRV) GetSwapByTxHashStatus(txHash string) (storage.SwapStatus, error) {
+	swap, err := r.storage.GetSwapByTxHash(txHash)
+	if err != nil {
+		r.logger.Errorf("GetSwapByTxHashStatus, txHash: %v, failed with error: %v", txHash, err)
+		return "", err
+	}
+	if swap != nil {
+		return swap.Status, nil
+	}
+
+	return "", nil
+}
+
 // Status ...
 func (r *RelayerSRV) StatusOfWorkers() (map[string]*models.WorkerStatus, error) {
 	// get blockchain heights from workers and from database

src/service/storage/swap.go

@@ -45,6 +45,18 @@ func (d *DataBase) GetSwapByStatus(swapType SwapType, sender, receipt string, am
 	return swap, nil
 }
 
+// GetSwapByTxHash ...
+func (d *DataBase) GetSwapByTxHash(txHash string) (*Swap, error) {
+	swap := &Swap{}
+	if err := d.db.Where("tx_hash = ? and status in (?)", txHash,
+		[]SwapStatus{SwapStatusDepositConfirmed, SwapStatusClaimSent, SwapStatusClaimConfirmed, SwapStatusClaimSentFailed, SwapStatusDepositFailed, SwapStatusPassedConfirmed, SwapStatusPassedSent, SwapStatusSpendSent, SwapStatusSpendConfirmed, SwapStatusRejected}).
+		Find(&swap).Error; err != nil {
+		return nil, err
+	}
+
+	return swap, nil
+}
+
 // UpdateSwapStatus ...
 func (d *DataBase) UpdateSwapStatus(swap *Swap, status SwapStatus, rOutAmount string) {
 	swap.Status = status