Refactor CodeBase To Cater For Airtime Module

Move airtime related operations to a specified module
Update Circle CI test command to cater for tests in subfolders
Fix imports broken due to refactoring

.circleci/config.yml

@@ -18,7 +18,7 @@ jobs:
             - "/go/pkg/mod"
       - run:
           name: Run tests
-          command: go test -race -coverprofile=coverage.txt -covermode=atomic
+          command: go test ./... -race -coverprofile=coverage.txt -covermode=atomic
       - run:
           name: Upload Coverage
           when: on_success

README.md

@@ -3,8 +3,6 @@
 # Reloadly SDK for Golang
 
 [![CircleCI][circle-ci-badge]][circle-ci-url] [![MIT][mit-badge]][mit-url] [![codecov][codecov-badge]][codecov-url]
-<!--[![Maven][maven-badge]][maven-url]-->    
-
 The **Reloadly SDK for Golang** enables Go developers to easily work with [Reloadly Services][reloadly-main-site] and build scalable solutions. You can get started in minutes if you have Go 1.15+ installed on your machine.
 
 * [SDK Homepage][sdk-website] (Coming soon)
@@ -118,9 +116,9 @@ This project is licensed under the MIT license. See the [LICENSE](LICENSE) file
 
 [circle-ci-url]: https://app.circleci.com/pipelines/github/Reloadly/reloadly-sdk-golang
 
-[codecov-badge]: https://codecov.io/gh/reloadly/reloadly-sdk-java/branch/main/graph/badge.svg?token=8U89VKQ2BF
+[codecov-badge]: https://codecov.io/gh/Reloadly/reloadly-sdk-golang/branch/main/graph/badge.svg?token=SUV66Q3J2Y
 
-[codecov-url]: https://app.codecov.io/gh/reloadly/reloadly-sdk-java
+[codecov-url]: https://codecov.io/gh/Reloadly/reloadly-sdk-golang
 
 [youtube-series]: https://www.youtube.com/watch?v=TbXC4Ic8x30&t=141s&ab_channel=Reloadly
 

accounts.go → airtime/accounts.go

