accounts creation

api/server/interface/api/srequest/ledger.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/model"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 type LedgerAccountType string
@@ -26,21 +27,16 @@ const (
 )
 
 type CreateLedgerAccount struct {
-	AccountCode   string              `json:"accountCode"`
 	AccountType   LedgerAccountType   `json:"accountType"`
 	Currency      string              `json:"currency"`
-	Status        LedgerAccountStatus `json:"status,omitempty"`
 	AllowNegative bool                `json:"allowNegative,omitempty"`
 	IsSettlement  bool                `json:"isSettlement,omitempty"`
-	Metadata      map[string]string   `json:"metadata,omitempty"`
 	Describable   model.Describable   `json:"describable"`
-	IsOrgWallet   bool                `json:"isOrgWallet"`
+	OwnerRef      *primitive.ObjectID `json:"ownerRef,omitempty"`
+	Metadata      map[string]string   `json:"metadata,omitempty"`
 }
 
 func (r *CreateLedgerAccount) Validate() error {
-	if strings.TrimSpace(r.AccountCode) == "" {
-		return merrors.InvalidArgument("accountCode is required", "accountCode")
-	}
 	if strings.TrimSpace(r.Currency) == "" {
 		return merrors.InvalidArgument("currency is required", "currency")
 	}

api/server/interface/api/srequest/wallet.go

@@ -1,9 +1,12 @@
 package srequest
 
-import "github.com/tech/sendico/pkg/model"
+import (
+	"github.com/tech/sendico/pkg/model"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
 
 type CreateWallet struct {
 	Description model.Describable   `json:"description"`
-	IsOrgWallet bool                `json:"isOrgWallet"`
 	Asset       model.ChainAssetKey `json:"asset"`
+	OwnerRef    *primitive.ObjectID `json:"ownerRef,omitempty"`
 }

api/server/internal/server/ledgerapiimp/create.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/tech/sendico/pkg/api/http/response"
+	"github.com/tech/sendico/pkg/ledgerconv"
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/model"
 	"github.com/tech/sendico/pkg/mservice"
@@ -46,11 +47,6 @@ func (a *LedgerAPI) createAccount(r *http.Request, account *model.Account, token
 	if err != nil {
 		return response.BadPayload(a.logger, a.Name(), err)
 	}
-	status, err := mapLedgerAccountStatus(payload.Status)
-	if err != nil {
-		return response.BadPayload(a.logger, a.Name(), err)
-	}
-
 	if a.client == nil {
 		return response.Internal(a.logger, mservice.Ledger, merrors.Internal("ledger client is not configured"))
 	}
@@ -71,17 +67,16 @@ func (a *LedgerAPI) createAccount(r *http.Request, account *model.Account, token
 		}
 	}
 	var ownerRef string
-	if !payload.IsOrgWallet {
-		ownerRef = account.ID.Hex()
+	if payload.OwnerRef != nil && !payload.OwnerRef.IsZero() {
+		ownerRef = payload.OwnerRef.Hex()
 	}
 
 	resp, err := a.client.CreateAccount(ctx, &ledgerv1.CreateAccountRequest{
 		OrganizationRef: orgRef.Hex(),
 		OwnerRef:        ownerRef,
-		AccountCode:     payload.AccountCode,
 		AccountType:     accountType,
 		Currency:        payload.Currency,
-		Status:          status,
+		Status:          ledgerv1.AccountStatus_ACCOUNT_STATUS_ACTIVE,
 		AllowNegative:   payload.AllowNegative,
 		IsSettlement:    payload.IsSettlement,
 		Metadata:        payload.Metadata,
@@ -102,7 +97,6 @@ func decodeLedgerAccountCreatePayload(r *http.Request) (*srequest.CreateLedgerAc
 	if err := json.NewDecoder(r.Body).Decode(&payload); err != nil {
 		return nil, merrors.InvalidArgument("invalid payload: " + err.Error())
 	}
-	payload.AccountCode = strings.TrimSpace(payload.AccountCode)
 	payload.Currency = strings.ToUpper(strings.TrimSpace(payload.Currency))
 	payload.Describable.Name = strings.TrimSpace(payload.Describable.Name)
 	if payload.Describable.Description != nil {
@@ -123,31 +117,25 @@ func decodeLedgerAccountCreatePayload(r *http.Request) (*srequest.CreateLedgerAc
 }
 
 func mapLedgerAccountType(accountType srequest.LedgerAccountType) (ledgerv1.AccountType, error) {
-	switch strings.ToUpper(strings.TrimSpace(string(accountType))) {
-	case "ACCOUNT_TYPE_ASSET", "ASSET":
-		return ledgerv1.AccountType_ACCOUNT_TYPE_ASSET, nil
-	case "ACCOUNT_TYPE_LIABILITY", "LIABILITY":
-		return ledgerv1.AccountType_ACCOUNT_TYPE_LIABILITY, nil
-	case "ACCOUNT_TYPE_REVENUE", "REVENUE":
-		return ledgerv1.AccountType_ACCOUNT_TYPE_REVENUE, nil
-	case "ACCOUNT_TYPE_EXPENSE", "EXPENSE":
-		return ledgerv1.AccountType_ACCOUNT_TYPE_EXPENSE, nil
-	case "", "ACCOUNT_TYPE_UNSPECIFIED", "UNSPECIFIED":
+	raw := string(accountType)
+	if ledgerconv.IsAccountTypeUnspecified(raw) {
 		return ledgerv1.AccountType_ACCOUNT_TYPE_UNSPECIFIED, merrors.InvalidArgument("accountType is required", "accountType")
-	default:
+	}
+	parsed, ok := ledgerconv.ParseAccountType(raw)
+	if !ok {
 		return ledgerv1.AccountType_ACCOUNT_TYPE_UNSPECIFIED, merrors.InvalidArgument("unsupported accountType: "+string(accountType), "accountType")
 	}
+	return parsed, nil
 }
 
 func mapLedgerAccountStatus(status srequest.LedgerAccountStatus) (ledgerv1.AccountStatus, error) {
-	switch strings.ToUpper(strings.TrimSpace(string(status))) {
-	case "", "ACCOUNT_STATUS_UNSPECIFIED", "UNSPECIFIED":
+	raw := string(status)
+	if ledgerconv.IsAccountStatusUnspecified(raw) {
 		return ledgerv1.AccountStatus_ACCOUNT_STATUS_UNSPECIFIED, nil
-	case "ACCOUNT_STATUS_ACTIVE", "ACTIVE":
-		return ledgerv1.AccountStatus_ACCOUNT_STATUS_ACTIVE, nil
-	case "ACCOUNT_STATUS_FROZEN", "FROZEN":
-		return ledgerv1.AccountStatus_ACCOUNT_STATUS_FROZEN, nil
-	default:
+	}
+	parsed, ok := ledgerconv.ParseAccountStatus(raw)
+	if !ok {
 		return ledgerv1.AccountStatus_ACCOUNT_STATUS_UNSPECIFIED, merrors.InvalidArgument("unsupported status: "+string(status), "status")
 	}
+	return parsed, nil
 }

api/server/internal/server/walletapiimp/create.go

@@ -57,8 +57,8 @@ func (a *WalletAPI) create(r *http.Request, account *model.Account, token *sresp
 	}
 
 	var ownerRef string
-	if !sr.IsOrgWallet {
-		ownerRef = account.ID.Hex()
+	if sr.OwnerRef != nil && !sr.OwnerRef.IsZero() {
+		ownerRef = sr.OwnerRef.Hex()
 	}
 	passet, err := ast.Asset2Proto(&asset.Asset)
 	if err != nil {