Merge pull request #67 from zoobc/39/transaction-send-money

39/transaction send money

Author: iltoga

.golangci.yml

@@ -16,7 +16,7 @@ linters-settings:
   gofmt:
     simplify: true
   gocyclo:
-    min-complexity: 12
+    min-complexity: 14
   maligned:
     suggest-new: true
   dupl:

common/query/accountQuery.go

@@ -16,9 +16,11 @@ type (
 
 	AccountQueryInterface interface {
 		GetAccountByID(accountID []byte) (str string, args []interface{})
+		GetAccountByIDs(ids [][]byte) (str string, args [][]byte)
 		InsertAccount(account *model.Account) (str string, args []interface{})
 		ExtractModel(account *model.Account) []interface{}
 		BuildModel(accounts []*model.Account, rows *sql.Rows) []*model.Account
+		GetTableName() string
 	}
 )
 
@@ -36,6 +38,16 @@ func (aq *AccountQuery) GetAccountByID(accountID []byte) (str string, args []int
 		[]interface{}{accountID}
 }
 
+// GetAccountByIDs return query string to get accounts by multiple IDs
+func (aq *AccountQuery) GetAccountByIDs(ids [][]byte) (str string, args [][]byte) {
+	return fmt.Sprintf(
+		"SELECT %s FROM %s WHERE id in (%s)",
+		strings.Join(aq.Fields, ","),
+		aq.TableName,
+		fmt.Sprintf("? %s", strings.Repeat(",?", len(ids)-1)),
+	), args
+}
+
 func (aq *AccountQuery) InsertAccount(account *model.Account) (str string, args []interface{}) {
 	return fmt.Sprintf(
 		"INSERT INTO %s (%s) VALUES(%s)",
@@ -66,3 +78,8 @@ func (*AccountQuery) BuildModel(accounts []*model.Account, rows *sql.Rows) []*mo
 	}
 	return accounts
 }
+
+// GetTableName is func to get account table name
+func (aq *AccountQuery) GetTableName() string {
+	return aq.TableName
+}

common/query/executor.go

@@ -10,6 +10,7 @@ type (
 	ExecutorInterface interface {
 		Execute(string) (sql.Result, error)
 		ExecuteSelect(query string, args ...interface{}) (*sql.Rows, error)
+		ExecuteSelectRow(query string, args ...interface{}) *sql.Row
 		ExecuteTransactions(queries []string) ([]sql.Result, error)
 		ExecuteStatement(query string, args ...interface{}) (sql.Result, error)
 		ExecuteTransactionStatements(queries map[*string][]interface{}) ([]sql.Result, error)
@@ -84,6 +85,15 @@ func (qe *Executor) ExecuteSelect(query string, args ...interface{}) (*sql.Rows,
 	return rows, nil
 }
 
+/*
+ExecuteSelectRow execute with select method that if you want to get `sql.Row` (single).
+This function is necessary if you want to processing the row,
+otherwise you can use `Execute` or `ExecuteTransactions`
+*/
+func (qe *Executor) ExecuteSelectRow(query string, args ...interface{}) *sql.Row {
+	return qe.Db.QueryRow(query, args...)
+}
+
 // ExecuteTransactions execute list of queries in transaction
 // will return error in case one or more of the query fail
 func (qe *Executor) ExecuteTransactions(queries []string) ([]sql.Result, error) {

common/query/executor_test.go

@@ -295,3 +295,54 @@ func TestExecutor_ExecuteTransactionStatements(t *testing.T) {
 		}
 	})
 }
+
+func TestExecutor_ExecuteSelectRow(t *testing.T) {
+	type (
+		fields struct {
+			Db *sql.DB
+		}
+		args struct {
+			query string
+			args  []interface{}
+		}
+	)
+	db, mock, err := sqlmock.New()
+	if err != nil {
+		t.Error("failed while opening database connection")
+	}
+	mock.ExpectQuery(regexp.QuoteMeta(`
+		ELECT () FROM account
+		WHERE id = ? AND name = ? limit 1
+	`)).WithArgs(1, 2).WillReturnRows(sqlmock.NewRows([]string{
+		"field",
+	}).AddRow(1))
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+	}{
+		{
+			name: "wantSuccess",
+			fields: fields{
+				Db: db,
+			},
+			args: args{
+				query: "SELECT () FROM account WHERE id = ? AND name = ? limit 1",
+				args: []interface{}{
+					1, 2,
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			qe := &Executor{
+				Db: tt.fields.Db,
+			}
+			_ = qe.ExecuteSelectRow(tt.args.query, tt.args.args...)
+			if err := mock.ExpectationsWereMet(); err != nil {
+				t.Errorf("Executor.ExecuteSelectRow() = %v", err)
+			}
+		})
+	}
+}

common/schema

@@ -0,0 +1,7 @@
+/*
+Package transaction include:
+	- Validate
+	- ApplyConfirmed
+	- ApplyUnconfirmed
+*/
+package transaction