@@ -1,4 +1,4 @@
-package reloadly
+package airtime
 
 import (
 	"encoding/json"

accounts_test.go → airtime/accounts_test.go

@@ -1,8 +1,8 @@
-package reloadly_test
+package airtime_test
 
 import (
 	"encoding/json"
-	"github.com/reloadly/reloadly-sdk-golang"
+	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
 	"net/http"
 	"testing"
 )

countries.go → airtime/countries.go

@@ -1,4 +1,4 @@
-package reloadly
+package airtime
 
 import (
 	"encoding/json"

airtime/countries_test.go

@@ -0,0 +1,26 @@
+package airtime_test
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestClient_GetCountries(t *testing.T) {
+		teardown := setup()
+
+		defer teardown()
+
+		mux.HandleFunc("/countries", func(rw http.ResponseWriter, req *http.Request) {
+			rw.WriteHeader(http.StatusInternalServerError)
+		})
+
+		body, err := client.GetCountries()
+
+		if err == nil {
+			t.Errorf("Expected error to be %q but got nil",  err)
+		}
+
+		if body != nil {
+			t.Errorf("Expected body to be nil but got %q",  body)
+		}
+}

discounts.go → airtime/discounts.go

@@ -1,4 +1,4 @@
-package reloadly
+package airtime
 
 import (
 	"encoding/json"

airtime/discounts_test.go

@@ -0,0 +1,37 @@
+package airtime_test
+
+import (
+	"encoding/json"
+	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
+	"net/http"
+	"testing"
+)
+
+func TestClient_GetDiscounts(t *testing.T) {
+	teardown := setup()
+
+	defer teardown()
+
+	mux.HandleFunc("/operators/commissions", func(rw http.ResponseWriter, req *http.Request) {
+		rw.WriteHeader(http.StatusOK)
+		data := reloadly.Discounts{
+			TotalElements: 20,
+			TotalPages:    5,
+		}
+		json.NewEncoder(rw).Encode(data)
+
+	})
+
+	body, err := client.GetDiscounts()
+	if err != nil {
+		t.Errorf("Expected error to be nil but got %q",  err)
+	}
+
+	if body.TotalPages != 5 {
+		t.Errorf("Expected TotalPages to be 5 but got %v",  body.TotalPages)
+	}
+
+	if body.TotalElements != 20 {
+		t.Errorf("Expected TotalElements to be 20 but got %v",  body.TotalElements)
+	}
+}

operators.go → airtime/operators.go

@@ -1,4 +1,4 @@
-package reloadly
+package airtime
 
 import (
 	"bytes"

operators_test.go → airtime/operators_test.go

@@ -1,8 +1,8 @@
-package reloadly_test
+package airtime_test
 
 import (
 	"encoding/json"
-	"github.com/reloadly/reloadly-sdk-golang"
+	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
 	"net/http"
 	"testing"
 )
@@ -55,4 +55,30 @@ func TestClient_GetFXRate(t *testing.T) {
 	if body.FxRate != 65 {
 		t.Errorf("Expected OperatorID to be 65 but got %v",  body.FxRate)
 	}
+}
+
+func TestClient_GetOperatorsByISO(t *testing.T) {
+	teardown := setup()
+
+	defer teardown()
+
+	mux.HandleFunc("/", func(rw http.ResponseWriter, req *http.Request) {
+		rw.WriteHeader(http.StatusOK)
+		data := reloadly.Operators{
+			TotalPages:    5,
+			Size: 20,
+		}
+
+		json.NewEncoder(rw).Encode(data)
+
+	})
+
+	body, err := client.GetOperatorsByISO("011")
+	if err != nil {
+		t.Errorf("Expected error to be nil but got %q",  err)
+	}
+
+	if body.Size != 20 {
+		t.Errorf("Expected Size to be 20 but got %v",  body.Size)
+	}
 }

promotions.go → airtime/promotions.go

@@ -1,4 +1,4 @@
-package reloadly
+package airtime
 
 import (
 	"encoding/json"

promotions_test.go → airtime/promotions_test.go

@@ -1,8 +1,8 @@
-package reloadly_test
+package airtime_test
 
 import (
 	"encoding/json"
-	"github.com/reloadly/reloadly-sdk-golang"
+	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
 	"net/http"
 	"testing"
 )

reloadly.go → airtime/reloadly.go

@@ -1,4 +1,4 @@
-package reloadly
+package airtime
 
 import (
 	"encoding/base64"

reports.go → airtime/reports.go

@@ -1,4 +1,4 @@
-package reloadly
+package airtime
 
 import (
 	"encoding/json"

reports_test.go → airtime/reports_test.go

@@ -1,8 +1,8 @@
-package reloadly_test
+package airtime_test
 
 import (
 	"encoding/json"
-	"github.com/reloadly/reloadly-sdk-golang"
+	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
 	"net/http"
 	"testing"
 )

topup.go → airtime/topup.go

@@ -1,4 +1,4 @@
-package reloadly
+package airtime
 
 import (
 	"encoding/json"

topup_test.go → airtime/topup_test.go

@@ -1,8 +1,8 @@
-package reloadly_test
+package airtime_test
 
 import (
 	"encoding/json"
-	"github.com/reloadly/reloadly-sdk-golang"
+	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
 	Err "github.com/reloadly/reloadly-sdk-golang/error"
 	"net/http"
 	"net/http/httptest"

usage/Accounts-Operations.MD → airtime/usage/Accounts-Operations.MD

@@ -9,7 +9,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/Reloadly/reloadly"
+	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
 )
 
 func main (){

usage/Country-Operations.MD → airtime/usage/Country-Operations.MD

@@ -12,7 +12,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/Reloadly/reloadly"
+	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
 )
 
 func main (){

usage/Operator-Operations.MD → airtime/usage/Operator-Operations.MD

@@ -19,7 +19,7 @@ currency**.
 
     import (
         "fmt"
-        "github.com/Ghvstcode/reloadly"
+		reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
     )
 
     func main (){

usage/Promotion-Operations.MD → airtime/usage/Promotion-Operations.MD

@@ -11,7 +11,7 @@ on the different operators promotions and to showcase these to your customers.
 
     import (
         "fmt"
-        "github.com/Ghvstcode/reloadly"
+		reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
     )
 
     func main (){

usage/Report-Operations.MD → airtime/usage/Report-Operations.MD

@@ -9,7 +9,7 @@ Retrieve various reports such as transaction history etc...
 
     import (
         "fmt"
-        "github.com/Ghvstcode/reloadly"
+		reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
     )
 
     func main (){

usage/Topup-Operations.MD → airtime/usage/Topup-Operations.MD

@@ -10,7 +10,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/Ghvstcode/reloadly"
+	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
 )
 
 func main (){

authentication/auth_test.go

@@ -41,7 +41,7 @@ func TestNewAuthClient(t *testing.T) {
 		if res != nil{
 			t.Skip("Skipped the rest of the tests")
 			if c.ExpectedSandbox != res.SandBox{
-				t.Fatalf("Expected Sandbox to be %s but got %s", c.ExpectedSandbox, res.URL)
+				t.Fatalf("Expected Sandbox to be %t but got %s", c.ExpectedSandbox, res.URL)
 			}
 
 		}