Merge pull request twreporter#433 from babygoat/record-api-update

api/donation: record api update

Author: babygoat

controllers/donation.go

@@ -217,8 +217,16 @@ type (
 		ReceiptHeader null.String       `json:"receipt_header"`
 	}
 
+	queryFilterTime struct {
+		StartTime null.Int `json:"start_time"`
+		EndTime   null.Int `json:"end_time"`
+	}
+
 	queryFilter struct {
-		OrderNumber string `json:"order_number" binding:"required"`
+		OrderNumber       string           `json:"order_number" binding:"required"`
+		BankTransactionID null.String      `json:"bank_transaction_id"`
+		RecTradeID        null.String      `json:"rec_trade_id"`
+		Time              *queryFilterTime `json:"time"`
 	}
 
 	queryReq struct {
@@ -941,6 +949,13 @@ func (mc *MembershipController) QueryTappayServer(c *gin.Context) (int, gin.H, e
 		}}, nil
 	}
 
+	// If the required fields `bank_transaction_id` or `rec_trade_id` are not specified, append the time filter of one month range from now
+	if reqBody.Filters.RecTradeID.IsZero() && reqBody.Filters.BankTransactionID.IsZero() {
+		end := time.Now()
+		start := end.AddDate(0, -1, 0)
+		reqBody.Filters.Time.EndTime = null.IntFrom(end.Unix())
+		reqBody.Filters.Time.StartTime = null.IntFrom(start.Unix())
+	}
 	tapPayResp, err := reqBody.QueryServer()
 
 	if err != nil {

doc/donation.apib

@@ -36,9 +36,7 @@ Post to get a tappay record
             {
                 "status": "fail",
                 "data": {
-                    "filters": {
-                        "order_number": "not found"
-                    }
+                    "filters": "{\"order_number\": \"twreporter-123\"} cannot address a existing resource."
                 }
             }
 
@@ -51,6 +49,8 @@ Post to get a tappay record
 + records_per_page: 1 (optional, number)
 + filters
     + `order_number`: `twreporter-153371414230837160610` (required)
+    + `rec_trade_id`: LN201711088cHQHr (optional)
+    + `bank_transaction_id`: TP201711088cHQHr (optional)
 
 ### TappayTradeRecords
 + record_status: 0 (number)