Implement depot resource functions

Author: jsattler

README.md

@@ -10,33 +10,32 @@ the [comdirect REST API](https://www.comdirect.de/cms/kontakt-zugaenge-api.html)
 
 Documentation
 ---
-You can find more detailed documentation
-* on the [website](https://jsattler.github.io/comdirect-golang/#/)
+You can find detailed documentation
+* on this [website](https://jsattler.github.io/comdirect-golang/#/)
 * in the [`docs/`](docs/getting-started.md) folder
-* or in the [`examples/`](examples) older
+* in the [`examples/`](examples) folder
+* or in the tests [`pkg/comdirect`](pkg/comdirect)
 
 Roadmap / To-Do
 ---
-> Bold items have priority
 
-**Functional**
-* [x] **Auth**
-    * [x] P_TAN_PUSH
-    * [ ] P_TAN_PHOTO (currently out of scope, since the package is not intended for use in front end apps)
-    * [ ] P_TAN_APP (currently out of scope, since I have no chance to test this)
-* [x] Refresh Token Flow
-* [x] Revoke Token
-* [x] **Account**
-    * [x] All Balances
-    * [x] Balance by Account ID
-    * [x] Transactions
-* [ ] **Depot**
-    * [ ] All Depots
-    * [ ] Positions by Depot ID
-    * [ ] Position by Depot ID and Position ID
-    * [ ] Transactions by Depot ID
-* [ ] **Instrument**
-* [ ] **Order**
+* [x] Auth
+  * [x] P_TAN_PUSH
+  * [ ] P_TAN_PHOTO (currently out of scope, since the package is not intended for use in front end apps)
+  * [ ] P_TAN_APP (currently out of scope, since I have no chance to test this)
+  * [x] Refresh Token
+  * [x] Revoke Token
+* [x] Account
+  * [x] All Balances
+  * [x] Balance by Account ID
+  * [x] Transactions
+* [x] Depot
+  * [x] All Depots
+  * [x] Positions by Depot ID
+  * [x] Position by Depot ID and Position ID
+  * [x] Transactions by Depot ID
+* [ ] Instrument
+* [ ] Order
 * [ ] Quote
-* [ ] **Documents**
+* [ ] Documents
 * [ ] Reports

pkg/comdirect/account.go

@@ -72,7 +72,7 @@ type Creditor struct {
 }
 
 func (c *Client) Balances() ([]AccountBalance, error) {
-	if c.authentication.accessToken == nil || c.authentication.IsExpired() {
+	if c.authentication.accessToken.AccessToken == "" || c.authentication.IsExpired() {
 		return nil, errors.New("authentication is expired or not initialized")
 	}
 	info, err := requestInfoJSON(c.authentication.sessionID)
@@ -97,7 +97,7 @@ func (c *Client) Balances() ([]AccountBalance, error) {
 }
 
 func (c *Client) Balance(accountId string) (*AccountBalance, error) {
-	if c.authentication.accessToken == nil || c.authentication.IsExpired() {
+	if c.authentication.accessToken.AccessToken == "" || c.authentication.IsExpired() {
 		return nil, errors.New("authentication is expired or not initialized")
 	}
 
@@ -123,7 +123,7 @@ func (c *Client) Balance(accountId string) (*AccountBalance, error) {
 }
 
 func (c *Client) Transactions(accountId string) ([]Transaction, error) {
-	if c.authentication.accessToken == nil || c.authentication.IsExpired() {
+	if c.authentication.accessToken.AccessToken == "" || c.authentication.IsExpired() {
 		return nil, errors.New("authentication is expired or not initialized")
 	}
 	info, err := requestInfoJSON(c.authentication.sessionID)

pkg/comdirect/account_test.go

@@ -0,0 +1,68 @@
+package comdirect
+
+import (
+	"fmt"
+	"os"
+	"testing"
+)
+
+func TestClient_Balances(t *testing.T) {
+	client := clientFromEnv()
+	auth, err := client.Authenticate()
+	if err != nil {
+		t.Errorf("failed to authenticate: %s", err)
+	}
+	fmt.Printf("%+v\n", auth)
+	balances, err := client.Balances()
+	if err != nil {
+		t.Errorf("failed to exchange account balances %s", err)
+	}
+
+	fmt.Printf("%+v\n", balances)
+
+	auth, err = client.Refresh()
+	if err != nil {
+		return
+	}
+	fmt.Printf("%+v\n", auth)
+
+	err = client.Revoke()
+	if err != nil {
+		return
+	}
+	fmt.Println("successfully revoked access token")
+}
+
+func TestClient_Balance(t *testing.T) {
+	client := clientFromEnv()
+	_, err := client.Balance(os.Getenv("COMDIRECT_ACCOUNT_ID"))
+
+	if err != nil {
+		t.Errorf("failed to exchange account balance %s", err)
+		return
+	}
+}
+
+func TestClient_Transactions(t *testing.T) {
+	client := clientFromEnv()
+	transactions, err := client.Transactions(os.Getenv("COMDIRECT_ACCOUNT_ID"))
+
+	if err != nil {
+		t.Errorf("failed to exchange account balance %s", err)
+		return
+	}
+
+	for _, t := range transactions {
+		fmt.Printf("%v\n", t)
+	}
+}
+
+func clientFromEnv() *Client {
+	options := &AuthOptions{
+		Username:     os.Getenv("COMDIRECT_USERNAME"),
+		Password:     os.Getenv("COMDIRECT_PASSWORD"),
+		ClientId:     os.Getenv("COMDIRECT_CLIENT_ID"),
+		ClientSecret: os.Getenv("COMDIRECT_CLIENT_SECRET"),
+	}
+	return NewWithAuthOptions(options)
+}

pkg/comdirect/auth.go

@@ -35,7 +35,7 @@ type authState struct {
 
 // Authentication represents an authentication object for the comdirect REST API.
 type Authentication struct {
-	accessToken *AccessToken
+	accessToken AccessToken
 	sessionID   string
 	time        time.Time
 }
@@ -144,7 +144,7 @@ func (a *Authenticator) Authenticate() (*Authentication, error) {
 	}
 
 	return &Authentication{
-		accessToken: &state.accessToken,
+		accessToken: state.accessToken,
 		sessionID:   state.requestInfo.ClientRequestID.SessionID,
 		time:        time.Now(),
 	}, err
@@ -172,7 +172,7 @@ func (a *Authenticator) Refresh(auth Authentication) (Authentication, error) {
 	var accessToken AccessToken
 	_, err := a.http.exchange(req, &accessToken)
 
-	auth.accessToken = &accessToken
+	auth.accessToken = accessToken
 	auth.time = time.Now()
 	return auth, err
 }

pkg/comdirect/client_test.go

@@ -1,72 +1,23 @@
 package comdirect
 
-import (
-	"fmt"
-	"os"
-	"testing"
-)
+import "testing"
 
-func TestClient_AccountBalances(t *testing.T) {
-	client := getClientFromEnv()
-	auth, err := client.Authenticate()
-	if err != nil {
-		t.Errorf("failed to authenticate: %s", err)
-	}
-	fmt.Printf("%+v\n", auth)
-	balances, err := client.Balances()
-	if err != nil {
-		t.Errorf("failed to exchange account balances %s", err)
-	}
-
-	fmt.Printf("%+v\n", balances)
-
-	auth, err = client.Refresh()
-	if err != nil {
-		return
-	}
-	fmt.Printf("%+v\n", auth)
-
-	err = client.Revoke()
-	if err != nil {
-		return
-	}
-	fmt.Println("successfully revoked access token")
+func TestNewWithAuthenticator(t *testing.T) {
+	// TODO
 }
 
-func TestClient_Balance(t *testing.T) {
-	client := getClientFromEnv()
-	accountId := os.Getenv("COMDIRECT_ACCOUNT_ID")
-	_, err := client.Balance(accountId)
-
-	if err != nil {
-		t.Errorf("failed to exchange account balance %s", err)
-		return
-	}
+func TestNewWithAuthOptions(t *testing.T) {
+	// TODO
 }
 
-func TestClient_Transactions(t *testing.T) {
-	client := getClientFromEnv()
-	accountId := os.Getenv("COMDIRECT_ACCOUNT_ID")
-	transactions, err := client.Transactions(accountId)
-
-	if err != nil {
-		t.Errorf("failed to exchange account balance %s", err)
-		return
-	}
-
-	for _, t := range transactions {
-		fmt.Printf("%v\n", t)
-	}
+func TestClient_Authenticate(t *testing.T) {
+	// TODO
 }
 
-func getClientFromEnv() *Client {
-
-	options := &AuthOptions{
-		Username:     os.Getenv("COMDIRECT_USERNAME"),
-		Password:     os.Getenv("COMDIRECT_PASSWORD"),
-		ClientId:     os.Getenv("COMDIRECT_CLIENT_ID"),
-		ClientSecret: os.Getenv("COMDIRECT_CLIENT_SECRET"),
-	}
+func TestClient_Refresh(t *testing.T) {
+	// TODO
+}
 
-	return NewWithAuthOptions(options)
+func TestClient_Revoke(t *testing.T) {
+	// TODO
 }