refactor

Author: EyalDelarea

apptrust/commands/version/release_app_version_cmd.go

@@ -106,12 +106,12 @@ func (rv *releaseAppVersionCommand) buildRequestPayload(ctx *components.Context)
 		validatedPromotionType = model.PromotionTypeDryRun
 	}
 
-	return &model.ReleaseAppVersionRequest{
-		PromotionType:                validatedPromotionType,
-		IncludedRepositoryKeys:       includedRepos,
-		ExcludedRepositoryKeys:       excludedRepos,
-		ArtifactAdditionalProperties: artifactProps,
-	}, nil
+	return model.NewReleaseAppVersionRequest(
+		validatedPromotionType,
+		includedRepos,
+		excludedRepos,
+		artifactProps,
+	), nil
 }
 
 func GetReleaseAppVersionCommand(appContext app.Context) components.Command {

apptrust/commands/version/release_app_version_cmd_test.go

@@ -37,9 +37,12 @@ func TestReleaseAppVersionCommand_Run(t *testing.T) {
 			serverDetails := &config.ServerDetails{Url: "https://example.com"}
 			applicationKey := "app-key"
 			version := "1.0.0"
-			requestPayload := &model.ReleaseAppVersionRequest{
-				PromotionType: model.PromotionTypeCopy,
-			}
+			requestPayload := model.NewReleaseAppVersionRequest(
+				model.PromotionTypeCopy,
+				nil, // includedRepos
+				nil, // excludedRepos
+				nil, // artifactProps
+			)
 
 			mockVersionService := mockversions.NewMockVersionService(ctrl)
 			mockVersionService.EXPECT().ReleaseAppVersion(gomock.Any(), applicationKey, version, requestPayload, tt.sync).
@@ -83,9 +86,12 @@ func TestReleaseAppVersionCommand_Run_Error(t *testing.T) {
 			serverDetails := &config.ServerDetails{Url: "https://example.com"}
 			applicationKey := "app-key"
 			version := "1.0.0"
-			requestPayload := &model.ReleaseAppVersionRequest{
-				PromotionType: model.PromotionTypeCopy,
-			}
+			requestPayload := model.NewReleaseAppVersionRequest(
+				model.PromotionTypeCopy,
+				nil, // includedRepos
+				nil, // excludedRepos
+				nil, // artifactProps
+			)
 			expectedError := errors.New("service error occurred")
 
 			mockVersionService := mockversions.NewMockVersionService(ctrl)

apptrust/model/release_app_version_request.go

@@ -12,7 +12,8 @@ func NewReleaseAppVersionRequest(
 	promotionType string,
 	includedRepositoryKeys []string,
 	excludedRepositoryKeys []string,
-	artifactProperties map[string]string) *ReleaseAppVersionRequest {
+	artifactProperties map[string]string,
+) *ReleaseAppVersionRequest {
 
 	return &ReleaseAppVersionRequest{
 		PromoteAppVersionRequest: PromoteAppVersionRequest{

apptrust/model/release_app_version_request_test.go

@@ -0,0 +1,30 @@
+package model
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewReleaseAppVersionRequest(t *testing.T) {
+	// Test data
+	promotionType := PromotionTypeCopy
+	includedRepos := []string{"repo1", "repo2"}
+	excludedRepos := []string{"repo3"}
+	props := map[string]string{"key1": "value1", "key2": "value2"}
+
+	// Create request using constructor
+	request := NewReleaseAppVersionRequest(
+		promotionType,
+		includedRepos,
+		excludedRepos,
+		props,
+	)
+
+	// Verify fields
+	assert.Equal(t, ReleaseStage, request.Stage)
+	assert.Equal(t, promotionType, request.PromotionType)
+	assert.Equal(t, includedRepos, request.IncludedRepositoryKeys)
+	assert.Equal(t, excludedRepos, request.ExcludedRepositoryKeys)
+	assert.Equal(t, props, request.ArtifactAdditionalProperties)
+}

apptrust/service/versions/version_service_test.go

@@ -200,12 +200,12 @@ func TestReleaseAppVersion(t *testing.T) {
 			name:           "success with sync=true",
 			applicationKey: "test-app",
 			version:        "1.0.0",
-			payload: &model.ReleaseAppVersionRequest{
-				PromotionType:                model.PromotionTypeCopy,
-				IncludedRepositoryKeys:       []string{"repo1", "repo2"},
-				ExcludedRepositoryKeys:       []string{"repo3"},
-				ArtifactAdditionalProperties: map[string]string{"key1": "value1"},
-			},
+			payload: model.NewReleaseAppVersionRequest(
+				model.PromotionTypeCopy,
+				[]string{"repo1", "repo2"},
+				[]string{"repo3"},
+				map[string]string{"key1": "value1"},
+			),
 			sync:             true,
 			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/release",
 			mockResponse:     &http.Response{StatusCode: 200},
@@ -217,12 +217,12 @@ func TestReleaseAppVersion(t *testing.T) {
 			name:           "success with sync=false",
 			applicationKey: "test-app",
 			version:        "1.0.0",
-			payload: &model.ReleaseAppVersionRequest{
-				PromotionType:                model.PromotionTypeCopy,
-				IncludedRepositoryKeys:       []string{"repo1", "repo2"},
-				ExcludedRepositoryKeys:       []string{"repo3"},
-				ArtifactAdditionalProperties: map[string]string{"key1": "value1"},
-			},
+			payload: model.NewReleaseAppVersionRequest(
+				model.PromotionTypeCopy,
+				[]string{"repo1", "repo2"},
+				[]string{"repo3"},
+				map[string]string{"key1": "value1"},
+			),
 			sync:             false,
 			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/release",
 			mockResponse:     &http.Response{StatusCode: 202},
@@ -234,9 +234,12 @@ func TestReleaseAppVersion(t *testing.T) {
 			name:           "failure",
 			applicationKey: "test-app",
 			version:        "1.0.0",
-			payload: &model.ReleaseAppVersionRequest{
-				PromotionType: model.PromotionTypeCopy,
-			},
+			payload: model.NewReleaseAppVersionRequest(
+				model.PromotionTypeCopy,
+				nil,
+				nil,
+				nil,
+			),
 			sync:             true,
 			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/release",
 			mockResponse:     &http.Response{StatusCode: 400},
@@ -248,9 +251,12 @@ func TestReleaseAppVersion(t *testing.T) {
 			name:           "http client error",
 			applicationKey: "test-app",
 			version:        "1.0.0",
-			payload: &model.ReleaseAppVersionRequest{
-				PromotionType: model.PromotionTypeCopy,
-			},
+			payload: model.NewReleaseAppVersionRequest(
+				model.PromotionTypeCopy,
+				nil,
+				nil,
+				nil,
+			),
 			sync:             false,
 			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/release",
 			mockResponse:     nil,