fix rollback

Author: EyalDelarea

apptrust/commands/version/rollback_app_version_cmd_test.go

@@ -39,6 +39,35 @@ func TestRollbackAppVersionCommand_Run(t *testing.T) {
 	assert.NoError(t, err)
 }
 
+func TestRollbackAppVersionCommand_Run_WithSync(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	applicationKey := "test-app"
+	version := "1.0.0"
+	serverDetails := &config.ServerDetails{Url: "https://example.com"}
+	requestPayload := &model.RollbackAppVersionRequest{
+		FromStage: "qa",
+	}
+
+	mockVersionService := mockversions.NewMockVersionService(ctrl)
+	mockVersionService.EXPECT().RollbackAppVersion(gomock.Any(), applicationKey, version, requestPayload, true).
+		Return(nil).Times(1)
+
+	cmd := &rollbackAppVersionCommand{
+		versionService: mockVersionService,
+		serverDetails:  serverDetails,
+		applicationKey: applicationKey,
+		version:        version,
+		requestPayload: requestPayload,
+		fromStage:      "qa",
+		sync:           true,
+	}
+
+	err := cmd.Run()
+	assert.NoError(t, err)
+}
+
 func TestRollbackAppVersionCommand_Run_Error(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()

apptrust/service/versions/version_service.go

@@ -83,7 +83,13 @@ func (vs *versionService) RollbackAppVersion(ctx service.Context, applicationKey
 		return err
 	}
 
-	if response.StatusCode >= http.StatusBadRequest {
+	// Validate status code based on sync mode
+	expectedStatusCode := http.StatusAccepted // async mode expects 202
+	if sync {
+		expectedStatusCode = http.StatusOK // sync mode expects 200
+	}
+
+	if response.StatusCode != expectedStatusCode {
 		return fmt.Errorf("failed to rollback app version. Status code: %d. \n%s",
 			response.StatusCode, responseBody)
 	}

apptrust/service/versions/version_service_test.go

@@ -459,6 +459,28 @@ func TestRollbackAppVersion(t *testing.T) {
 			expectedStatus: http.StatusBadRequest,
 			expectedError:  true,
 		},
+		{
+			name:           "failed rollback - sync=true but got 202",
+			applicationKey: "video-encoder",
+			version:        "1.5.0",
+			payload: &model.RollbackAppVersionRequest{
+				FromStage: "qa",
+			},
+			sync:           true,
+			expectedStatus: http.StatusAccepted, // Wrong status for sync=true
+			expectedError:  true,
+		},
+		{
+			name:           "failed rollback - sync=false but got 200",
+			applicationKey: "video-encoder",
+			version:        "1.5.0",
+			payload: &model.RollbackAppVersionRequest{
+				FromStage: "prod",
+			},
+			sync:           false,
+			expectedStatus: http.StatusOK, // Wrong status for sync=false
+			expectedError:  true,
+		},
 	}
 
 	for _, tt := range tests {