From 77483349c9c6cabb1b15a0730d873649dd01d2e3 Mon Sep 17 00:00:00 2001 From: nutcas3 Date: Sat, 2 May 2026 02:51:41 +0300 Subject: [PATCH] refactor: Extract ES2 types from client.go to separate types.go file - Move ES2Client struct definition from client.go to types.go - Move DownloadProfileRequest, DownloadProfileResponse, GetProfileStatusRequest, GetProfileStatusResponse types to types.go - Move DeleteProfileRequest, DeleteProfileResponse, EnableProfileRequest, EnableProfileResponse types to types.go - Move DisableProfileRequest, DisableProfileResponse types to types.go - Add net/http, time, and config package imports to types.go --- apps/carrier-connector/internal/es2/client.go | 61 ---------------- apps/carrier-connector/internal/es2/types.go | 70 +++++++++++++++++++ 2 files changed, 70 insertions(+), 61 deletions(-) create mode 100644 apps/carrier-connector/internal/es2/types.go diff --git a/apps/carrier-connector/internal/es2/client.go b/apps/carrier-connector/internal/es2/client.go index f1ebbf6..42bd346 100644 --- a/apps/carrier-connector/internal/es2/client.go +++ b/apps/carrier-connector/internal/es2/client.go @@ -17,14 +17,6 @@ import ( "github.com/nutcas3/telecom-platform/apps/carrier-connector/internal/config" ) -type ES2Client struct { - httpClient *http.Client - config *config.ES2Config - baseURL string - maxRetries int - retryDelay time.Duration -} - func NewES2Client(cfg *config.ES2Config) *ES2Client { return &ES2Client{ httpClient: &http.Client{ @@ -316,56 +308,3 @@ func (c *ES2Client) setHeaders(req *http.Request) { func generateRequestID() string { return fmt.Sprintf("%d", time.Now().UnixNano()) } - -type DownloadProfileRequest struct { - EID string `json:"eid"` - ICCID string `json:"iccid"` - ProfileType string `json:"profileType"` - ConfirmationCode string `json:"confirmationCode,omitempty"` -} - -type DownloadProfileResponse struct { - ExecutionStatus string `json:"executionStatus"` - StatusMessage string `json:"statusMessage"` -} - -type GetProfileStatusRequest struct { - EID string `json:"eid"` - ICCID string `json:"iccid"` -} - -type GetProfileStatusResponse struct { - ExecutionStatus string `json:"executionStatus"` - StatusMessage string `json:"statusMessage"` - ProfileState string `json:"profileState,omitempty"` -} - -type DeleteProfileRequest struct { - EID string `json:"eid"` - ICCID string `json:"iccid"` -} - -type DeleteProfileResponse struct { - ExecutionStatus string `json:"executionStatus"` - StatusMessage string `json:"statusMessage"` -} - -type EnableProfileRequest struct { - EID string `json:"eid"` - ICCID string `json:"iccid"` -} - -type EnableProfileResponse struct { - ExecutionStatus string `json:"executionStatus"` - StatusMessage string `json:"statusMessage"` -} - -type DisableProfileRequest struct { - EID string `json:"eid"` - ICCID string `json:"iccid"` -} - -type DisableProfileResponse struct { - ExecutionStatus string `json:"executionStatus"` - StatusMessage string `json:"statusMessage"` -} diff --git a/apps/carrier-connector/internal/es2/types.go b/apps/carrier-connector/internal/es2/types.go new file mode 100644 index 0000000..d27d6fa --- /dev/null +++ b/apps/carrier-connector/internal/es2/types.go @@ -0,0 +1,70 @@ +package es2 + +import ( + "net/http" + "time" + + "github.com/nutcas3/telecom-platform/apps/carrier-connector/internal/config" +) + + +type ES2Client struct { + httpClient *http.Client + config *config.ES2Config + baseURL string + maxRetries int + retryDelay time.Duration +} + +type DownloadProfileRequest struct { + EID string `json:"eid"` + ICCID string `json:"iccid"` + ProfileType string `json:"profileType"` + ConfirmationCode string `json:"confirmationCode,omitempty"` +} + +type DownloadProfileResponse struct { + ExecutionStatus string `json:"executionStatus"` + StatusMessage string `json:"statusMessage"` +} + +type GetProfileStatusRequest struct { + EID string `json:"eid"` + ICCID string `json:"iccid"` +} + +type GetProfileStatusResponse struct { + ExecutionStatus string `json:"executionStatus"` + StatusMessage string `json:"statusMessage"` + ProfileState string `json:"profileState,omitempty"` +} + +type DeleteProfileRequest struct { + EID string `json:"eid"` + ICCID string `json:"iccid"` +} + +type DeleteProfileResponse struct { + ExecutionStatus string `json:"executionStatus"` + StatusMessage string `json:"statusMessage"` +} + +type EnableProfileRequest struct { + EID string `json:"eid"` + ICCID string `json:"iccid"` +} + +type EnableProfileResponse struct { + ExecutionStatus string `json:"executionStatus"` + StatusMessage string `json:"statusMessage"` +} + +type DisableProfileRequest struct { + EID string `json:"eid"` + ICCID string `json:"iccid"` +} + +type DisableProfileResponse struct { + ExecutionStatus string `json:"executionStatus"` + StatusMessage string `json:"statusMessage"` +}