Change type of "Status" field back to string per static anaysis compl…

…aints
Azure · Dec 16, 2020 · 3610fd2 · 3610fd2
1 parent 58f7eef
commit 3610fd2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Sql/Sql/ImportExport/Model/AzureSqlDatabaseImportExportStatusModel.cs b/src/Sql/Sql/ImportExport/Model/AzureSqlDatabaseImportExportStatusModel.cs
@@ -72,7 +72,7 @@ public string RequestType
         /// their automation.
         /// Compare to <see cref="Azure.Management.Sql.LegacySdk.ImportExportOperations.GetImportExportOperationStatusAsync"/>
         /// </summary>
-        public OperationStatus? Status
+        public string Status
         {
             get;
             set;

diff --git a/src/Sql/Sql/ImportExport/Service/ImportExportDatabaseAdapter.cs b/src/Sql/Sql/ImportExport/Service/ImportExportDatabaseAdapter.cs
@@ -143,13 +143,15 @@ public AzureSqlDatabaseImportExportStatusModel GetStatus(string operationStatusL
             HttpResponseMessage rawHttpResponse;
             ImportExportOperationResult response = Communicator.GetOperationStatus(operationStatusLink, out rawHttpResponse);
 
+            OperationStatus? operationStatus = GetOperationStatusFromHttpStatus(rawHttpResponse.StatusCode);
+
             AzureSqlDatabaseImportExportStatusModel status = new AzureSqlDatabaseImportExportStatusModel()
             {
                 ErrorMessage = response.ErrorMessage,
                 LastModifiedTime = response.LastModifiedTime,
                 QueuedTime = response.QueuedTime,
                 StatusMessage = response.Status, // in spite of the name, the field called "Status" is the correct one to put into the "StatusMessage" field
-                Status = GetOperationStatusFromHttpStatus(rawHttpResponse.StatusCode),
+                Status = operationStatus.HasValue ? operationStatus.Value.ToString() : "",
                 RequestType = response.RequestType,
                 PrivateEndpointRequestStatus = response.PrivateEndpointConnections?.Select(pec => new PrivateEndpointRequestStatus()
                 {