Merge pull request #10 from brokeyourbike/missing

Implement missing API method

transactions.go

@@ -15,6 +15,7 @@ type TransactionsClient interface {
 	InitiateCHAPSTransactions(context.Context, CreateTransactionsPayload) (TransactionsCreatedResponse, error)
 	InitiateFPSPaymentOriginatedOverseas(context.Context, CreateFPSPaymentOriginatedOverseasPayload) (TransactionsCreatedResponse, error)
 	FetchTransactions(ctx context.Context, params FetchTransactionsParams) (TransactionsResponse, error)
+	FetchTransactionForAccount(ctx context.Context, accountID uuid.UUID, trxID uuid.UUID) (TransactionResponse, error)
 	FetchTransactionsForAccount(ctx context.Context, accountID uuid.UUID, params FetchTransactionsParams) (TransactionsResponse, error)
 	FetchTransactionsForVirtualAccount(ctx context.Context, accountID, virtualAccountID uuid.UUID, params FetchTransactionsParams) (TransactionsResponse, error)
 }
@@ -352,6 +353,17 @@ func (c *client) FetchTransactions(ctx context.Context, params FetchTransactions
 	return data, c.do(ctx, req)
 }
 
+func (c *client) FetchTransactionForAccount(ctx context.Context, accountID uuid.UUID, trxID uuid.UUID) (data TransactionResponse, err error) {
+	req, err := c.newRequest(ctx, http.MethodGet, fmt.Sprintf("/v2/Accounts/%s/Transactions/%s", accountID.String(), trxID.String()), nil)
+	if err != nil {
+		return data, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	req.ExpectStatus(http.StatusOK)
+	req.DecodeTo(&data)
+	return data, c.do(ctx, req)
+}
+
 func (c *client) FetchTransactionsForAccount(ctx context.Context, accountID uuid.UUID, params FetchTransactionsParams) (data TransactionsResponse, err error) {
 	req, err := c.newRequest(ctx, http.MethodGet, fmt.Sprintf("/v2/Accounts/%s/Transactions", accountID.String()), nil)
 	if err != nil {

webhook/mccy_accounts.go

@@ -36,6 +36,14 @@ type MCCYAccountCreatedPayload struct {
 	Type             string                      `json:"Type" validate:"required"`
 }
 
+// GetIdentifier returns first identifier. If no identifiers are found, an empty string is returned.
+func (w MCCYAccountCreatedPayload) GetIdentifier() string {
+	if len(w.Identifiers) > 0 {
+		return w.Identifiers[0].Identifier
+	}
+	return ""
+}
+
 // MCCYAccountUpdatedPayload
 // This webhook confirms that the multicurrency account has been updated
 type MCCYAccountUpdatedPayload struct {
@@ -56,6 +64,14 @@ type MCCYAccountUpdatedPayload struct {
 	Type              string                      `json:"Type" validate:"required"`
 }
 
+// GetIdentifier returns first identifier. If no identifiers are found, an empty string is returned.
+func (w MCCYAccountUpdatedPayload) GetIdentifier() string {
+	if len(w.Identifiers) > 0 {
+		return w.Identifiers[0].Identifier
+	}
+	return ""
+}
+
 // MCCYVirtualAccountCreatedPayload
 // This webhook confirms that the multicurrency virtual account has been created
 type MCCYVirtualAccountCreatedPayload struct {
@@ -68,6 +84,14 @@ type MCCYVirtualAccountCreatedPayload struct {
 	TimestampCreated clearbank.Time              `json:"TimestampCreated" validate:"required"`
 }
 
+// GetIdentifier returns first identifier. If no identifiers are found, an empty string is returned.
+func (w MCCYVirtualAccountCreatedPayload) GetIdentifier() string {
+	if len(w.Identifiers) > 0 {
+		return w.Identifiers[0].Identifier
+	}
+	return ""
+}
+
 // MCCYVirtualAccountUpdatedPayload
 // This webhook confirms that the multicurrency virtual account has been updated
 type MCCYVirtualAccountUpdatedPayload struct {
@@ -81,3 +105,11 @@ type MCCYVirtualAccountUpdatedPayload struct {
 	StatusReason      string                      `json:"StatusReason"`
 	StatusInformation string                      `json:"StatusInformation"`
 }
+
+// GetIdentifier returns first identifier. If no identifiers are found, an empty string is returned.
+func (w MCCYVirtualAccountUpdatedPayload) GetIdentifier() string {
+	if len(w.Identifiers) > 0 {
+		return w.Identifiers[0].Identifier
+	}
+	return ""
+}

webhook/mccy_accounts_test.go

@@ -0,0 +1,40 @@
+package webhook_test
+
+import (
+	"testing"
+
+	"github.com/brokeyourbike/clearbank-api-client-go/webhook"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMCCYAccountCreatedPayload_GetIdentifier(t *testing.T) {
+	p1 := webhook.MCCYAccountCreatedPayload{}
+	assert.Equal(t, "", p1.GetIdentifier())
+
+	p2 := webhook.MCCYAccountCreatedPayload{Identifiers: []webhook.MCCYIdentifier{{Identifier: "A"}, {Identifier: "B"}}}
+	assert.Equal(t, "A", p2.GetIdentifier())
+}
+
+func TestMCCYAccountUpdatedPayload_GetIdentifier(t *testing.T) {
+	p1 := webhook.MCCYAccountUpdatedPayload{}
+	assert.Equal(t, "", p1.GetIdentifier())
+
+	p2 := webhook.MCCYAccountUpdatedPayload{Identifiers: []webhook.MCCYIdentifier{{Identifier: "A"}, {Identifier: "B"}}}
+	assert.Equal(t, "A", p2.GetIdentifier())
+}
+
+func TestMCCYVirtualAccountCreatedPayload_GetIdentifier(t *testing.T) {
+	p1 := webhook.MCCYVirtualAccountCreatedPayload{}
+	assert.Equal(t, "", p1.GetIdentifier())
+
+	p2 := webhook.MCCYVirtualAccountCreatedPayload{Identifiers: []webhook.MCCYIdentifier{{Identifier: "A"}, {Identifier: "B"}}}
+	assert.Equal(t, "A", p2.GetIdentifier())
+}
+
+func TestMCCYVirtualAccountUpdatedPayload_GetIdentifier(t *testing.T) {
+	p1 := webhook.MCCYVirtualAccountUpdatedPayload{}
+	assert.Equal(t, "", p1.GetIdentifier())
+
+	p2 := webhook.MCCYVirtualAccountUpdatedPayload{Identifiers: []webhook.MCCYIdentifier{{Identifier: "A"}, {Identifier: "B"}}}
+	assert.Equal(t, "A", p2.GetIdentifier())
+}