From 57ce6b3c426d7deef64a9df5731aa3e22de334d8 Mon Sep 17 00:00:00 2001 From: thisisommore Date: Fri, 24 Nov 2023 14:40:21 +0000 Subject: [PATCH] delegate review: take site ipfs from request --- api/v1/delegateReviewCreation/delegateReviewCreation.go | 7 +++---- api/v1/delegateReviewCreation/types.go | 1 + util/pkg/aptos/smartcontract.go | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/api/v1/delegateReviewCreation/delegateReviewCreation.go b/api/v1/delegateReviewCreation/delegateReviewCreation.go index 4c2736e1..941505e5 100644 --- a/api/v1/delegateReviewCreation/delegateReviewCreation.go +++ b/api/v1/delegateReviewCreation/delegateReviewCreation.go @@ -6,7 +6,6 @@ import ( "net/http" "github.com/NetSepio/gateway/api/middleware/auth/paseto" - "github.com/NetSepio/gateway/app/routines/webreview" "github.com/NetSepio/gateway/config/dbconfig" "github.com/NetSepio/gateway/models" "github.com/NetSepio/gateway/util/pkg/aptos" @@ -35,7 +34,7 @@ func deletegateReviewCreation(c *gin.Context) { } walletAddr := c.GetString(paseto.CTX_WALLET_ADDRES) - txResult, err := aptos.DelegateReview(aptos.DelegateReviewParams{Voter: walletAddr, MetaDataUri: request.MetaDataUri, Category: request.Category, DomainAddress: request.DomainAddress, SiteUrl: request.SiteUrl, SiteType: request.SiteType, SiteTag: request.SiteTag, SiteSafety: request.SiteSafety}) + txResult, err := aptos.DelegateReview(aptos.DelegateReviewParams{Voter: walletAddr, MetaDataUri: request.MetaDataUri, Category: request.Category, DomainAddress: request.DomainAddress, SiteUrl: request.SiteUrl, SiteType: request.SiteType, SiteTag: request.SiteTag, SiteSafety: request.SiteSafety, SiteIpfsHash: request.SiteIpfsHash}) if err != nil { if errors.Is(err, aptos.ErrMetadataDuplicated) { httpo.NewErrorResponse(http.StatusConflict, "Metadata already exist").SendD(c) @@ -59,11 +58,11 @@ func deletegateReviewCreation(c *gin.Context) { SiteType: request.SiteType, SiteTag: request.SiteTag, SiteSafety: request.SiteSafety, - SiteIpfsHash: "", + SiteIpfsHash: request.SiteIpfsHash, TransactionHash: txResult.Result.TransactionHash, TransactionVersion: txResult.Result.Version, } - go webreview.Publish(request.MetaDataUri, request.SiteUrl) + if err := db.Create(newReview).Error; err != nil { httpo.NewSuccessResponseP(httpo.TXDbFailed, "transaction is successful but failed to store tx in db", payload).Send(c, 200) return diff --git a/api/v1/delegateReviewCreation/types.go b/api/v1/delegateReviewCreation/types.go index a05c1507..fa2bf34a 100644 --- a/api/v1/delegateReviewCreation/types.go +++ b/api/v1/delegateReviewCreation/types.go @@ -8,6 +8,7 @@ type DelegateReviewCreationRequest struct { SiteType string `json:"siteType" binding:"required"` SiteTag string `json:"siteTag" binding:"required"` SiteSafety string `json:"siteSafety" binding:"required"` + SiteIpfsHash string `json:"siteIpfsHash" binding:"required"` } type DelegateReviewCreationPayload struct { diff --git a/util/pkg/aptos/smartcontract.go b/util/pkg/aptos/smartcontract.go index 3e6b1665..f45fc2cf 100644 --- a/util/pkg/aptos/smartcontract.go +++ b/util/pkg/aptos/smartcontract.go @@ -26,6 +26,7 @@ type DelegateReviewParams struct { SiteType string SiteTag string SiteSafety string + SiteIpfsHash string } var ErrMetadataDuplicated = errors.New("metadata already exist") @@ -33,7 +34,7 @@ var ErrMetadataDuplicated = errors.New("metadata already exist") func DelegateReview(p DelegateReviewParams) (*TxResult, error) { command := fmt.Sprintf("move run --function-id %s::netsepio::delegate_submit_review --max-gas %d --gas-unit-price %d --args", envconfig.EnvVars.FUNCTION_ID, envconfig.EnvVars.GAS_UNITS, envconfig.EnvVars.GAS_PRICE) args := append(strings.Split(command, " "), - argA(p.Voter), argS(p.MetaDataUri), argS(p.Category), argS(p.DomainAddress), argS(p.SiteUrl), argS(p.SiteType), argS(p.SiteTag), argS(p.SiteSafety), argS("")) + argA(p.Voter), argS(p.MetaDataUri), argS(p.Category), argS(p.DomainAddress), argS(p.SiteUrl), argS(p.SiteType), argS(p.SiteTag), argS(p.SiteSafety), argS(p.SiteIpfsHash)) cmd := exec.Command("aptos", args...) fmt.Println(strings.Join(args, " "))