less allocation for response

Author: yahya077

elevator/elevator.go

@@ -36,7 +36,6 @@ type IElevatorEngine interface {
 	WarmUp() IElevatorEngine
 	PutBodyParser(roomKey, requestKey string, bodyParser room.IBodyParser) IElevatorEngine
 	PutQuery(roomKey, requestKey string, authStrategy room.IQuery) IElevatorEngine
-	PutDTO(roomKey, requestKey string, dto any) IElevatorEngine
 	GetElapsedTime() float64
 }
 
@@ -61,7 +60,6 @@ func NewElevatorEngine(elevator Elevator) IElevatorEngine {
 	}
 }
 
-// TODO add safety check
 func (e *ElevatorEngine) Execute(roomKey, requestKey string) (room.Response, error) {
 	if roomContainerEntry, ok := e.RoomContainers[roomKey]; ok {
 		if requestEntry, ok := roomContainerEntry.Requests[requestKey]; ok {
@@ -165,10 +163,6 @@ func (e *ElevatorEngine) CreateRequest(req Request) *room.Request {
 		room.WithBody(parser),
 	}
 
-	if req.ForceDTO {
-		optionRequests = append(optionRequests, room.ForceDTO())
-	}
-
 	r := room.NewRequest(
 		req.Path,
 		optionRequests...,
@@ -201,18 +195,6 @@ func (e *ElevatorEngine) PutQuery(roomKey, requestKey string, query room.IQuery)
 	panic(fmt.Sprintf("engine for %s not configured", roomKey))
 }
 
-func (e *ElevatorEngine) PutDTO(roomKey, requestKey string, dto any) IElevatorEngine {
-	if roomContainerEntry, ok := e.RoomContainers[roomKey]; ok {
-		if requestEntry, ok := roomContainerEntry.Requests[requestKey]; ok {
-			requestEntry.DTO = dto
-			return e
-		}
-		panic(fmt.Sprintf("engine for %s on %s not configured", roomKey, requestKey))
-	}
-
-	panic(fmt.Sprintf("engine for %s not configured", roomKey))
-}
-
 func NewElevator(integrationYmlPath string) Elevator {
 	ymlFile, err := readYml(integrationYmlPath)
 
@@ -292,7 +274,6 @@ type Request struct {
 	ConcurrentKey string `yaml:"concurrentKey"`
 	Method        string `yaml:"method"`
 	Path          string `yaml:"path"`
-	ForceDTO      bool   `yaml:"forceDTO"`
 	Body          Body   `yaml:"body"`
 }
 

examples/solo_request/main.go

@@ -6,9 +6,9 @@ import (
 )
 
 func main() {
-	response, err := room.NewRequest("https://jsonplaceholder.typicode.com/posts/1", room.ForceDTO()).Send()
+	response, err := room.NewRequest("https://jsonplaceholder.typicode.com/posts/1").Send()
 
 	fmt.Println(err)
 
-	fmt.Println("Response:", response.DTO)
+	fmt.Println("Response:", response.ResponseBody())
 }

examples/yml_concurrent_example/integration.yml

@@ -12,7 +12,6 @@ flat:
           concurrentKey: "add"
           method: "POST"
           path: "todos/add"
-          forceDTO: true
     todo1Room:
       connection:
         baseUrl: ${BASE_URL}
@@ -25,7 +24,6 @@ flat:
           concurrentKey: "add"
           method: "POST"
           path: "todos/add?delay=3000"
-          forceDTO: true
     todo2Room:
       connection:
         baseUrl: ${BASE_URL}
@@ -38,4 +36,3 @@ flat:
           concurrentKey: "add"
           method: "POST"
           path: "todos/add"
-          forceDTO: true

examples/yml_example/integration.yml

@@ -12,7 +12,6 @@ flat:
           request:
             method: "POST"
             path: "auth/login"
-            forceDTO: true
             body:
               type: "json"
               content:
@@ -24,4 +23,3 @@ flat:
           concurrentKey: "add"
           method: "POST"
           path: "todos/add"
-          forceDTO: true

examples/yml_example/main.go

@@ -18,6 +18,13 @@ var payload = AddTODORequest{
 	UserId:    1,
 }
 
+type ResponseSchema struct {
+	Completed bool   `json:"completed"`
+	Id        int    `json:"id"`
+	Todo      string `json:"todo"`
+	UserId    int    `json:"userId"`
+}
+
 func main() {
 	el := elevator.NewElevator("examples/yml_example/integration.yml")
 	engine := elevator.NewElevatorEngine(el).WarmUp()
@@ -27,6 +34,7 @@ func main() {
 		Execute("todoRoom", "addTodo")
 
 	fmt.Println(err)
+
 	fmt.Println("Response OK: ", response.OK())
-	fmt.Println("Response DTO: ", response.DTO)
+	fmt.Println("Response DTO: ", response.DTO(&ResponseSchema{}))
 }

request.go

@@ -26,9 +26,6 @@ type Request struct {
 	Query          IQuery
 	BodyParser     IBodyParser
 	contextBuilder IContextBuilder
-	DTO            any
-	// ForceDTO is a flag to force the parse http response to DTO which is map[string]any
-	ForceDTO bool
 }
 
 // NewRequest creates a new request
@@ -51,10 +48,6 @@ func NewRequest(path string, opts ...OptionRequest) *Request {
 		r.method = GET
 	}
 
-	if r.ForceDTO && r.DTO == nil {
-		r.DTO = make(map[string]any)
-	}
-
 	return r
 }
 
@@ -67,7 +60,7 @@ func (r *Request) Send() (Response, error) {
 		return Response{}, e
 	}
 
-	return NewResponse(response, r.DTO)
+	return NewResponse(response)
 }
 
 func (r *Request) request() *http.Request {
@@ -148,18 +141,6 @@ func WithHeader(header IHeader) OptionRequest {
 	}
 }
 
-func WithDTO(dto any) OptionRequest {
-	return func(request *Request) {
-		request.DTO = dto
-	}
-}
-
-func ForceDTO() OptionRequest {
-	return func(request *Request) {
-		request.ForceDTO = true
-	}
-}
-
 func WithContextBuilder(contextBuilder IContextBuilder) OptionRequest {
 	return func(request *Request) {
 		request.contextBuilder = contextBuilder

response.go

@@ -3,6 +3,7 @@ package room
 import (
 	"encoding/json"
 	"encoding/xml"
+	"errors"
 	"github.com/WEG-Technology/room/store"
 	"io"
 	"net/http"
@@ -16,29 +17,24 @@ type Response struct {
 	Header        IHeader
 	RequestHeader IHeader
 	RequestBody   map[string]any
-	DTO           any
 	Data          []byte
 }
 
-func NewResponse(r *http.Response, dto any) (Response, error) {
+func NewResponse(r *http.Response) (Response, error) {
 	response := Response{
 		StatusCode:  r.StatusCode,
 		Method:      r.Request.Method,
 		RequestBody: map[string]any{},
 	}.
 		setHeader(r.Header).
 		setRequestHeader(r.Request.Header).
-		setRequestBodyData(r.Request).
+		setRequestBody(r.Request).
 		setRequestURI(r.Request)
 
 	var err error
 
 	response, err = response.setData(r)
 
-	if dto != nil {
-		response, err = response.setDTO(dto)
-	}
-
 	return response, err
 }
 
@@ -70,7 +66,7 @@ func (r Response) setRequestHeader(header http.Header) Response {
 	return r
 }
 
-func (r Response) setRequestBodyData(request *http.Request) Response {
+func (r Response) setRequestBody(request *http.Request) Response {
 	if request.Body != nil {
 		decoder := json.NewDecoder(request.Body)
 
@@ -91,19 +87,41 @@ func (r Response) setRequestURI(request *http.Request) Response {
 }
 
 func (r Response) setData(response *http.Response) (Response, error) {
-	var err error
+	if response.Body != nil {
+		var err error
+
+		r.Data, err = io.ReadAll(response.Body)
+
+		return r, err
+	}
+
+	return r, errors.New("responseBody is nil")
+}
+
+func (r Response) ResponseBodyOrFail() (map[string]any, error) {
+	var body map[string]any
 
-	r.Data, err = io.ReadAll(response.Body)
+	err := NewDTOFactory(r.Header.Get(headerKeyAccept)).marshall(r.Data, &body)
 
-	return r, err
+	return body, err
 }
 
-func (r Response) setDTO(dto any) (Response, error) {
-	r.DTO = dto
+func (r Response) ResponseBody() map[string]any {
+	var body map[string]any
 
-	err := NewDTOFactory(r.Header.Get(headerKeyAccept)).marshall(r.Data, &r.DTO)
+	_ = NewDTOFactory(r.Header.Get(headerKeyAccept)).marshall(r.Data, &body)
+
+	return body
+}
+
+func (r Response) DTO(v any) any {
+	_ = NewDTOFactory(r.Header.Get(headerKeyAccept)).marshall(r.Data, v)
+
+	return v
+}
 
-	return r, err
+func (r Response) DTOorFail(v any) error {
+	return NewDTOFactory(r.Header.Get(headerKeyAccept)).marshall(r.Data, v)
 }
 
 // IDTOFactory declares the interface for creating DTOs.

response_test.go

@@ -26,25 +26,17 @@ func TestNewResponse(t *testing.T) {
 	}
 
 	// Test case for successful creation of Response
-	resp, err := NewResponse(httpResp, false)
+	resp, err := NewResponse(httpResp)
 	if err != nil {
 		t.Errorf("NewResponse() returned unexpected error: %v", err)
 	}
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("NewResponse() returned response with unexpected status code: %d", resp.StatusCode)
 	}
 
-	// Test case for DTO creation when forceDTO is true
-	resp, err = NewResponse(httpResp, true)
-	if err != nil {
-		t.Errorf("NewResponse(forceDTO=true) returned unexpected error: %v", err)
-	}
-	if resp.DTO == nil {
-		t.Error("NewResponse(forceDTO=true) did not create DTO")
-	}
-
 	// Test case for error in NewResponse
-	resp, err = NewResponse(httpResp, false)
+	httpResp.Body = nil
+	resp, err = NewResponse(httpResp)
 	if err == nil {
 		t.Error("NewResponse() did not return expected error for HTTP client error")
 	}
@@ -89,20 +81,6 @@ func TestResponse_SetRequestHeader(t *testing.T) {
 	}
 }
 
-// TestResponse_SetRequestBodyData tests the SetRequestBodyData method of the Response struct.
-func TestResponse_SetRequestBodyData(t *testing.T) {
-	// Test case for setting request body data
-	reqBody := &strings.Reader{}
-	httpReq := &http.Request{
-		Body: io.NopCloser(reqBody),
-	}
-	response := Response{}
-	response = response.setRequestBodyData(httpReq)
-	if response.RequestBody == nil {
-		t.Error("Response SetRequestBodyData() did not set the request body data correctly")
-	}
-}
-
 // TestResponse_SetRequestURI tests the SetRequestURI method of the Response struct.
 func TestResponse_SetRequestURI(t *testing.T) {
 	// Test case for setting request URI
@@ -136,21 +114,3 @@ func TestResponse_SetData(t *testing.T) {
 		t.Error("Response SetData() did not set the response data correctly")
 	}
 }
-
-type TestDTO struct {
-	Key string `json:"key"`
-}
-
-// TestResponse_SetDTO tests the SetDTO method of the Response struct.
-func TestResponse_SetDTO(t *testing.T) {
-	// Test case for setting DTO
-	response := Response{Header: NewHeader(), Data: []byte(`{"key": "value"}`), DTO: &TestDTO{}}
-	response, err := response.setDTO(false)
-	if err != nil {
-		t.Errorf("Response SetDTO() returned unexpected error: %v", err)
-	}
-
-	if response.DTO == nil {
-		t.Error("Response SetDTO() did not set the DTO correctly")
-	}
-}

room.go

@@ -48,7 +48,7 @@ func (r *AuthRoom) Send(request *Request) (Response, error) {
 			return response, err
 		}
 
-		if token, found := findToken(response.DTO.(map[string]any), r.AuthToken); found {
+		if token, found := findToken(response.ResponseBody(), r.AuthToken); found {
 			r.Connector.Header.Add("Authorization", "Bearer "+token)
 		} else {
 			return response, errors.New(ErrAuthRoomCanNotFoundKey)
@@ -65,7 +65,7 @@ type IAuth interface {
 type AccessTokenAuth struct{}
 
 func (a AccessTokenAuth) Apply(connector *Connector, response Response) {
-	connector.Header.Add("Authorization", "Bearer "+response.DTO.(map[string]any)["access_token"].(string))
+	connector.Header.Add("Authorization", "Bearer "+response.ResponseBody()["access_token"].(string))
 }
 
 func NewAccessTokenAuth() IAuth {

store/store.go

@@ -63,9 +63,9 @@ func (s *MapStore) StringAll() string {
 
 	parts := make([]string, len(keys))
 
-	for i, key := range keys {
-		value := v.MapIndex(key).Interface()
-		parts[i] = fmt.Sprintf("%v: %v", key.Interface(), value)
+	for i := 0; i < len(keys); i++ {
+		value := v.MapIndex(keys[i]).Interface()
+		parts[i] = fmt.Sprintf("%v: %v", keys[i].Interface(), value)
 	}
 
 	return strings.Join(parts, ", ")