From 2e85fc953a791a902cee92f1d79da59a666d508e Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 15 Apr 2025 16:30:42 +0200 Subject: [PATCH] feat(assist-api): correct response format for getByID --- ee/backend/pkg/assist/api/handlers.go | 12 +++++++++--- ee/backend/pkg/sessionmanager/manager.go | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ee/backend/pkg/assist/api/handlers.go b/ee/backend/pkg/assist/api/handlers.go index 277701d69..890c2c8bc 100644 --- a/ee/backend/pkg/assist/api/handlers.go +++ b/ee/backend/pkg/assist/api/handlers.go @@ -135,13 +135,16 @@ func (e *handlersImpl) socketsListByProject(w http.ResponseWriter, r *http.Reque return } - resp, err := e.assist.IsLive(projectKey, sessionID, req) + resp, err := e.assist.GetByID(projectKey, sessionID, req) if err != nil { e.responser.ResponseWithError(e.log, r.Context(), w, http.StatusInternalServerError, err, startTime, r.URL.Path, bodySize) return } e.log.Debug(context.Background(), "socketsListByProject request, projectKey: %s, sessionID: %s, req: %v, response: %v", projectKey, sessionID, req, resp) - e.responser.ResponseWithJSON(e.log, r.Context(), w, resp, startTime, r.URL.Path, bodySize) + response := map[string]interface{}{ + "data": resp, + } + e.responser.ResponseWithJSON(e.log, r.Context(), w, response, startTime, r.URL.Path, bodySize) } func (e *handlersImpl) socketsLiveByProject(w http.ResponseWriter, r *http.Request) { @@ -211,5 +214,8 @@ func (e *handlersImpl) socketsLiveBySession(w http.ResponseWriter, r *http.Reque return } e.log.Debug(context.Background(), "socketsLiveBySession request, projectKey: %s, sessionID: %s, req: %v, response: %v", projectKey, sessionID, req, resp) - e.responser.ResponseWithJSON(e.log, r.Context(), w, resp, startTime, r.URL.Path, bodySize) + response := map[string]interface{}{ + "data": resp, + } + e.responser.ResponseWithJSON(e.log, r.Context(), w, response, startTime, r.URL.Path, bodySize) } diff --git a/ee/backend/pkg/sessionmanager/manager.go b/ee/backend/pkg/sessionmanager/manager.go index 36d43042d..8c97d7832 100644 --- a/ee/backend/pkg/sessionmanager/manager.go +++ b/ee/backend/pkg/sessionmanager/manager.go @@ -43,7 +43,7 @@ type SessionData struct { type SessionManager interface { Start() Stop() - GetByID(projectID, sessionID string) (*SessionData, error) + GetByID(projectID, sessionID string) (interface{}, error) GetAll(projectID string, filters []*Filter, sort SortOrder, page, limit int) ([]interface{}, int, map[string]map[string]int, error) Autocomplete(projectID string, key FilterType, value string) ([]interface{}, error) } @@ -362,7 +362,7 @@ func (sm *sessionManagerImpl) updateSessions() { sm.log.Debug(sm.ctx, "Session processing cycle completed in %v. Processed %d sessions", duration, len(sm.cache)) } -func (sm *sessionManagerImpl) GetByID(projectID, sessionID string) (*SessionData, error) { +func (sm *sessionManagerImpl) GetByID(projectID, sessionID string) (interface{}, error) { if sessionID == "" { return nil, fmt.Errorf("session ID is required") } @@ -377,7 +377,7 @@ func (sm *sessionManagerImpl) GetByID(projectID, sessionID string) (*SessionData if sessionData.ProjectID != projectID { return nil, fmt.Errorf("session does not belong to the project") } - return sessionData, nil + return sessionData.Raw, nil } func (sm *sessionManagerImpl) GetAll(projectID string, filters []*Filter, sort SortOrder, page, limit int) ([]interface{}, int, map[string]map[string]int, error) {