Merge pull request #21 from AndreyDyubin/14-reject-in-status-draft

add reject in status draft

Author: gebv

functions.sql

@@ -88,7 +88,10 @@ CREATE OR REPLACE FUNCTION acca.reject_tx(
         _tx_status acca.transaction_status;
     BEGIN
         SELECT status INTO _tx_status FROM acca.transactions WHERE tx_id = _tx_id;
-        IF _tx_status <> 'auth' THEN
+        IF _tx_status = 'draft' THEN
+            DELETE FROM acca.requests_queue WHERE tx_id = _tx_id;
+            RETURN;
+        ELSEIF _tx_status <> 'auth' THEN
             RAISE EXCEPTION 'Transaction has already closed (or not found): status=%', _tx_status::text;
         END IF;
 

tests/01_basic_test.go

@@ -601,3 +601,166 @@ func Test01Basic_03ErrorInMiddle(t *testing.T) {
 
 	runTests(t, tests)
 }
+
+func Test01Basic_03SimpleTransferReject(t *testing.T) {
+	cur := "curr"
+
+	tests := []cmdBatch{
+		{
+			"InternalTransferWithHoldAndReject",
+			[]command{
+				CmdInitAccounts(cur, []accountInfo{
+					{
+						AccKey:  "11",
+						Balance: 10,
+					},
+					{
+						AccKey:  "22",
+						Balance: 20,
+					},
+					{
+						AccKey:  "33",
+						Balance: 30,
+					},
+					{
+						AccKey:  "hold11",
+						Balance: 0,
+					},
+				}),
+				CmdTransfers([]transfers{
+					transfers{
+						{
+							SrcAcc: "11",
+							DstAcc: "22",
+							Type:   Internal,
+							Amount: 9,
+							Reason: "fortesting",
+							Meta: MetaData{
+								"foo": "bar",
+							},
+							Hold:    true,
+							HoldAcc: "hold11",
+						},
+						{
+							SrcAcc: "22",
+							DstAcc: "33",
+							Type:   Internal,
+							Amount: 19,
+							Reason: "fortesting",
+							Meta: MetaData{
+								"foo": "bar",
+							},
+							Hold:    true,
+							HoldAcc: "hold11",
+						},
+						{
+							SrcAcc: "33",
+							DstAcc: "11",
+							Type:   Internal,
+							Amount: 29,
+							Reason: "fortesting",
+							Meta: MetaData{
+								"foo": "bar",
+							},
+							Hold:    true,
+							HoldAcc: "hold11",
+						},
+					},
+				}),
+				CmdCheckStatuses("draft"),
+				CmdExecute(1),
+				CmdCheckStatuses("auth"),
+				CmdCheckBalances(map[string]int64{
+					"11":     10 - 9,
+					"22":     20 - 19,
+					"33":     30 - 29,
+					"hold11": 9 + 19 + 29,
+				}),
+				CmdReject(0),
+				CmdExecute(1),
+				CmdCheckStatuses("rejected"),
+				CmdCheckBalances(map[string]int64{
+					"11":     10,
+					"22":     20,
+					"33":     30,
+					"hold11": 0,
+				}),
+			},
+		},
+		{
+			"InternalTransferWithHoldAndRejectInDraft",
+			[]command{
+				CmdInitAccounts(cur, []accountInfo{
+					{
+						AccKey:  "11",
+						Balance: 10,
+					},
+					{
+						AccKey:  "22",
+						Balance: 20,
+					},
+					{
+						AccKey:  "33",
+						Balance: 30,
+					},
+					{
+						AccKey:  "hold11",
+						Balance: 0,
+					},
+				}),
+				CmdTransfers([]transfers{
+					transfers{
+						{
+							SrcAcc: "11",
+							DstAcc: "22",
+							Type:   Internal,
+							Amount: 9,
+							Reason: "fortesting",
+							Meta: MetaData{
+								"foo": "bar",
+							},
+							Hold:    true,
+							HoldAcc: "hold11",
+						},
+						{
+							SrcAcc: "22",
+							DstAcc: "33",
+							Type:   Internal,
+							Amount: 19,
+							Reason: "fortesting",
+							Meta: MetaData{
+								"foo": "bar",
+							},
+							Hold:    true,
+							HoldAcc: "hold11",
+						},
+						{
+							SrcAcc: "33",
+							DstAcc: "11",
+							Type:   Internal,
+							Amount: 29,
+							Reason: "fortesting",
+							Meta: MetaData{
+								"foo": "bar",
+							},
+							Hold:    true,
+							HoldAcc: "hold11",
+						},
+					},
+				}),
+				CmdCheckStatuses("draft"),
+				CmdReject(0),
+				CmdExecute(1),
+				CmdCheckStatuses("draft"),
+				CmdCheckBalances(map[string]int64{
+					"11":      10,
+					"22":      20,
+					"33":      30,
+					"hold111": 0,
+				}),
+			},
+		},
+	}
+
+	runTests(t, tests)
+}