Skip to content

660 api get multisig info #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions api/client/GetMultisigInfo/client.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package main

import (
"context"
"fmt"
"log"

"github.com/sirupsen/logrus"

"github.com/spf13/viper"
rpc_model "github.com/zoobc/zoobc-core/common/model"
rpc_service "github.com/zoobc/zoobc-core/common/service"
"github.com/zoobc/zoobc-core/common/util"
"google.golang.org/grpc"
)

func main() {
var apiRPCPort int
if err := util.LoadConfig("../../../resource", "config", "toml"); err != nil {
logrus.Fatal(err)
} else {
apiRPCPort = viper.GetInt("apiRPCPort")
if apiRPCPort == 0 {
apiRPCPort = 8080
}
}

conn, err := grpc.Dial(fmt.Sprintf(":%d", apiRPCPort), grpc.WithInsecure())
if err != nil {
log.Fatalf("did not connect: %s", err)
}
defer conn.Close()

c := rpc_service.NewMultisigServiceClient(conn)

response, err := c.GetMultisignatureInfo(context.Background(),
&rpc_model.GetMultisignatureInfoRequest{
MultisigAddress: "",
Pagination: &rpc_model.Pagination{
OrderField: "block_height",
OrderBy: rpc_model.OrderBy_DESC,
Page: 1,
Limit: 2,
},
},
)

if err != nil {
log.Fatalf("error calling remote.GetMultisigInfo: %s", err)
}

log.Printf("response from remote.GetMultisigInfo(): %v", response)

}
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ func main() {

c := rpc_service.NewMultisigServiceClient(conn)

response, err := c.GetPendingTransactionByAddress(context.Background(),
&rpc_model.GetPendingTransactionByAddressRequest{
response, err := c.GetPendingTransactions(context.Background(),
&rpc_model.GetPendingTransactionsRequest{
SenderAddress: "E6u7lDnLgyiPuklLd6rXNQJI3_kGA1Q7e1BEXdJVB1hy",
Status: rpc_model.PendingTransactionStatus_PendingTransactionPending,
Pagination: &rpc_model.Pagination{
Expand Down
29 changes: 22 additions & 7 deletions api/handler/multisigHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,18 @@ type (
}
)

func (msh *MultisigHandler) GetPendingTransactionByAddress(
func (msh *MultisigHandler) GetPendingTransactions(
ctx context.Context,
req *model.GetPendingTransactionByAddressRequest,
) (*model.GetPendingTransactionByAddressResponse, error) {
if req.GetSenderAddress() == "" {
return nil, status.Error(codes.InvalidArgument, "SenderAddressNotProvided")
}
req *model.GetPendingTransactionsRequest,
) (*model.GetPendingTransactionsResponse, error) {
if req.GetPagination().GetPage() < 1 {
return nil, status.Error(codes.InvalidArgument, "PageCannotBeLessThanOne")
}
if req.GetPagination().GetOrderField() == "" {
req.Pagination.OrderField = "block_height"
req.Pagination.OrderBy = model.OrderBy_DESC
}
result, err := msh.MultisigService.GetPendingTransactionByAddress(req)
result, err := msh.MultisigService.GetPendingTransactions(req)
return result, err
}

Expand All @@ -42,3 +39,21 @@ func (msh *MultisigHandler) GetPendingTransactionDetailByTransactionHash(
result, err := msh.MultisigService.GetPendingTransactionDetailByTransactionHash(req)
return result, err
}

func (msh *MultisigHandler) GetMultisignatureInfo(
ctx context.Context,
req *model.GetMultisignatureInfoRequest,
) (*model.GetMultisignatureInfoResponse, error) {
if req.GetPagination().GetPage() < 1 {
return nil, status.Error(codes.InvalidArgument, "PageCannotBeLessThanOne")
}
if req.GetPagination().GetOrderField() == "" {
req.Pagination.OrderField = "block_height"
req.Pagination.OrderBy = model.OrderBy_DESC
}
if req.GetPagination().GetPage() > 30 {
return nil, status.Error(codes.InvalidArgument, "LimitCannotBeMoreThan30")
}
result, err := msh.MultisigService.GetMultisignatureInfo(req)
return result, err
}
74 changes: 66 additions & 8 deletions api/service/multisigService.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ import (

type (
MultisigServiceInterface interface {
GetPendingTransactionByAddress(
param *model.GetPendingTransactionByAddressRequest,
) (*model.GetPendingTransactionByAddressResponse, error)
GetPendingTransactions(
param *model.GetPendingTransactionsRequest,
) (*model.GetPendingTransactionsResponse, error)
GetPendingTransactionDetailByTransactionHash(
param *model.GetPendingTransactionDetailByTransactionHashRequest,
) (*model.GetPendingTransactionDetailByTransactionHashResponse, error)
GetMultisignatureInfo(
param *model.GetMultisignatureInfoRequest,
) (*model.GetMultisignatureInfoResponse, error)
}

MultisigService struct {
Expand Down Expand Up @@ -51,9 +54,9 @@ func NewMultisigService(
}
}

func (ms *MultisigService) GetPendingTransactionByAddress(
param *model.GetPendingTransactionByAddressRequest,
) (*model.GetPendingTransactionByAddressResponse, error) {
func (ms *MultisigService) GetPendingTransactions(
param *model.GetPendingTransactionsRequest,
) (*model.GetPendingTransactionsResponse, error) {
var (
totalRecords uint32
result []*model.PendingTransaction
Expand All @@ -64,7 +67,9 @@ func (ms *MultisigService) GetPendingTransactionByAddress(
args []interface{}
)
caseQuery.Select(musigQuery.TableName, musigQuery.Fields...)
caseQuery.Where(caseQuery.Equal("sender_address", param.GetSenderAddress()))
if param.GetSenderAddress() != "" {
caseQuery.Where(caseQuery.Equal("sender_address", param.GetSenderAddress()))
}
caseQuery.Where(caseQuery.Equal("status", param.GetStatus()))
caseQuery.Where(caseQuery.Equal("latest", true))

Expand Down Expand Up @@ -97,7 +102,7 @@ func (ms *MultisigService) GetPendingTransactionByAddress(
if err != nil {
return nil, err
}
return &model.GetPendingTransactionByAddressResponse{
return &model.GetPendingTransactionsResponse{
Count: totalRecords,
Page: param.GetPagination().GetPage(),
PendingTransactions: result,
Expand Down Expand Up @@ -189,3 +194,56 @@ func (ms *MultisigService) GetPendingTransactionDetailByTransactionHash(
MultiSignatureInfo: multisigInfo,
}, nil
}

func (ms *MultisigService) GetMultisignatureInfo(
param *model.GetMultisignatureInfoRequest,
) (*model.GetMultisignatureInfoResponse, error) {
var (
result []*model.MultiSignatureInfo
caseQuery = query.NewCaseQuery()
multisigInfoQuery = query.NewMultisignatureInfoQuery()
selectQuery string
args []interface{}
totalRecords uint32
err error
)
caseQuery.Select(multisigInfoQuery.TableName, multisigInfoQuery.Fields...)
if param.GetMultisigAddress() != "" {
caseQuery.Where(caseQuery.Equal("multisig_address", param.GetMultisigAddress()))
}
caseQuery.Where(caseQuery.Equal("latest", true))
selectQuery, args = caseQuery.Build()

countQuery := query.GetTotalRecordOfSelect(selectQuery)

countRow, _ := ms.Executor.ExecuteSelectRow(countQuery, false, args...)
err = countRow.Scan(
&totalRecords,
)
if err != nil {
if err == sql.ErrNoRows {
return nil, status.Error(codes.NotFound, "FailToGetTotalItemInMultisigInfo")
}
return nil, status.Error(codes.Internal, err.Error())
}
caseQuery.OrderBy(param.GetPagination().GetOrderField(), param.GetPagination().GetOrderBy())
caseQuery.Paginate(
param.GetPagination().GetLimit(),
param.GetPagination().GetPage(),
)
selectQuery, args = caseQuery.Build()
multisigInfoRows, err := ms.Executor.ExecuteSelect(selectQuery, false, args...)
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}
defer multisigInfoRows.Close()
result, err = ms.MultisignatureInfoQuery.BuildModel(result, multisigInfoRows)
if err != nil {
return nil, err
}
return &model.GetMultisignatureInfoResponse{
Count: totalRecords,
Page: param.GetPagination().GetPage(),
MultisignatureInfo: result,
}, err
}
Loading