fix: code dependencies, making GetTime() return time and error and isolating http logic to the client

Author: RawanMostafa08

cmd/main.go

@@ -2,10 +2,7 @@ package main
 
 import (
 	"flag"
-	"fmt"
-	"io"
 	"log"
-	"net/http"
 	"os"
 	"time"
 
@@ -16,16 +13,6 @@ const defaltBaseUrl = "http://localhost"
 const defaultEndpoint = "/datetime"
 const defaultPort = "8083"
 
-func readBody(resp *http.Response) (string, error) {
-	defer resp.Body.Close()
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", fmt.Errorf("error in reading request body: %v", err)
-
-	}
-	return string(body), nil
-}
-
 func getFlags() (string, string, string) {
 	var port string
 	flag.StringVar(&port, "port", "", "Specifies the port")
@@ -78,14 +65,10 @@ func decideConfigs() (string, string, string) {
 func main() {
 	baseUrl, endpoint, port := decideConfigs()
 
-	c := pkg.NewClient(baseUrl, endpoint, port, time.Second)
-	resp, err := c.RetrySendRequest("text/plain")
-	if err != nil {
-		log.Fatal(err)
-	}
-	body, err := readBody(resp)
+	c := pkg.NewClient(baseUrl, endpoint, port, "text/plain", time.Second)
+	timeNow, err := c.GetTime()
 	if err != nil {
 		log.Fatal(err)
 	}
-	log.Println(body)
+	log.Println(timeNow)
 }

pkg/client.go

@@ -3,6 +3,7 @@ package pkg
 
 import (
 	"fmt"
+	"io"
 	"net/http"
 	"time"
 
@@ -12,26 +13,26 @@ import (
 
 // Client holds the configurations of the http client as well as the actual http.Client object
 type Client struct {
-	baseUrl  string
-	endpoint string
-	port     string
-	client   http.Client
+	baseUrl     string
+	endpoint    string
+	port        string
+	contentType string
+	client      http.Client
 }
 
-// NewClient takes the baseUrl, endpoint, port and timeout and returns a Client object
-func NewClient(baseUrl string, endpoint string, port string, timeout time.Duration) Client {
+// NewClient takes the baseUrl, endpoint, port, content-type and timeout and returns a Client object
+func NewClient(baseUrl string, endpoint string, port string, contentType string, timeout time.Duration) Client {
 	slog.Info("New Client created! \n")
 	return Client{
-		baseUrl:  baseUrl,
-		endpoint: endpoint,
-		port:     port,
-		client:   http.Client{Timeout: timeout},
+		baseUrl:     baseUrl,
+		endpoint:    endpoint,
+		port:        port,
+		contentType: contentType,
+		client:      http.Client{Timeout: timeout},
 	}
 }
 
-// SendRequest takes the wanted content type as a string, creates the request
-// and adds the content-type header then send the request and returns the response and an error if exists
-func (c Client) SendRequest(contentType string) (*http.Response, error) {
+func (c Client) getTime() (*http.Response, error) {
 	url := c.baseUrl + ":" + c.port + c.endpoint
 
 	req, err := http.NewRequest("GET", url, nil)
@@ -40,7 +41,7 @@ func (c Client) SendRequest(contentType string) (*http.Response, error) {
 		return nil, err
 	}
 
-	req.Header.Add("content-type", contentType)
+	req.Header.Add("content-type", c.contentType)
 	resp, err := c.client.Do(req)
 
 	if err != nil {
@@ -52,27 +53,45 @@ func (c Client) SendRequest(contentType string) (*http.Response, error) {
 	return resp, nil
 }
 
-// RetrySendRequest takes the wanted content type as a string, creates and sends the request and uses the retry mechanism
+func readBody(resp *http.Response) (string, error) {
+	defer resp.Body.Close()
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", fmt.Errorf("error in reading request body: %v", err)
+
+	}
+	return string(body), nil
+}
+
+// GetTime creates and sends the request and uses the retry mechanism
 // for maximum of 10 seconds before the request fails
-// it then returns the response and an error if it failed to send for 10 seconds
-func (c Client) RetrySendRequest(contentType string) (*http.Response, error) {
+// it then returns the time and an error if it failed to send for 10 seconds
+func (c Client) GetTime() (time.Time, error) {
 	var resp *http.Response
 	var err error
 
 	expBackoff := backoff.NewExponentialBackOff()
 	expBackoff.MaxElapsedTime = 10 * time.Second
 
 	retryError := backoff.RetryNotify(func() error {
-		resp, err = c.SendRequest(contentType)
+		resp, err = c.getTime()
 		return err
 	}, expBackoff, func(err error, d time.Duration) {
 		slog.Warn("Request failed, Retrying ...")
 	})
 
 	if retryError != nil {
 		slog.Error("failed to make the request after retries: %v", err)
-		return resp, fmt.Errorf("failed to make the request after retries: %v", err)
-	} else {
-		return resp, nil
+		return time.Time{}, fmt.Errorf("failed to make the request after retries: %v", err)
 	}
+	body, err := readBody(resp)
+	if err != nil {
+		return time.Time{}, err
+	}
+	timeNow, err := time.Parse(time.ANSIC, body)
+	if err != nil {
+		return time.Time{}, err
+	}
+	return timeNow, nil
+
 }